From 68e6f5df1ba6f02ff787576009cacee6f5a531a5 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 10 Nov 2023 17:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=89=A3=E6=AC=BE=E6=B7=BB=E5=8A=A0=E6=98=9F=E5=B8=81=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/activity/SudGameActivity.java | 3 +++ .../yunbao/common/bean/SudRoomListModel.java | 15 +++++++++-- .../common/dialog/CreateSudGamePopup.java | 4 +-- .../common/dialog/SudGameListPopup.java | 2 +- .../common/dialog/SudGameListSelectPopup.java | 16 ++++++----- .../com/yunbao/common/http/PDLiveApi.java | 5 ++++ .../common/http/live/LiveNetManager.java | 27 +++++++++++++++---- .../yunbao/common/sud/BaseGameViewModel.java | 5 +++- .../sud/decorator/SudFSMMGDecorator.java | 10 ++++--- .../common/views/LiveSudGameHistoryPopup.java | 2 +- .../views/LiveSudGameHistoryViewHolder.java | 27 ++++++++++--------- .../yunbao/common/views/LiveSudGamePopup.java | 3 +++ .../common/views/SudGameListViewHolder.java | 10 +++++-- .../layout/dialog_live_sud_game_history.xml | 2 +- .../res/layout/item_home_sud_game_list.xml | 1 + .../main/res/layout/item_sud_game_list.xml | 1 + .../res/layout/sud_game_rule_bottom_popup.xml | 2 +- common/src/main/res/values-en-rUS/string.xml | 6 +++-- common/src/main/res/values-zh-rHK/strings.xml | 6 +++-- common/src/main/res/values-zh-rTW/strings.xml | 6 +++-- common/src/main/res/values-zh/strings.xml | 6 +++-- common/src/main/res/values/strings.xml | 6 +++-- config.gradle | 2 +- .../main/views/MainHomeGameViewHolder.java | 4 +-- 24 files changed, 120 insertions(+), 51 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java b/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java index 4de7f8032..e69384e7b 100644 --- a/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java +++ b/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java @@ -205,6 +205,9 @@ public class SudGameActivity extends AbsActivity { } }); break; + case SudMGPMGState.MG_COMMON_GAME_STATE: + LiveNetManager.get(mContext).deductMoney( mCreateSudRoomModel.getSudGameRoomId()); + break; } } diff --git a/common/src/main/java/com/yunbao/common/bean/SudRoomListModel.java b/common/src/main/java/com/yunbao/common/bean/SudRoomListModel.java index 9d1f676d1..5960592e5 100644 --- a/common/src/main/java/com/yunbao/common/bean/SudRoomListModel.java +++ b/common/src/main/java/com/yunbao/common/bean/SudRoomListModel.java @@ -42,6 +42,17 @@ public class SudRoomListModel extends BaseModel { private String sex; @SerializedName("sud_game_icon") private String sudgameicon; + @SerializedName("currency_type") + private String currencyType; + + public String getCurrencyType() { + return currencyType; + } + + public SudRoomListModel setCurrencyType(String currencyType) { + this.currencyType = currencyType; + return this; + } public String getSudgameicon() { return sudgameicon; @@ -200,9 +211,9 @@ public class SudRoomListModel extends BaseModel { } public String getTotal() { - if (TextUtils.isEmpty(obTotal)&&TextUtils.isEmpty(playerTotal)){ + if (TextUtils.isEmpty(obTotal) && TextUtils.isEmpty(playerTotal)) { return "0"; - }else { + } else { int obT = Integer.parseInt(obTotal); int playerO = Integer.parseInt(playerTotal); return String.valueOf(obT + playerO); diff --git a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java index eea562efd..0a093f923 100644 --- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java @@ -93,8 +93,8 @@ public class CreateSudGamePopup extends BottomPopupView { private void initDate() { currencyTypeName = getContext().getString(R.string.golden_bean); userName = IMLoginManager.get(getContext()).getUserInfo().getUserNicename(); - roomNames.add(WordUtil.isNewZh() ? "一起玩吧!" : "Let's play together!"); - roomNames.add(WordUtil.isNewZh() ? "來戰斗吧！" : "Let's fight!"); + roomNames.add(WordUtil.isNewZh() ? "壹起玩吧!" : "Let's play together!"); + roomNames.add(WordUtil.isNewZh() ? "來戰鬥吧!" : "Let's fight!"); roomNames.add(WordUtil.isNewZh() ? "決戰到天亮 " : "Fight until dawn"); roomNames.add(WordUtil.isNewZh() ? "在線等遊戲夥伴~" : "Waiting for game partners~"); roomNames.add(WordUtil.isNewZh() ? userName + "的房间 " : userName + "‘s room"); diff --git a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java index 1e029143f..7e5cd6354 100644 --- a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java @@ -52,7 +52,7 @@ public class SudGameListPopup extends BottomPopupView { private TextView gameTitle, sillTitle, houseOwnerTitle; private String id = "0", mLiveUid; private int page = 0; - private String mSill = "0,0", mSillName, roomHolderType = "0", roomHolderTypeName; + private String mSill = "0,0,0", mSillName, roomHolderType = "0", roomHolderTypeName; private CommonRefreshView mRefreshView; private SudGameListAdapter sudGameListAdapter; diff --git a/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java b/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java index 4a4b1fb86..928e1a469 100644 --- a/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java @@ -116,13 +116,17 @@ public class SudGameListSelectPopup extends AttachPopupView { selectString.add(getContext().getString(R.string.interactive_game_create_unlimited)); selectString.add(getContext().getString(R.string.interactive_game_create_0_1)); selectString.add(getContext().getString(R.string.interactive_game_create_1_2)); - selectString.add(getContext().getString(R.string.interactive_game_create_2_5)); selectString.add(getContext().getString(R.string.interactive_game_create_5)); - selectSill.put(getContext().getString(R.string.interactive_game_create_unlimited), "0,0"); - selectSill.put(getContext().getString(R.string.interactive_game_create_0_1), "0,1"); - selectSill.put(getContext().getString(R.string.interactive_game_create_1_2), "1,2"); - selectSill.put(getContext().getString(R.string.interactive_game_create_2_5), "2,5"); - selectSill.put(getContext().getString(R.string.interactive_game_create_5), "5,0"); + selectString.add(getContext().getString(R.string.room_sill0_100)); + selectString.add(getContext().getString(R.string.room_sill100_500)); + selectString.add(getContext().getString(R.string.room_sill500_m)); + selectSill.put(getContext().getString(R.string.interactive_game_create_unlimited), "0,0,0"); + selectSill.put(getContext().getString(R.string.interactive_game_create_0_1), "0,1,3"); + selectSill.put(getContext().getString(R.string.interactive_game_create_1_2), "1,5,3"); + selectSill.put(getContext().getString(R.string.interactive_game_create_5), "5,0,3"); + selectSill.put(getContext().getString(R.string.room_sill0_100), "0,1,2"); + selectSill.put(getContext().getString(R.string.room_sill100_500), "1,5,2"); + selectSill.put(getContext().getString(R.string.room_sill500_m), "5,0,2"); index = 0; for (int i = 0; i < selectString.size(); i++) { if (TextUtils.equals(mSill, selectString.get(i))) { diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index d1b0cea3b..1698ecffd 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -1056,4 +1056,9 @@ public interface PDLiveApi { @Query("mg_id") String mgId, @Query("room_id") String roomId ); + + @GET("/api/public/?service=Sudgameserver.deductMoney") + Observable> deductMoney( + @Query("room_id") String roomId + ); } diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index ac263a3d9..f7e838952 100644 --- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java +++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java @@ -74,7 +74,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; -import retrofit2.http.Query; /** @@ -2316,6 +2315,24 @@ public class LiveNetManager { }).isDisposed(); } + public void deductMoney(String roomId) { + API.get().pdLiveApi(mContext) + .deductMoney(roomId) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel objectResponseModel) throws Exception { + + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + + } + }).isDisposed(); + } + public void gameStartCheckRemainingBalance(String mgId, String roomId, HttpCallback callback) { API.get().pdLiveApi(mContext) .gameStartCheckRemainingBalance(mgId, roomId) @@ -2344,9 +2361,9 @@ public class LiveNetManager { }).isDisposed(); } - public void getRoomList(String sudGameId, String threshold, String roomHolderType, String liveUid, String currencyType , int page, HttpCallback> callback) { + public void getRoomList(String sudGameId, String threshold, String roomHolderType, String liveUid, String currencyType, int page, HttpCallback> callback) { API.get().pdLiveApi(mContext) - .getRoomList(sudGameId, threshold, roomHolderType, liveUid,currencyType, page) + .getRoomList(sudGameId, threshold, roomHolderType, liveUid, currencyType, page) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Consumer>>() { @@ -2366,9 +2383,9 @@ public class LiveNetManager { }).isDisposed(); } - public void searchRoomList(String sudGameId, String threshold, String roomHolderType, String search, String currencyType ,int page, HttpCallback> callback) { + public void searchRoomList(String sudGameId, String threshold, String roomHolderType, String search, String currencyType, int page, HttpCallback> callback) { API.get().pdLiveApi(mContext) - .searchRoomList(sudGameId, threshold, roomHolderType, "0", search,currencyType, page) + .searchRoomList(sudGameId, threshold, roomHolderType, "0", search, currencyType, page) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Consumer>>() { diff --git a/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java b/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java index 81200c004..141e829f4 100644 --- a/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java +++ b/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.os.Handler; import android.os.Looper; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.view.ViewTreeObserver; import android.widget.Toast; @@ -106,7 +107,7 @@ public abstract class BaseGameViewModel implements SudFSMMGListener { String appKey = getAppKey(); boolean testEnv = isTestEnv(); // 初始化sdk - SudMGP.initSDK(activity, appId, appKey,testEnv, new ISudListenerInitSDK() { + SudMGP.initSDK(activity, appId, appKey, testEnv, new ISudListenerInitSDK() { @Override public void onSuccess() { loadGame(activity, code, gameId); @@ -280,6 +281,7 @@ public abstract class BaseGameViewModel implements SudFSMMGListener { @Override public void onGameLog(String str) { SudFSMMGListener.super.onGameLog(str); + Log.e("onGameStarted", "游戏日志:" + str); } /** @@ -288,6 +290,7 @@ public abstract class BaseGameViewModel implements SudFSMMGListener { */ @Override public void onGameStarted() { + Log.e("onGameStarted", "游戏开始--------------------"); } /** diff --git a/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java b/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java index 9f1fda279..a52a68409 100644 --- a/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java +++ b/common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java @@ -177,7 +177,7 @@ public class SudFSMMGDecorator implements ISudFSMMG { break; case SudMGPMGState.MG_COMMON_SELF_CLICK_JOIN_BTN: // 4. 加入游戏按钮点击状态 SudMGPMGState.MGCommonSelfClickJoinBtn mgCommonSelfClickJoinBtn = SudJsonUtils.fromJson(dataJson, SudMGPMGState.MGCommonSelfClickJoinBtn.class); - Bus.get().post(new CheckRemainingBalanceEvent().setSeatIndex(mgCommonSelfClickJoinBtn.seatIndex).setSudMGPMGState( SudMGPMGState.MG_COMMON_SELF_CLICK_JOIN_BTN)); + Bus.get().post(new CheckRemainingBalanceEvent().setSeatIndex(mgCommonSelfClickJoinBtn.seatIndex).setSudMGPMGState(SudMGPMGState.MG_COMMON_SELF_CLICK_JOIN_BTN)); // if (listener == null) { // ISudFSMStateHandleUtils.handleSuccess(handle); // } else { @@ -211,7 +211,7 @@ public class SudFSMMGDecorator implements ISudFSMMG { break; case SudMGPMGState.MG_COMMON_SELF_CLICK_START_BTN: // 8. 开始游戏按钮点击状态 SudMGPMGState.MGCommonSelfClickStartBtn mgCommonSelfClickStartBtn = SudJsonUtils.fromJson(dataJson, SudMGPMGState.MGCommonSelfClickStartBtn.class); - Bus.get().post(new CheckRemainingBalanceEvent().setSudMGPMGState( SudMGPMGState.MG_COMMON_SELF_CLICK_START_BTN)); + Bus.get().post(new CheckRemainingBalanceEvent().setSudMGPMGState(SudMGPMGState.MG_COMMON_SELF_CLICK_START_BTN)); // if (listener == null) { // ISudFSMStateHandleUtils.handleSuccess(handle); // } else { @@ -227,8 +227,12 @@ public class SudFSMMGDecorator implements ISudFSMMG { } break; case SudMGPMGState.MG_COMMON_GAME_STATE: // 10. 游戏状态 + Log.e("onGameStateChange", "mg_common_game_state:::::" + "dataJson:::::"+dataJson); SudMGPMGState.MGCommonGameState mgCommonGameState = SudJsonUtils.fromJson(dataJson, SudMGPMGState.MGCommonGameState.class); sudFSMMGCache.onGameMGCommonGameState(mgCommonGameState); + if (mgCommonGameState.gameState==2){ + Bus.get().post(new CheckRemainingBalanceEvent().setSudMGPMGState(SudMGPMGState.MG_COMMON_GAME_STATE)); + } if (listener == null) { ISudFSMStateHandleUtils.handleSuccess(handle); } else { @@ -817,7 +821,7 @@ public class SudFSMMGDecorator implements ISudFSMMG { if (listener != null && listener.onPlayerStateChange(handle, userId, state, dataJson)) { return; } - Log.e("SudFSMMGDecorator", "userId:" + userId + " state:" + state + " dataJson:" + dataJson); + Log.e("onPlayerStateChange", "userId:" + userId + " state:" + state + " dataJson:" + dataJson); switch (state) { case SudMGPMGState.MG_COMMON_PLAYER_IN: // 1.加入状态（已修改） SudMGPMGState.MGCommonPlayerIn mgCommonPlayerIn = SudJsonUtils.fromJson(dataJson, SudMGPMGState.MGCommonPlayerIn.class); diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryPopup.java b/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryPopup.java index 77d276c54..edd7ff544 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryPopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryPopup.java @@ -95,7 +95,7 @@ public class LiveSudGameHistoryPopup extends BottomPopupView { @Override public void loadData(int p, HttpCallback callback) { page = p; - LiveHttpUtil.gameRecord(sudGameId, currencyType, dateType, p - 1, callback); + LiveHttpUtil.gameRecord(sudGameId, currencyType, dateType, p, callback); } @Override diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryViewHolder.java b/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryViewHolder.java index 1a16901dc..643961282 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/LiveSudGameHistoryViewHolder.java @@ -1,6 +1,5 @@ package com.yunbao.common.views; -import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -16,6 +15,7 @@ public class LiveSudGameHistoryViewHolder extends RecyclerView.ViewHolder { private TextView sudGameName, sudGameTime, sudGameUser, sudGameCoin; private ImageView sudGameType; + public LiveSudGameHistoryViewHolder(@NonNull View itemView) { super(itemView); sudGameName = itemView.findViewById(R.id.sud_game_name); @@ -29,23 +29,24 @@ public class LiveSudGameHistoryViewHolder extends RecyclerView.ViewHolder { sudGameName.setText(model.getTitle()); sudGameTime.setText(model.getGameEndTime()); sudGameCoin.setText(String.valueOf(model.getSettlement())); - if (model.getCurrencyType()==3){ + if (model.getCurrencyType() == 3) { - ImgLoader.display(itemView.getContext(),R.mipmap.gold_coin,sudGameType); - } if (model.getCurrencyType()==2) { - ImgLoader.display(itemView.getContext(),R.mipmap.icon_collectibles,sudGameType); + ImgLoader.display(itemView.getContext(), R.mipmap.gold_coin, sudGameType); + } + if (model.getCurrencyType() == 2) { + ImgLoader.display(itemView.getContext(), R.mipmap.icon_collectibles, sudGameType); } StringBuffer stringBuffer = new StringBuffer(); for (int i = 0; i < model.getUserName().size(); i++) { - if (i > model.getUserName().size() - 2) { - stringBuffer.append(model.getUserName().get(i)) - .append(" / "); - } else { - stringBuffer.append(model.getUserName().get(i)); - } - + stringBuffer.append(model.getUserName().get(i)) + .append("/"); } - sudGameUser.setText(stringBuffer.toString()); + if (stringBuffer.length() > 0) { + sudGameUser.setText(stringBuffer.toString().substring(0, stringBuffer.toString().length() - 1)); + } else { + sudGameUser.setText(stringBuffer.toString()); + } + } } diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java index 1b7f967e0..9abc53cf4 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java @@ -264,6 +264,9 @@ public class LiveSudGamePopup extends BottomPopupView { } }); break; + case SudMGPMGState.MG_COMMON_GAME_STATE: + LiveNetManager.get(getContext()).deductMoney( mCreateSudRoomModel.getSudGameRoomId()); + break; } diff --git a/common/src/main/java/com/yunbao/common/views/SudGameListViewHolder.java b/common/src/main/java/com/yunbao/common/views/SudGameListViewHolder.java index 11252d5eb..f5832bad5 100644 --- a/common/src/main/java/com/yunbao/common/views/SudGameListViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/SudGameListViewHolder.java @@ -41,7 +41,7 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder { private TextView roomName, playerWeAre, playerWeAre2, goldenBeanNumber; private RoundedImageView avatarList1, avatarList2, avatarList3, avatarList4, avatarList5; private ImageView gifImageView; - private ImageView sex, game_icon; + private ImageView sex, game_icon, gold_coin; public SudGameListViewHolder(@NonNull View itemView) { @@ -58,6 +58,7 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder { avatarList3 = itemView.findViewById(R.id.avatar_list3); avatarList4 = itemView.findViewById(R.id.avatar_list4); avatarList5 = itemView.findViewById(R.id.avatar_list5); + gold_coin = itemView.findViewById(R.id.gold_coin); sex = itemView.findViewById(R.id.sex); avatarList1.setVisibility(View.GONE); avatarList2.setVisibility(View.GONE); @@ -78,6 +79,11 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder { } else if (TextUtils.equals(model.getSex(), "2")) { ImgLoader.display(itemView.getContext(), R.mipmap.icon_sex_woman, sex); } + if (TextUtils.equals(model.getCurrencyType(), "2")) { + ImgLoader.display(itemView.getContext(), R.mipmap.icon_collectibles, gold_coin); + } else { + ImgLoader.display(itemView.getContext(), R.mipmap.gold_coin, gold_coin); + } ImgLoader.display(itemView.getContext(), model.getSudgameicon(), game_icon); ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.layout), new ViewClicksAntiShake.ViewClicksCallBack() { @Override @@ -134,7 +140,7 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder { public void run() { Bus.get().post(new LiveOpenSudRoomEvent().setCreateSudRoomModel(createSudRoomModel)); } - },1500); + }, 1500); } @Override diff --git a/common/src/main/res/layout/dialog_live_sud_game_history.xml b/common/src/main/res/layout/dialog_live_sud_game_history.xml index 5c090a3f7..e9dd0ba85 100644 --- a/common/src/main/res/layout/dialog_live_sud_game_history.xml +++ b/common/src/main/res/layout/dialog_live_sud_game_history.xml @@ -1,7 +1,7 @@ diff --git a/common/src/main/res/layout/item_home_sud_game_list.xml b/common/src/main/res/layout/item_home_sud_game_list.xml index 988a6487b..93aeb12d2 100644 --- a/common/src/main/res/layout/item_home_sud_game_list.xml +++ b/common/src/main/res/layout/item_home_sud_game_list.xml @@ -175,6 +175,7 @@ android:textSize="12sp" /> diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 93bc53e1d..14cd46733 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1340,8 +1340,7 @@ Limited ride And limited avatar frame Please enter the number of golden beans No limit 0K-1K beans - 1K-2K beans - 2K-5K beans + 1K-5K beans Above 5K beans User In a team of %s people, let\'s play together~ @@ -1384,5 +1383,8 @@ Limited ride And limited avatar frame Time: Game Record Random + 0-100 coins + 100-500 coins + Above 500 coins diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 0de0c245f..f4fcada3b 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1337,8 +1337,7 @@ 請選擇金豆數量 不限 0K-1K金豆 - 1K-2K金豆 - 2K-5K金豆 + 1K-5K金豆 5K以上金豆 玩家 %s人組隊中，一起來玩吧 @@ -1381,4 +1380,7 @@ 時間： 游戲記錄 随机 + 0-100星幣 + 100-500星幣 + 500以上星幣 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 418967ccc..840cdae55 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1336,8 +1336,7 @@ 請選擇金豆數量 不限 0K-1K金豆 - 1K-2K金豆 - 2K-5K金豆 + 1K-5K金豆 5K以上金豆 玩家 %s人組隊中，一起來玩吧 @@ -1380,4 +1379,7 @@ 時間： 游戲記錄 随机 + 0-100星幣 + 100-500星幣 + 500以上星幣 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 204909afa..310b9db53 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1336,8 +1336,7 @@ 請選擇金豆數量 不限 0K-1K金豆 - 1K-2K金豆 - 2K-5K金豆 + 1K-5K金豆 5K以上金豆 玩家 %s人組隊中，一起來玩吧 @@ -1380,5 +1379,8 @@ 時間： 游戲記錄 随机 + 0-100星幣 + 100-500星幣 + 500以上星幣 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 4d3088767..54c4f8490 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1343,8 +1343,7 @@ Limited ride And limited avatar frame Please enter the number of golden beans No limit 0K-1K beans - 1K-2K beans - 2K-5K beans + 1K-5K beans Above 5K beans User In a team of %s people, let\'s play together~ @@ -1387,4 +1386,7 @@ Limited ride And limited avatar frame 3. Users can customize the game threshold, which must be between 100 to 50000 gold beans or 10 to 1000 star coins, and the amount must be a multiple of 10; 4. At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users; 5. The final interpretation right of the event belongs to PDLIVE. + 0-100 coins + 100-500 coins + Above 500 coins diff --git a/config.gradle b/config.gradle index a94280c12..202c5ce57 100644 --- a/config.gradle +++ b/config.gradle @@ -5,7 +5,7 @@ ext { minSdkVersion : 21, targetSdkVersion : 33, versionCode : 453, - versionName : "6.6.2" + versionName : "6.6.3" ] manifestPlaceholders = [ //正式、 diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java index c3ec658ce..300c19e80 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java @@ -66,7 +66,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement private TextView gameTitle, sillTitle, houseOwnerTitle; private long interactionID = 0; private List customSidebarChildModels = new ArrayList<>(); - private String mSill = "0,0", mSillName, roomHolderType = "0", roomHolderTypeName; + private String mSill = "0,0,0", mSillName, roomHolderType = "0", roomHolderTypeName; private long animDuration = 500; private String id = "0"; private SudGameListAdapter sudGameListAdapter; @@ -88,7 +88,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement public void init() { initData(); - mSill = "0,0"; + mSill = "0,0,0"; roomHolderType = "0"; id = "0"; roomGameArrow = (ImageView) findViewById(R.id.room_game_arrow);