From 9a93ae4b1907b9ea3c56d28604dc9abfce5f045c Mon Sep 17 00:00:00 2001 From: changyunjia <905640960@qq.com> Date: Tue, 2 Jun 2026 15:47:38 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/BingoBrain/Harmony/GameHelper.cs | 7 ++++--- .../ModuleUI/BingoCard/BingoCardUI.cs | 3 +++ .../ModuleUI/BingoHall/BingoHallUI.cs | 3 ++- .../ModuleUI/BingoHalld/BingoHalldUI.cs | 7 ++++--- .../ModuleUI/MakeupConfirm/MakeupConfirmUI.cs | 11 +++++++++-- .../ModuleUI/SaveingPot/SaveingPotUI.cs | 8 ++++++++ .../AssetHotFix/FGUI/JMain_fui.bytes | Bin 18060 -> 18060 bytes .../AssetHotFix/FGUI/JMall_fui.bytes | Bin 9106 -> 9026 bytes .../AssetHotFix/FGUI/tixian_fui.bytes | Bin 56369 -> 56360 bytes 9 files changed, 30 insertions(+), 9 deletions(-) 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 83be87c41b72e9dbad37391eeb195fd7e544686d..4983e9a4d0ca83d95975878e8512e6e302f9a35b 100644 GIT binary patch delta 20 bcmeC_W$fu?+;C5gkzulLe-pWd5Mv#_CU|Y+U4j3J5v21)^T80hmdzL&4)fny58G-KusY9_+ zb!dpZ13OVh&7oDI9J}asXrZV;B`IMoJyi?y{s+~1zX^XMyH`bO79;NEuG&?RJ$fYH zD8YpF$U+YLdB_J+7v@oiz3fJ^z0}LdYF5b;Vxai&Xt59bX=Auss;6FyBWOn802)~K ztMGDTBll`)rzu-*;&U_Ano7k%9HQr@3aN#{BJAQYS}7%>TC{P`V8ph}cEErz96>ma zq65cp94EA)0r-!&PQLUcPVs;Qstq*I8graz#%U@syQMDHqtKfGbFjpsy3xY}KAQca zwC|~j^5~+vBTM-${GxhwQGL3o@}OS=*=Xg)hn6;D|KhM%Ymq*r#p;&MkW;b9XIbAl z`fM$h2e@XCvXzFo^B7u~mpGBhW`e{CZP@`UE?|ge6q`JZi+q|>Y|askF4b@5s`8cf zW4Ods={8FcH+w<4ql(MSB3qic!t7#RWjCQjns z(*57LXY2C)iUB_DpTvD?QzNNFEil@UgjD$Gh3XPb%ui~v`k(l5bYA3%tEGz+0Gnbjx#5iv&<3ZmuT%SbBwlU>w8^{ yOAK>nNcW!c{(wGkYz&Vm)sZNY;PpCO0+^aEar_RLu8YqNkX!3B(pzaF;m035z9_E% delta 1165 zcmZvbSxl2b6ot> z^6>jJ%@z$(U}@Dl1OV zowLT;GSKXebDq&;tSg|kN{`EFX`{b`a?@34X=lwL>2+;PIgBHrevLvFrvn-VeRu#D zj^c;}-AOqeI2Nh$QyUds)rsQ~Z5FkXXiac}H+*(GZM?1+Cyk9)ogxP(ja8?~spJ{5 zg6tyClV{22YsOWJ74K;6hCDOk7bALy>Y3?7{i=m}Iaxt=8rg^3UE}T@ zSx?6L{Hlq}Alu1O@)FrVc9OS!`du%L*lWa*!~Cj)O2IH)sbRb&UCaq?%M-E~cgQpa j-0QX{_nDm4>oYT|VXK;u5zv=VTy@8e$Ti9Q)Nellh;2<( diff --git a/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes index 5a5439c78f688a1430868273f175592d289fb0b3..f466d944c8d02ba2ca0d9c4a996bf9ac29acd765 100644 GIT binary patch delta 150 zcmdnEgL%ac<_({?CLf$Bx|yBZLzv6*|NsB*7#SFtdp1YPc^k4Z{AFNZT{YQ}Uvl$d z|DQbEj4})ijCX+w7^^CoAv;@8YD#Kq?&kl8TliR5obyvQcV9Zo1Q$-cdVvi9jNdt4 delta 146 zcmZ3ngL&f)<_({?Cf7_9-OSGIA~@FS+@! z|4$w^hMx=!jCUt*=#roOFh+RtomjceLa{H{zy|QATvh{$$Zr1MWyB5?5!>uOX`LY# xr*nQ@N@huBe%|Ikhg