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

Merge branch 'master' into dev_blind_box

Browse Source 
# Conflicts:
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
This commit is contained in:
18401019693
2023-05-27 18:25:14 +08:00
parent c28a91b128 9526a14ca2
commit c3b5f17f44
17 changed files with 115 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1177,4 +1177,5 @@
<string name="mini_blind_box">迷你盲盒</string>
<string name="collection_blind_box">典藏盲盒</string>
<string name="pd_blind_box">PD盲盒</string>
<string name="live_vote_create_error">投票創建失敗</string>
</resources>