diff --git a/Assets/BingoBrain/Harmony/GameHelper.cs b/Assets/BingoBrain/Harmony/GameHelper.cs index 3d49955..84780c4 100644 --- a/Assets/BingoBrain/Harmony/GameHelper.cs +++ b/Assets/BingoBrain/Harmony/GameHelper.cs @@ -705,7 +705,7 @@ namespace BingoBrain public static AdReward GetChanceByIdAndNum(int id, int num = 0) { - if(id==102) id=101; + if (id == 102) id = 101; var adRewardModel = GetConfig(); return adRewardModel.GetDataList().FirstOrDefault(vo => vo.reward == id && (vo.rewardAmount == 0 || vo.rewardAmount == num)); @@ -1659,7 +1659,8 @@ namespace BingoBrain } public static bool isRDExchangeMode() { - // return false;//zhushi + // return false;//zhushi + return true;//zhushi return SaveData.GetSaveobject().ExchangeModeToggle == 1; } public static string getDesByKey(string key) @@ -1686,7 +1687,7 @@ namespace BingoBrain if (GameHelper.isRDExchangeMode()) { string str = ""; - return str + $" {ch:N0}"; + return str + $" {ch:N}"; } else { diff --git a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs index 8731920..7c360bc 100644 --- a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs @@ -5,6 +5,7 @@ using BingoBrain.Core; using BingoBrain.HotFix; using FGUI.JBingoPlay; using System.Collections.Generic; +using DontConfuse; namespace BingoBrain { @@ -51,6 +52,7 @@ namespace BingoBrain ui?.fx_show.Stop(); OnClearTween(); }); + WebviewManager.Instance.SetDarkThough(true); } protected override void OnBind() @@ -77,6 +79,7 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { + WebviewManager.Instance.SetDarkThough(false); InitView(); } diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index 70a5a48..3020832 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -203,6 +203,7 @@ namespace BingoBrain { ui.btn_wb.visible = true; } + if (GameHelper.GetCommonModel().PiggyBankSwitch != 1) ui.btn_saveingpot.visible = false; Debug.Log(JsonConvert.SerializeObject(GameHelper.GetConfig().dataList)); } @@ -287,7 +288,7 @@ namespace BingoBrain if (ui.btn_ballon.visible) { MoveToOtherSide(); - (ui.btn_ballon as btn_balloon).cash_text.text = $" {GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102):N}"; + (ui.btn_ballon as btn_balloon).cash_text.text = $" {GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102):N}"; } } } diff --git a/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs b/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs index d468a59..115eea8 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs @@ -77,7 +77,7 @@ namespace BingoBrain protected override void RemoveListener() { //Hall.Instance.RemoveChangeGiftSwitch(InitView); - GameDispatcher.Instance.RemoveListener(BingoInfo.MainTab, OnGameTab); + GameDispatcher.Instance.RemoveListener(BingoInfo.MainTab, OnGameTab); } #endregion @@ -156,11 +156,12 @@ namespace BingoBrain private void OnClickTab(int tabIndex) { - UICtrlDispatcher.Instance.Dispatch(tabIndex == 1 ? SkinInfo.ExchangeUI_Open : SkinInfo.ExchangeUI_Close); + if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(tabIndex == 1 ? SkinInfo.ExchangeUI_Open : SkinInfo.ExchangeUI_Close); + else UICtrlDispatcher.Instance.Dispatch(tabIndex == 1 ? SkinInfo.JMallUI_Open : SkinInfo.JMallUI_Close); UICtrlDispatcher.Instance.Dispatch(tabIndex == 0 ? SkinInfo.BingoHallUI_Open : SkinInfo.BingoHallUI_Close); UICtrlDispatcher.Instance.Dispatch(tabIndex == 2 ? SkinInfo.BasptUI_Open : SkinInfo.BasptUI_Close); UICtrlDispatcher.Instance.Dispatch(tabIndex == 3 ? SkinInfo.H5UI_Open : SkinInfo.H5UI_Close); - ui.show_fight.selectedIndex = tabIndex == 4 ? 1 :0; + ui.show_fight.selectedIndex = tabIndex == 4 ? 1 : 0; UICtrlDispatcher.Instance.Dispatch(SkinInfo.SmailUI_Open); UICtrlDispatcher.Instance.Dispatch(SkinInfo.BottomUI_Open); Battle.Instance.SetBg(true); diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs index b16dcdc..41920a6 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs @@ -90,7 +90,7 @@ namespace BingoBrain makeupTaskData = args as MakeupTaskData; ch_index = makeupTaskData.tableId - 1; - // PreferencesMgr.Instance.Currency102 = 999999999; //zhushi + // PreferencesMgr.Instance.Currency102 = 999999999; //zhushi // makeupTaskData.LvVideoCount = 999;//zhushi // makeupTaskData.videoCount = 999;//zhushi @@ -626,7 +626,6 @@ namespace BingoBrain } ui.text_condi1.text = GameHelper.getChString(vo.item_need); - Debug.Log(GameHelper.getChString(vo.item_need)); ui.pb_condi1.max = vo.item_need; ui.text_ch_number.text = GameHelper.getChString(PreferencesMgr.Instance.Currency102); var curValue = Math.Min(PreferencesMgr.Instance.Currency102, vo.item_need); @@ -1025,6 +1024,14 @@ namespace BingoBrain makeupTaskData.rdData.Add(data); } } + if (remainValue > 0) + { + makeupRdData data = new makeupRdData(); + data.code = GameHelper.GenerateUniqueKey(); + data.coupon_mount = remainValue; // 面额就是剩余值 + data.isClaimed = false; + makeupTaskData.rdData.Add(data); + } PreferencesMgr.Instance.SaveMakeupTaskHistory(); } diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs index cf72e0b..2ad6471 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs @@ -541,6 +541,14 @@ namespace BingoBrain makeupTaskData.rdData.Add(data); } } + if (remainValue > 0) + { + SaveingPotRdData data = new SaveingPotRdData(); + data.code = GameHelper.GenerateUniqueKey(); + data.coupon_mount = remainValue; // 面额就是剩余值 + data.isClaimed = false; + makeupTaskData.rdData.Add(data); + } PreferencesMgr.Instance.SaveMakeupTaskHistory(); } diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes index 83be87c..4983e9a 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMall_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMall_fui.bytes index 972826f..d7589a3 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMall_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JMall_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes index 5a5439c..f466d94 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes differ