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

Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆

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-07-13 09:29:11 +08:00
parent 845b217c4d 7edd75e223
commit 9292e6f5c5
51 changed files with 1048 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1509,6 +1509,8 @@
<string name="dialog_gift_wall_text_personal_hal">Personal hal</string>
<string name="dialog_gift_wall_text_site_hal">Whole site hal</string>
<string name="dialog_gift_wall_text_honors">Honors</string>
<string name="gift_wall_achieve_put_on">Put on</string>
<string name="gift_wall_achieve_title">Honors</string>
<string name="dialog_gift_wall_list_spinner_all">All</string>
<string name="dialog_gift_wall_list_spinner_up">Lit up</string>
<string name="dialog_gift_wall_list_spinner_down">Not Lit</string>