diff --git a/Assets/BingoBrain/BingoScene.cs b/Assets/BingoBrain/BingoScene.cs index 34c76b0..3915e82 100644 --- a/Assets/BingoBrain/BingoScene.cs +++ b/Assets/BingoBrain/BingoScene.cs @@ -5,6 +5,8 @@ using BingoBrain.HotFix; using Unity.VisualScripting; using DontConfuse; using FairyGUI; +using DG.Tweening; + #if UNITY_EDITOR @@ -71,7 +73,7 @@ namespace BingoBrain private void OnLoadingComplete(object param = null) { CtrlDispatcher.Instance.Dispatch(CtrlMsg.Game_StartReady); - TimerHelper.mEasy.AddTimer(0.1f, () => + DOVirtual.DelayedCall(0.1f, () => { Audio.Instance.InitDefaultButtonClickSound(DoConst.UIButtonDefault); ModuleBoardk.Instance.AllModuleGameStart(); @@ -87,7 +89,7 @@ namespace BingoBrain int offset_y = ConfigSystem.GetConfig().WVOffset[0]; int offset_y1 = ConfigSystem.GetConfig().WVOffset[1]; - Debug.Log("barry offset_y: " + offset_y + " offset_y1: " + offset_y1); + Debug.Log("barry offset_y: " + offset_y + " offset_y1: " + offset_y1); float top_offset = 150;//fgui中的顶部信息的高度 float buttom_offset = 0; if (Screen.safeArea.y != 0) diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/btn_hall_h5.cs b/Assets/BingoBrain/FGUI/Package/ACommon/btn_hall_h5.cs index f96cd9a..17de561 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/btn_hall_h5.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/btn_hall_h5.cs @@ -8,6 +8,7 @@ namespace FGUI.ACommon public partial class btn_hall_h5 : GButton { public GTextField number_text; + public GTextField lab_time; public const string URL = "ui://pmf3wbjimfb0pif"; public static btn_hall_h5 CreateInstance() @@ -19,7 +20,8 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); - number_text = (GTextField)GetChildAt(3); + number_text = (GTextField)GetChildAt(2); + lab_time = (GTextField)GetChildAt(3); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast1.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast1.cs index 763f70e..bd7a0b3 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast1.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast1.cs @@ -7,9 +7,9 @@ namespace FGUI.ACommon { public partial class com_broadcast1 : GComponent { - public GButton btn_record; public com_broadcast_text1 broad_cast_text; public GGroup broad; + public GButton btn_record; public GGroup group_; public Transition t0; public Transition t1; @@ -24,9 +24,9 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); - btn_record = (GButton)GetChildAt(0); - broad_cast_text = (com_broadcast_text1)GetChildAt(1); - broad = (GGroup)GetChildAt(2); + broad_cast_text = (com_broadcast_text1)GetChildAt(0); + broad = (GGroup)GetChildAt(1); + btn_record = (GButton)GetChildAt(2); group_ = (GGroup)GetChildAt(3); t0 = GetTransitionAt(0); t1 = GetTransitionAt(1); diff --git a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs index 16f0184..eaeaf55 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs @@ -10,6 +10,7 @@ namespace FGUI.JMain { UIObjectFactory.SetPackageItemExtension(com_pal.URL, typeof(com_pal)); UIObjectFactory.SetPackageItemExtension(item_pal.URL, typeof(item_pal)); + UIObjectFactory.SetPackageItemExtension(btn_pal.URL, typeof(btn_pal)); UIObjectFactory.SetPackageItemExtension(btn_question.URL, typeof(btn_question)); UIObjectFactory.SetPackageItemExtension(com_faq.URL, typeof(com_faq)); UIObjectFactory.SetPackageItemExtension(com_list_main.URL, typeof(com_list_main)); diff --git a/Assets/BingoBrain/FGUI/Package/JMain/btn_pal.cs b/Assets/BingoBrain/FGUI/Package/JMain/btn_pal.cs new file mode 100644 index 0000000..1cd3ffa --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMain/btn_pal.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.JMain +{ + public partial class btn_pal : GButton + { + public GTextField lab_time; + public const string URL = "ui://qw9x6rf3dz5jpix"; + + public static btn_pal CreateInstance() + { + return (btn_pal)UIPackage.CreateObject("JMain", "btn_pal"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + lab_time = (GTextField)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMain/btn_pal.cs.meta b/Assets/BingoBrain/FGUI/Package/JMain/btn_pal.cs.meta new file mode 100644 index 0000000..b1473a9 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMain/btn_pal.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8df9026b5e978de4e820114b10b88d07 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs index cf00288..4d35d25 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs @@ -21,7 +21,7 @@ namespace FGUI.JMain public btn_petty btn_petty; public GButton btn_play; public GButton btn_wb; - public GButton btn_pal; + public btn_pal btn_pal; public const string URL = "ui://qw9x6rf3lbaa0"; public static com_main CreateInstance() @@ -47,7 +47,7 @@ namespace FGUI.JMain btn_petty = (btn_petty)GetChildAt(14); btn_play = (GButton)GetChildAt(15); btn_wb = (GButton)GetChildAt(16); - btn_pal = (GButton)GetChildAt(17); + btn_pal = (btn_pal)GetChildAt(17); } } } \ No newline at end of file diff --git a/Assets/BingoSun/Scripts/Keril/Pva.cs b/Assets/BingoSun/Scripts/Keril/Pva.cs index 9056d71..2124392 100644 --- a/Assets/BingoSun/Scripts/Keril/Pva.cs +++ b/Assets/BingoSun/Scripts/Keril/Pva.cs @@ -49,7 +49,7 @@ namespace BingoBrain.Core public static void Enter() { - if (false) + if (PlayerPrefs.GetInt("is_gift") == 1) { AppDispatcher.Instance.Dispatch(CsjInfoC.UI_DisplayLoadingUI); } diff --git a/Assets/BingoSun/Scripts/LoginSystem.cs b/Assets/BingoSun/Scripts/LoginSystem.cs index 9663845..e8da42b 100644 --- a/Assets/BingoSun/Scripts/LoginSystem.cs +++ b/Assets/BingoSun/Scripts/LoginSystem.cs @@ -8,6 +8,7 @@ using DG.Tweening; using BingoBrain.HotFix; using DontConfuse; using System; +using Spine; public class LoginSystem : BaseSystem @@ -93,9 +94,10 @@ public class LoginSystem : BaseSystem if (loginData.is_magic) { - if (true) + if (PlayerPrefs.GetInt("is_gift") != 1) { AppDispatcher.Instance.Dispatch(CsjInfoC.UI_DisplayLoadingUI); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.LoginAUI_Close); } PlayerPrefs.SetInt("is_gift", 1); } diff --git a/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png index 170fa82..a1a3b1f 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes index b0b39dc..b0b6812 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes index df388e7..ebd43ec 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes differ