From 137f9020b8895e1ea621e600bbdc25603a8546d4 Mon Sep 17 00:00:00 2001 From: changyunjia <905640960@qq.com> Date: Wed, 13 May 2026 18:18:03 +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 --- .../Package/JBingoPlay/JBingoPlayBinder.cs | 1 + .../FGUI/Package/JBingoPlay/btn_cancel.cs | 25 ++++++++++++++++++ .../Package/JBingoPlay/btn_cancel.cs.meta | 11 ++++++++ .../FGUI/Package/JBingoPlay/com_playcard.cs | 6 ++--- .../FGUI/Package/JRewardPop/com_extraItem.cs | 6 ++--- .../ModuleUI/BingoCard/BingoCardUI.cs | 5 ---- .../ModuleUI/BingoHall/BingoHallUI.cs | 2 +- .../AssetHotFix/FGUI/JBingoPlay_fui.bytes | Bin 32833 -> 33114 bytes .../AssetHotFix/FGUI/JMain_fui.bytes | Bin 18124 -> 18134 bytes .../AssetHotFix/FGUI/JRewardPop_fui.bytes | Bin 9566 -> 9566 bytes .../AssetHotFix/FGUI/ZM_Petty_fui.bytes | Bin 8249 -> 8249 bytes 11 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs create mode 100644 Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs.meta diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/JBingoPlayBinder.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/JBingoPlayBinder.cs index 6000986..2c7ea00 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/JBingoPlayBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/JBingoPlayBinder.cs @@ -19,6 +19,7 @@ namespace FGUI.JBingoPlay UIObjectFactory.SetPackageItemExtension(com_playcard.URL, typeof(com_playcard)); UIObjectFactory.SetPackageItemExtension(com_play.URL, typeof(com_play)); UIObjectFactory.SetPackageItemExtension(com_morecard.URL, typeof(com_morecard)); + UIObjectFactory.SetPackageItemExtension(btn_cancel.URL, typeof(btn_cancel)); UIObjectFactory.SetPackageItemExtension(com_broadcast1.URL, typeof(com_broadcast1)); UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1)); UIObjectFactory.SetPackageItemExtension(com_prop.URL, typeof(com_prop)); diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs new file mode 100644 index 0000000..964071e --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs @@ -0,0 +1,25 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.JBingoPlay +{ + public partial class btn_cancel : GButton + { + public GRichTextField text_no; + public const string URL = "ui://qrqjiu5sogc9pio"; + + public static btn_cancel CreateInstance() + { + return (btn_cancel)UIPackage.CreateObject("JBingoPlay", "btn_cancel"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_no = (GRichTextField)GetChildAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs.meta b/Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs.meta new file mode 100644 index 0000000..38b8c03 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ddbced06607cd645b073c2167d4d546 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_playcard.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_playcard.cs index 769d1fc..76a297b 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_playcard.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_playcard.cs @@ -20,8 +20,8 @@ namespace FGUI.JBingoPlay public btn_card btn_card8; public btn_card btn_card9; public GButton btn_collect; - public GRichTextField text_no; public GButton btn_video; + public btn_cancel text_no; public Transition fx_show; public Transition fx_pick; public const string URL = "ui://qrqjiu5slbaa0"; @@ -48,8 +48,8 @@ namespace FGUI.JBingoPlay btn_card8 = (btn_card)GetChildAt(9); btn_card9 = (btn_card)GetChildAt(10); btn_collect = (GButton)GetChildAt(11); - text_no = (GRichTextField)GetChildAt(12); - btn_video = (GButton)GetChildAt(13); + btn_video = (GButton)GetChildAt(12); + text_no = (btn_cancel)GetChildAt(13); fx_show = GetTransitionAt(0); fx_pick = GetTransitionAt(1); } diff --git a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs index 5e1b507..ac8e943 100644 --- a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs +++ b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs @@ -12,8 +12,8 @@ namespace FGUI.JRewardPop public GTextField txt_title; public GButton closeButton; public GTextField text_num; - public GButton btn_more; public com_roll com_roll; + public GButton btn_more; public GTextField text_cardnum; public btn_claim btn_claim; public const string URL = "ui://tm1qhgb4n5d50"; @@ -32,8 +32,8 @@ namespace FGUI.JRewardPop txt_title = (GTextField)GetChildAt(3); closeButton = (GButton)GetChildAt(4); text_num = (GTextField)GetChildAt(8); - btn_more = (GButton)GetChildAt(9); - com_roll = (com_roll)GetChildAt(10); + com_roll = (com_roll)GetChildAt(9); + btn_more = (GButton)GetChildAt(10); text_cardnum = (GTextField)GetChildAt(13); btn_claim = (btn_claim)GetChildAt(16); } diff --git a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs index 9c04e84..417feee 100644 --- a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs @@ -230,11 +230,6 @@ namespace BingoBrain private void ClickContinueBtn() { - if (!canClick) - { - return; - } - OpenAll(); } diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index 86e2e2e..e612202 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -197,7 +197,7 @@ namespace BingoBrain { UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); }); - if (SaveData.GetSaveobject().PettyState == 0) UICtrlDispatcher.Instance.Dispatch(SkinInfo.PettyAwardUI_Open); + if (SaveData.GetSaveobject().PettyState == 0 && GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.PettyAwardUI_Open); } private void UpdateNextCardBoardTime() diff --git a/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes index de2390b40a30803660faf7a59c96ef69e1bcf802..6694c3bc8802c846f3fb8a2418f5edd0d09d86a1 100644 GIT binary patch delta 3943 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 r&(FW11-jNQoKsa-GpDY8HtBQXOqN^8}3+&Y*M^ delta 3716 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 GR2~3cg&3#+ delta 107 zcmccC%Xp@jae_5x3^xv{s4vmhX4Qp2mk;C2LO{n z2o{s%5F3*|5Elc80Ev@W5L1(45f`%-5v2(Og#d@Mz8W70lkg%N5(jQIUv4#IH2?@= PbZ%d5Z*pa`3L{hk^sXH{ delta 96 zcmV-m0H6QfO5RGaJ`j_V5Elc50EUyS5K|gb2LS*O06qXh07L*x08#)_2>^%x{s4#o ziIZ3mI+J1%7qb=-r3nLv0Ex4{8XpJ}2W~ZAZZ%{z00?4qZeMM0a%Gd;A{?^|BU1ug CrW{xR diff --git a/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes index 6ae3cf05c8ef639534cc7f88e87b29b8d03acbaf..826c3bd8959945f3f0a3fe05cfc17b0cc6e170e8 100644 GIT binary patch delta 85 zcmdn#u+w1!3nLrDNd^W6i^*J!*@8fZ6cFEJWME(p1u}vrFJxEYHWDxY|DTbOfti6} h@_GsJ&1V?n`1qy+rNw~inCgLynILtWV+8K<0{|NO6EOe) delta 83 zcmdn#u+w1!3nLpN69WT-(PS>hY{CCP0OZ_ZWME*P2V?|IUdXP(X(wI|7G|ED$Re@% aG-Es;-&UZc2v8LxNcl{Vs?9M1cliO#3>MV@