yutou/pdlivexp
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/java/com/yunbao/common/Constants.java
View File

@@ -182,6 +182,7 @@ public class Constants {
public static final String LIVE_VOTE_CREATE="createVote";
public static final String LIVE_VOTE_UPDATE="updateVote";
public static final String LIVE_VOTE_END="endVote";
public static final String LIVE_PK_END="endPK";//结束PK，以这个PK获取到的参数为准
//游戏socket
public static final String SOCKET_GAME_ZJH = "startGame";//炸金花

1
common/src/main/res/values-en-rUS/string.xml
View File

@@ -1177,4 +1177,5 @@ Limited ride And limited avatar frame</string>
<string name="live_vote_hide_text">VOTE</string>
<string name="live_room_vote_over_tip">%s <br/> box disappears after %s seconds</string>
<string name="live_anchor_vote_tip">Please complete the form.</string>
<string name="live_vote_create_error">Create Vote Error</string>
</resources>

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

@@ -1172,4 +1172,5 @@
<string name="complete_information_hint2">愛你，愛你</string>
<string name="you_guide_me">指導下我好嗎</string>
<string name="complete_information">完整填寫領大禮</string>
<string name="live_vote_create_error">投票創建失敗</string>
</resources>

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

@@ -1171,4 +1171,5 @@
<string name="complete_information_hint2">愛你，愛你</string>
<string name="you_guide_me">指導下我好嗎</string>
<string name="complete_information">完整填寫領大禮</string>
<string name="live_vote_create_error">投票創建失敗</string>
</resources>

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>

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

@@ -1192,4 +1192,5 @@ Limited ride And limited avatar frame</string>
<string name="participate_in">參與</string>
<string name="extract_to">%s在%s中抽取到了</string>
<string name="extract_to2">%S送给了%s</string>
<string name="live_vote_create_error">Create Vote Error</string>
</resources>