yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into v681小游戏

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2024-08-14 15:59:11 +08:00
parent dc7b987eda cb87974320
commit 451a875526
22 changed files with 452 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/res/values-zh/strings.xml
View File

@@ -1545,6 +1545,8 @@
<string name="live_end_view_ban_reason">違規原因:</string>
<string name="live_end_view_ban_content">處罰內容:</string>
<string name="live_end_view_ban_timer">處罰時間:</string>
<string name="live_end_view_ban_punish_title">處罰通知</string>
<string name="game_create_coid_ticket">門票</string>
<string name="game_list_activity_title">挑戰一桿清台，瓜分高額獎金</string>
<string name="game_dialog_loading_tips_text">結算超時，請前往活動頁面查看本局結果</string>

2
common/src/main/res/values/colors.xml
View File

@@ -85,4 +85,6 @@
<color name="gray_f6f6f6f6">#FFF6F6F6</color>
<color name="gray_F4F4F4">#F4F4F4</color>
<color name="color_555555">#555555</color>
<color name="color_525252">#525252</color>
</resources>

1
common/src/main/res/values/strings.xml
View File

@@ -1554,6 +1554,7 @@
<string name="live_end_view_ban_reason">Violation reasons:</string>
<string name="live_end_view_ban_content">Penalty content:</string>
<string name="live_end_view_ban_timer">Penalty time:</string>
<string name="live_end_view_ban_punish_title">Punishment Notice</string>
<string name="game_create_coid_ticket">Ticket</string>
<string name="game_list_activity_title">Challenge One-shot clearance Share high bonuses</string>
<string name="game_dialog_loading_tips_text"> Settlement timed out. Please check the result on the event page</string>