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

Merge branch 'master' into dev_680_礼物展馆

Browse Source 
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	gradle.properties
#	live/build.gradle
This commit is contained in:
Martin
2024-07-17 09:53:22 +08:00
parent fe827482c9 a11d7f07e9
commit 152848a04f
215 changed files with 3143 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@
<color name="black_98">#98000000</color>
<color name="textColor">#323232</color>
<color name="white">#fff</color>
<color name="white_60">#99FFFFFF</color>
<color name="white_85">#85ffffff</color>
<color name="gray1">#969696</color>
<color name="gray2">#f5f5f5</color>

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

@@ -1334,7 +1334,7 @@
<string name="interactive_game_room_all">All Game</string>
<string name="interactive_game_create_room">Create a room</string>
<string name="interactive_game_create_room_name">"Room Name: "</string>
<string name="interactive_game_create_room_number">Room ID:</string>
<string name="interactive_game_create_room_number">ID:</string>
<string name="interactive_game_create_room_name_input">Please enter a room name</string>
<string name="interactive_game_create_game_type">Game type:</string>
<string name="interactive_game_create_game_sill">Game threshold:</string>
@@ -1539,4 +1539,9 @@
<string name="dialog_gift_wall_hide">Hidden</string>
<string name="dialog_gift_wall_classic_wait">Waiting for titling</string>
<string name="dialog_gift_wall_assistance_wait">Waiting for assistance</string>
<string name="live_guard_buy_coupon_tips_use">Use</string>
<string name="live_guard_buy_coupon_tips_cancel">Not use</string>
<string name="sub_admission_fee">*10% of the threshold will be charged as ticket</string>
</resources>