From f5badae0a7c935030f5edec96baf108c6cbc5bf2 Mon Sep 17 00:00:00 2001 From: changyunjia <905640960@qq.com> Date: Fri, 15 May 2026 18:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FGUI/Package/ACommon/com_currency.cs | 2 - .../BingoBrain/FGUI/Package/JMain/com_main.cs | 8 +++ Assets/BingoBrain/Harmony/GameHelper.cs | 4 +- Assets/BingoBrain/Manager/Battle.cs | 5 +- Assets/BingoBrain/Manager/Hall.cs | 2 +- .../ModuleUI/BingoHall/BingoHallUI.cs | 59 +++++++++++++++++- Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs | 2 +- Assets/BingoBrain/System/Game/BingoSystem.cs | 4 +- .../AssetHotFix/FGUI/ACommon_fui.bytes | Bin 21874 -> 21743 bytes .../AssetHotFix/FGUI/JMain_fui.bytes | Bin 22923 -> 23219 bytes 10 files changed, 75 insertions(+), 11 deletions(-) diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs index 21382af..4a116c2 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs @@ -11,7 +11,6 @@ namespace FGUI.ACommon public btn_101 btn_coin; public btn_102 btn_cash; public com_avatar com_avatar; - public GGroup top_group; public const string URL = "ui://pmf3wbjiaxgih3"; public static com_currency CreateInstance() @@ -27,7 +26,6 @@ namespace FGUI.ACommon btn_coin = (btn_101)GetChildAt(1); btn_cash = (btn_102)GetChildAt(2); com_avatar = (com_avatar)GetChildAt(3); - top_group = (GGroup)GetChildAt(4); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs index 9d27270..af1df71 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs @@ -23,6 +23,10 @@ namespace FGUI.JMain public btn_taks btn_task; public btn_wheel btn_wheel; public com_mainplay com_mainplay; + public GButton settings; + public GButton btn_coin; + public GButton btn_cash; + public GComponent com_avatar; public const string URL = "ui://qw9x6rf3lbaa0"; public static com_main CreateInstance() @@ -50,6 +54,10 @@ namespace FGUI.JMain btn_task = (btn_taks)GetChildAt(12); btn_wheel = (btn_wheel)GetChildAt(13); com_mainplay = (com_mainplay)GetChildAt(14); + settings = (GButton)GetChildAt(15); + btn_coin = (GButton)GetChildAt(16); + btn_cash = (GButton)GetChildAt(17); + com_avatar = (GComponent)GetChildAt(18); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/Harmony/GameHelper.cs b/Assets/BingoBrain/Harmony/GameHelper.cs index 3f57167..cfc8b00 100644 --- a/Assets/BingoBrain/Harmony/GameHelper.cs +++ b/Assets/BingoBrain/Harmony/GameHelper.cs @@ -249,7 +249,7 @@ namespace BingoBrain { case 101: { - if (UI.Instance.GetDynamicUI(UIConst.SmailUI) is SmailUI topUI2) + if (UI.Instance.GetDynamicUI(UIConst.BingoHallUI) is SmailUI topUI2) { gObject = topUI2.ui.btn_coin; } @@ -261,7 +261,7 @@ namespace BingoBrain break; case 102: { - if (UI.Instance.GetDynamicUI(UIConst.SmailUI) is SmailUI topUI2) + if (UI.Instance.GetDynamicUI(UIConst.BingoHallUI) is SmailUI topUI2) { gObject = topUI2.ui.btn_cash; } diff --git a/Assets/BingoBrain/Manager/Battle.cs b/Assets/BingoBrain/Manager/Battle.cs index 71e230b..e43b89b 100644 --- a/Assets/BingoBrain/Manager/Battle.cs +++ b/Assets/BingoBrain/Manager/Battle.cs @@ -46,8 +46,9 @@ namespace BingoBrain bg.transform.SetParent(BingoCell.root, false); CameraBoardk.Instance.mainCamera.gameObject.AddComponent(); // Debug.Log("??????????????????????????"); - // UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open); - //UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open); + + InitSystems(); ShungTik.InitRoot(BingoCell.root); diff --git a/Assets/BingoBrain/Manager/Hall.cs b/Assets/BingoBrain/Manager/Hall.cs index f1a36fe..29bbf5a 100644 --- a/Assets/BingoBrain/Manager/Hall.cs +++ b/Assets/BingoBrain/Manager/Hall.cs @@ -106,7 +106,7 @@ namespace BingoBrain UICtrlDispatcher.Instance.Dispatch(SkinInfo.BottomUI_Open); UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open); // UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.SmailUI_Open); + // UICtrlDispatcher.Instance.Dispatch(SkinInfo.SmailUI_Open); } else { diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index 8800e02..f64fc5f 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -67,6 +67,11 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { InitView(); + Set101(); + Set102(); + SetName(); + ui.settings.SetClick(OnClickSetting); + // ui.com_avatar.loader_flag.visible = false; // if (!GameHelper.IsGiftSwitch() && (ConfigSystem.GetConfig().WVswitch == 1)) // { // ui.btn_h5.visible = true; @@ -78,7 +83,57 @@ namespace BingoBrain // }); } + private void OnClickSetting() + { + UICtrlDispatcher.Instance.Dispatch(SkinInfo.JThinkUI_Open); + } + public void OnUpdate101(object obj = null) + { + if (obj != null) + { + var changeValue = (decimal)obj; + model.show101 += changeValue; + model.show101 = Math.Round(model.show101, 2); + Set101(model.show101.ToString("N")); + } + } + + public void Set101(string c101 = null) + { + if (c101 == null) + { + c101 = GameHelper.Get101().ToString("N0"); + } + + ui.btn_coin.title = $"{c101}"; + } + + public void OnUpdate102(object obj = null) + { + if (obj != null) + { + var changeValue = (decimal)obj; + model.show102 += changeValue; + model.show102 = Math.Round(model.show102, 2); + Set102(model.show102.ToString("N")); + } + } + + public void Set102(string c102 = null) + { + if (c102 == null) + { + c102 = GameHelper.Get102().ToString("N"); + } + + ui.btn_cash.title = $"{c102}"; + } + + private void SetName() + { + // GameHelper.SetName(ui.com_avatar.text_name); + } protected override void OnOpen(object args) { } @@ -209,6 +264,8 @@ namespace BingoBrain UICtrlDispatcher.Instance.Dispatch(SkinInfo.JTodUI_Open); }); + model.show101 = GameHelper.Get101(); + model.show102 = GameHelper.Get102(); } @@ -371,7 +428,7 @@ namespace BingoBrain if (PreferencesMgr.Instance.CardBoardSum >= need_card) { PreferencesMgr.Instance.CardBoardSum -= need_card; - PreferencesMgr.Instance.CardBoardIndex=play_index_list[i]; + PreferencesMgr.Instance.CardBoardIndex = play_index_list[i]; ui.com_cards.text_fx.text = $"-{need_card}"; ui.touchable = false; ui.com_cards.fx_num.Play(); diff --git a/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs b/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs index 5e3dfb7..9a20a51 100644 --- a/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs +++ b/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs @@ -77,7 +77,7 @@ namespace BingoBrain } if (Screen.safeArea.y != 0) { - ui.top_group.y=-90; + // ui.top_group.y=-90; } } diff --git a/Assets/BingoBrain/System/Game/BingoSystem.cs b/Assets/BingoBrain/System/Game/BingoSystem.cs index e9d0fc6..3855b0e 100644 --- a/Assets/BingoBrain/System/Game/BingoSystem.cs +++ b/Assets/BingoBrain/System/Game/BingoSystem.cs @@ -153,8 +153,8 @@ namespace BingoBrain DOVirtual.DelayedCall(UIMgrConst.OpenUIAnimEffectTime, delegate { UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open); - // UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.SmailUI_Open); + // UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); + // UICtrlDispatcher.Instance.Dispatch(SkinInfo.SmailUI_Open); if (GameHelper.IsGiftSwitch() && Random.Range(0, 100) < ConfigSystem.GetConfig().backhallrate) { BingoHalldUI.Instance.OnClickHall(); diff --git a/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes index 90440dca3cc2ddb793b6fbedf7dd360403f994df..b2c5e07168364de3cceb23b2bae4fd610c7a4611 100644 GIT binary patch delta 3073 zcmaKu30PFu701uv0uKt5HJ!!LD>XFKyg6>XwzD%(b`0!O;YuA z)wV9NsoGeh#x@#LqfJdU8j5YxNE>5pO&S|bG-+*VmHgimknf9hzVF@N+uE4qHL*jt;hUQrPhlcoPI6FFxPX=@?oRySQK0vDDj3oDhls&Flq z^;)>anF=%}Go?}{IVhV7s6dWs(X!U&DsRTP`g~F9;`aZfGww^}_5?rK;TCWB%1v>T zi3wJBr=yBy(k!Z!O807WRsUV8rWzu(Sx=M1Cp1KQ-9xon2xe2=7LTcN$30F~c*Lr? z)F9hE%6XpL^w`La7*piHsJSk+)C6z7o^`63=1aS0xmrLi@|tI5@Iq=cYRjQ~nhft# zX_?l47oHcMd!xRdsgi7406$(pfnLOuJuBxa;`n<|UKZ2Ih7-}OwYNrlb zPAlk3Qtxe3kJ4B%+oEM&aExn-qA$}|q{n;ixRp@+s$P&YRTvR+(bzJ~r&9${Cn9`} zR$=Oj%S*31TpGgMrOOnkt%mS1Duh>k%`6v97MC?xTPrtBCF<+6PIApn{0-S@w({fh zvbj+`LF*;dr`DwlT2IPqpNF*#__vY1DcwG${FK;y7x2^45#ldfeMhNh=v%VKw@KRs zoz1jGd@Q9b(qO6MZ$rl>?c+UN4=VZ&eOInoYPIjt_vr^iMMi6MRnZjMD%(d_TOZUF z6htfsQ!Q?^4H14wt0Znro%#{|Se_hHJyIjBrtMJPK|2R};vt*EtTH3k6^#u>N~1Jh zqG%UAD~tR_aB|bvs_ll8pCIC=ex>}J(v2zLAtFYM6UO?y6EX2l$yXQJ|qVMTeRnC zOMid=O*t7*z=x$FsDfXVof88P`;DLm?Fh7gf%wV6v(+!@C3z-zge~?-uuUCBL1tSn zACu{}=D?R9l<0A^?G-s^dr19?PKbX9=w`bcM?q7rCe-Vax1?uGuJ z=`ZlQ0$2FGQ&2WGcPRQhUxrwRR7ws1FWq5m!uE10NeQ&m?N$Rik zH<=f;kgpo4T#YiR_vr(<9aZUK98xKdwyD3vQAhL??QJ;u5Q(0MF44O2{~G;6%rPa} zCH#-4kEAiCn6Jy8m^|$URz9XrlBC!y?RBhwiq5vj78&cG(Ld#QY_a+m z-4>U)GXA&Bii=VI!97?LS8wWr_J55{kDMtBn?6W(#CwWQe4y!l$o@wk=mI<^9y1Qa z%=k#{4%Y8tORSDBbE1AZAK%O*$q8YK*-2(4jIc*fB-oUK)w>C~%9&jxEU|`N(UDl! zX2lx2$)3dOi6fn7r-6sq;B&N)DwO^lWyS82GOk>C@F?jTSHqr$$2P@Y>@B9G5pwBF zvMCdC*_!kcn~l5DKHj8!*jLt#pQ9{1TCR*=#A6`wlLMie>t~An*k2w=ZsLH$J;^!D zRxzc_Qh^*KEh!BgET>Znj58HP!N$}0qX2&?oj8+iICGaxCy{9ghoX)8yU^3<&|JV~C&Obp%5`GYzr9k0Q`j1!0pc(U|lCaO(bD4dnV z9g>W(NE)*e)den=%~@8}%Tr{3mep~Y9~$)Y6#T3j@)JNjl}iR?Es#|W$&g1EKP>D> zR2z7jB!i_~CXEiOn$9z1HRk19A^ROx+2`;`rWvrFF=UONp1~*2K)+3peK=fpgR6wI zt*V-9#Fm|?`nXm~v#pLhJbN&k!>~Cr%!cdmz`Ey;=0mnHVgRp#Y$P!r|;pRcvO2}3Ymu=(u(vf3TVZ1<|23vTc?9BJz=+AZP03`tnhGul>%gsGDR|0|UNc7DLR~Yf z(2moLa>2#mMlb<91jd2A;7rh|$d1#GYQZ&N1-Jq11iQdp;0^FB*vHG{R#7y@z+yZ0 b<1#4#Gr3Kc6x+Gu@TTIEPKOsv_4522JHuo8 delta 3353 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 d|M2dupdYICY(8{&cs~eU&CYe~)sVO6$iMG5