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 de2390b..6694c3b 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JBingoPlay_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes index 167bb65..33e7516 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/JRewardPop_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes index d02236c..8c8f0a4 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes index 6ae3cf0..826c3bd 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes differ