Merge branch 'yuqianwei' into dev_6.7.0

# Conflicts:
#	live/src/main/res/values/strings.xml
This commit is contained in:
余前卫
2024-06-07 15:46:53 +08:00
32 changed files with 891 additions and 2 deletions

View File

@@ -134,5 +134,11 @@
<string name="alive_prank_gift_add_gift_content_sub">確定</string>
<string name="alive_prank_gift_dialog_number_title">禮物數量</string>
<string name="live_prank_gift_dialog_number_btn">+ 設置其他數量(最多9999)</string>
<string name="prank_progress">整蠱進度</string>
<string name="turntable_prank">轉盤整蠱</string>
<string name="details">詳情></string>
<string name="combo_vote">連擊投票</string>
<string name="combo_vote_more">連擊最多優先</string>
<string name="alive_prank_gift_dialog_explain">整蠱說明</string>
</resources>