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

Merge branch 'master' into dev_random_pk

Browse Source 
# Conflicts:
#	live/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2022-12-05 17:46:57 +08:00
parent ed6b531b8d 2a2672587c
commit 9ead9a6fb8
207 changed files with 7020 additions and 3152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
live/src/main/res/values/strings.xml
View File

@@ -27,6 +27,11 @@
<string name="more_than" translatable="false">已超过10秒未识别到录音</string>
<string name="live_role_title" translatable="false">身份特權</string>
<string name="noble_seat" translatable="false">貴族坐席</string>
<string name="live_mic_max">當前連麥語音人數已達到3人，無法再添加。</string>
<string name="live_mic_user_apply" translatable="false">%s 申請連麥,是否查看</string>
<string name="live_mic_user_down" translatable="false">已踢下麥</string>
<string name="live_mic_invite" translatable="false">已發出邀請,等待用戶接受</string>
<string name="live_mic_request" translatable="false">已同意請求,等待用戶接受</string>
<string name="random_pk_info_title" translatable="false">PK主要規則說明：</string>
<string name="random_pk_info_desc_1" translatable="false">1、開始匹配後，系統將會自動給您挑選對手進行PK；</string>
<string name="random_pk_info_desc_2" translatable="false">2、每場PK總時長10分鍾，懲罰時間為1分鍾；</string>