diff --git a/Assets/BingoBrain/FGUI/Package/JLoading/JLoadingBinder.cs b/Assets/BingoBrain/FGUI/Package/JLoading/JLoadingBinder.cs index b90ee17..a626560 100644 --- a/Assets/BingoBrain/FGUI/Package/JLoading/JLoadingBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/JLoading/JLoadingBinder.cs @@ -8,6 +8,7 @@ namespace FGUI.JLoading { public static void BindAll() { + UIObjectFactory.SetPackageItemExtension(com_login_a.URL, typeof(com_login_a)); UIObjectFactory.SetPackageItemExtension(btn_box.URL, typeof(btn_box)); UIObjectFactory.SetPackageItemExtension(com_loading.URL, typeof(com_loading)); } diff --git a/Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs b/Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs new file mode 100644 index 0000000..d99c727 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs @@ -0,0 +1,27 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.JLoading +{ + public partial class com_login_a : GComponent + { + public GTextField text_uid; + public Transition t0; + public const string URL = "ui://pc0wa25bdz5j6"; + + public static com_login_a CreateInstance() + { + return (com_login_a)UIPackage.CreateObject("JLoading", "com_login_a"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_uid = (GTextField)GetChildAt(2); + t0 = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMain/makeup.cs.meta b/Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/JMain/makeup.cs.meta rename to Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs.meta index 7ee7e37..47f0e47 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/makeup.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 126e8fa6c829b4042bcc9252f31f8319 +guid: 2460f67faae178d4f99ce59e600b8b3b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs index 8ee1b0e..16f0184 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs @@ -8,7 +8,6 @@ namespace FGUI.JMain { public static void BindAll() { - UIObjectFactory.SetPackageItemExtension(makeup.URL, typeof(makeup)); UIObjectFactory.SetPackageItemExtension(com_pal.URL, typeof(com_pal)); UIObjectFactory.SetPackageItemExtension(item_pal.URL, typeof(item_pal)); UIObjectFactory.SetPackageItemExtension(btn_question.URL, typeof(btn_question)); diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs index 1938c80..cf00288 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs @@ -15,7 +15,6 @@ namespace FGUI.JMain public com_cardplaytext com_cardplay; public GButton btn_ballon; public GButton btn_set; - public makeup makeup; public GButton btn_admin; public btn_question btn_question; public GButton btn_saveingpot; @@ -42,14 +41,13 @@ namespace FGUI.JMain com_cardplay = (com_cardplaytext)GetChildAt(8); btn_ballon = (GButton)GetChildAt(9); btn_set = (GButton)GetChildAt(10); - makeup = (makeup)GetChildAt(11); - btn_admin = (GButton)GetChildAt(12); - btn_question = (btn_question)GetChildAt(13); - btn_saveingpot = (GButton)GetChildAt(14); - btn_petty = (btn_petty)GetChildAt(15); - btn_play = (GButton)GetChildAt(16); - btn_wb = (GButton)GetChildAt(17); - btn_pal = (GButton)GetChildAt(18); + btn_admin = (GButton)GetChildAt(11); + btn_question = (btn_question)GetChildAt(12); + btn_saveingpot = (GButton)GetChildAt(13); + btn_petty = (btn_petty)GetChildAt(14); + btn_play = (GButton)GetChildAt(15); + btn_wb = (GButton)GetChildAt(16); + btn_pal = (GButton)GetChildAt(17); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMain/makeup.cs b/Assets/BingoBrain/FGUI/Package/JMain/makeup.cs deleted file mode 100644 index 4ea0c2a..0000000 --- a/Assets/BingoBrain/FGUI/Package/JMain/makeup.cs +++ /dev/null @@ -1,41 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.JMain -{ - public partial class makeup : GComponent - { - public GTextField gold_text; - public GTextField cash_text; - public GButton btn_cash; - public GButton btn_goldout; - public GProgressBar gold_progress; - public GProgressBar cash_progress; - public GTextField gold_progress_text; - public GTextField cash_progress_text; - public GTextField coin_cash; - public const string URL = "ui://qw9x6rf3112epi7"; - - public static makeup CreateInstance() - { - return (makeup)UIPackage.CreateObject("JMain", "makeup"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - gold_text = (GTextField)GetChildAt(2); - cash_text = (GTextField)GetChildAt(5); - btn_cash = (GButton)GetChildAt(6); - btn_goldout = (GButton)GetChildAt(7); - gold_progress = (GProgressBar)GetChildAt(8); - cash_progress = (GProgressBar)GetChildAt(9); - gold_progress_text = (GTextField)GetChildAt(10); - cash_progress_text = (GTextField)GetChildAt(11); - coin_cash = (GTextField)GetChildAt(13); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/Model/Info/SkinInfot.cs b/Assets/BingoBrain/Model/Info/SkinInfot.cs index ac89d00..bdcd0c0 100644 --- a/Assets/BingoBrain/Model/Info/SkinInfot.cs +++ b/Assets/BingoBrain/Model/Info/SkinInfot.cs @@ -138,6 +138,8 @@ namespace BingoBrain public static uint ExchangeUI_Close = ++cursor_OpenClose; public static uint PalUI_Open = ++cursor_OpenClose; public static uint PalUI_Close = ++cursor_OpenClose; + public static uint LoginAUI_Open = ++cursor_OpenClose; + public static uint LoginAUI_Close = ++cursor_OpenClose; } public static partial class UICtrlMsg { diff --git a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs index 785dcff..7d5778a 100644 --- a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs @@ -67,5 +67,6 @@ namespace BingoBrain public const string PettyAwardCtrl = "PettyAwardCtrl"; public const string ExchangeCtrl = "ExchangeCtrl"; public const string PalCtrl = "PalCtrl"; + public const string LoginACtrl = "LoginACtrl"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModelConst.cs b/Assets/BingoBrain/ModuleBoard/ModelConst.cs index 49f0117..77f18cd 100644 --- a/Assets/BingoBrain/ModuleBoard/ModelConst.cs +++ b/Assets/BingoBrain/ModuleBoard/ModelConst.cs @@ -55,5 +55,6 @@ namespace BingoBrain public const string PettyAwardModel = "PettyAwardModel"; public const string ExchangeModel = "ExchangeModel"; public const string PalModel = "PalModel"; + public const string LoginAModel = "LoginAModel"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs index f3c598d..9817117 100644 --- a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs +++ b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs @@ -50,6 +50,7 @@ namespace BingoBrain moduleBoardk.AddModel(ModelConst.H5Model, new H5Model()); moduleBoardk.AddModel(ModelConst.ExchangeModel, new ExchangeModel()); moduleBoardk.AddModel(ModelConst.PalModel, new PalModel()); + moduleBoardk.AddModel(ModelConst.LoginAModel, new LoginAModel()); } public static void AutoRegisterUIType() @@ -97,6 +98,7 @@ namespace BingoBrain moduleBoardk.AddUIType(UIConst.H5UI, typeof(H5UI)); moduleBoardk.AddUIType(UIConst.ExchangeUI, typeof(ExchangeUI)); moduleBoardk.AddUIType(UIConst.PalUI, typeof(PalUI)); + moduleBoardk.AddUIType(UIConst.LoginAUI, typeof(LoginAUI)); } public static void AutoRegisterCtrl() @@ -145,6 +147,7 @@ namespace BingoBrain moduleBoardk.AddCtrl(CtrlConst.H5Ctrl, new H5Ctrl()); moduleBoardk.AddCtrl(CtrlConst.ExchangeCtrl, new ExchangeCtrl()); moduleBoardk.AddCtrl(CtrlConst.PalCtrl, new PalCtrl()); + moduleBoardk.AddCtrl(CtrlConst.LoginACtrl, new LoginACtrl()); } public static void AutoRegisterUICtrl() @@ -193,6 +196,7 @@ namespace BingoBrain moduleBoardk.AddUICtrl(UICtrlConst.H5UICtrl, new H5UICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.ExchangeUICtrl, new ExchangeUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.PalUICtrl, new PalUICtrl()); + moduleBoardk.AddUICtrl(UICtrlConst.LoginAUICtrl, new LoginAUICtrl()); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UIConst.cs b/Assets/BingoBrain/ModuleBoard/UIConst.cs index cb457fe..6ac03e2 100644 --- a/Assets/BingoBrain/ModuleBoard/UIConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UIConst.cs @@ -105,5 +105,6 @@ namespace BingoBrain public const string PettyAwardUI = "PettyAwardUI"; public const string ExchangeUI = "ExchangeUI"; public const string PalUI = "PalUI"; + public const string LoginAUI = "LoginAUI"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs index 04b8b43..07b156a 100644 --- a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs @@ -68,5 +68,6 @@ namespace BingoBrain public const string PettyAwardUICtrl = "PettyAwardUICtrl"; public const string ExchangeUICtrl = "ExchangeUICtrl"; public const string PalUICtrl = "PalUICtrl"; + public const string LoginAUICtrl = "LoginAUICtrl"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index e632a1f..8f6010b 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -331,7 +331,7 @@ namespace BingoBrain { ui.btn_ballon.touchable = true; GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - }, ui.btn_ballon, GameHelper.IsGiftSwitch() ? ui.makeup.cash_text : null); + }, ui.btn_ballon); } }); } @@ -528,11 +528,11 @@ namespace BingoBrain // { // return; // } - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1, - value => { ui.makeup.cash_text.text = value.ToString("0.00"); }); + // DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1, + // value => { ui.makeup.cash_text.text = value.ToString("0.00"); }); - ui.makeup.cash_progress_text.text = PreferencesMgr.Instance.Currency102 + "/" + vo.item_need; - ui.makeup.cash_progress.value = ((float)PreferencesMgr.Instance.Currency102 * 100) / vo.item_need; + // ui.makeup.cash_progress_text.text = PreferencesMgr.Instance.Currency102 + "/" + vo.item_need; + // ui.makeup.cash_progress.value = ((float)PreferencesMgr.Instance.Currency102 * 100) / vo.item_need; // var leftCash = (double)Math.Max(vo.item_need - PreferencesMgr.Instance.Currency101, 0); // com_box.text_more.SetVar("left", GameHelper.Get101Str((decimal)leftCash)).FlushVars(); // com_box.pb_num.max = vo.item_need; diff --git a/Assets/BingoBrain/ModuleUI/LoginA.meta b/Assets/BingoBrain/ModuleUI/LoginA.meta new file mode 100644 index 0000000..40c9f56 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70abc757db03fa14fb55166286e33e82 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginACtrl.cs b/Assets/BingoBrain/ModuleUI/LoginA/LoginACtrl.cs new file mode 100644 index 0000000..558f4da --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginACtrl.cs @@ -0,0 +1,25 @@ +using BingoBrain.Core; + +namespace BingoBrain +{ + public class LoginACtrl : BaseCtrl + { + public static LoginACtrl Instance { get; private set; } + + private LoginAModel model; + + #region 生命周期 + protected override void OnInit() + { + Instance = this; + //model = ModuleManager.Instance..GetModel(ModelConst.LoginAModel) as LoginAModel; + } + + protected override void OnDispose() + { + Instance = null; + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginACtrl.cs.meta b/Assets/BingoBrain/ModuleUI/LoginA/LoginACtrl.cs.meta new file mode 100644 index 0000000..1868313 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginACtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d7be6d39d4fce5d48891f72ae83a8f9e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginAModel.cs b/Assets/BingoBrain/ModuleUI/LoginA/LoginAModel.cs new file mode 100644 index 0000000..e4d620d --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginAModel.cs @@ -0,0 +1,23 @@ +using BingoBrain.Core; + +namespace BingoBrain +{ + public class LoginAModel : BaseModel + { + #region 生命周期 + + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + protected override void OnReset() + { + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginAModel.cs.meta b/Assets/BingoBrain/ModuleUI/LoginA/LoginAModel.cs.meta new file mode 100644 index 0000000..f597666 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginAModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ed73858f32591a24abd037f84d05f7b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginAUI.cs b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUI.cs new file mode 100644 index 0000000..435a1a9 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUI.cs @@ -0,0 +1,84 @@ +using BingoBrain.Core; +using BingoBrain.HotFix; +using FGUI.ACommon; +using UnityEngine; + +namespace BingoBrain +{ + public class LoginAUI : BaseUI + { + private LoginAUICtrl ctrl; + private LoginAModel model; + private FGUI.JLoading.com_login_a ui; + + public LoginAUI(LoginAUICtrl ctrl) : base(ctrl) + { + uiName = UIConst.LoginAUI; + this.ctrl = ctrl; + } + + protected override void SetUIInfo(UIInfo uiInfo) + { + uiInfo.packageName = "JLoading"; + uiInfo.assetName = "com_login_a"; + uiInfo.layerType = UILayerType.Normal; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; + uiInfo.isNeedUIMask = true; + } + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.LoginAModel) as LoginAModel; + } + + protected override void OnClose() + { + } + + protected override void OnBind() + { + ui = baseUI as FGUI.JLoading.com_login_a; + } + + protected override void OnOpenBefore(object args) + { + InitView(); + } + + protected override void OnOpen(object args) + { + } + + protected override void OnHide() + { + } + + protected override void OnDisplay(object args) + { + } + #endregion + + #region 消息 + protected override void AddListener() + { + AppDispatcher.Instance.AddListener(CsjInfoC.Show_uid, Show_uid); + } + protected override void RemoveListener() + { + AppDispatcher.Instance.RemoveListener(CsjInfoC.Show_uid, Show_uid); + } + void Show_uid(object a = null) + { + ui.text_uid.text = "uid" + GameHelper.GetLoginModel().uid; + } + #endregion + + //初始化页面逻辑 + private void InitView() + { + + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginAUI.cs.meta b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUI.cs.meta new file mode 100644 index 0000000..fcb4cc9 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7508c9044c7bcc74e83c032adca95c66 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginAUICtrl.cs b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUICtrl.cs new file mode 100644 index 0000000..03c8034 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUICtrl.cs @@ -0,0 +1,74 @@ +using BingoBrain.Core; +using BingoBrain.HotFix; + +namespace BingoBrain +{ + public class LoginAUICtrl : BaseUICtrl + { + private LoginAUI ui; + private LoginAModel model; + + private uint openUIMsg = SkinInfo.LoginAUI_Open; + private uint closeUIMsg = SkinInfo.LoginAUI_Close; + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.LoginAModel) as LoginAModel; + } + + protected override void OnDispose() + { + } + + public override void OpenUI(object args = null) + { + if (ui == null) + { + ui = new LoginAUI(this); + ui.Open(args); + } + } + + public override void CloseUI(object args = null) + { + if (ui != null && !ui.isClose) + { + ui.Close(); + } + ui = null; + } + #endregion + + #region 消息 + public override uint GetOpenUIMsg(string uiName) + { + return openUIMsg; + } + public override uint GetCloseUIMsg(string uiName) + { + return closeUIMsg; + } + + protected override void AddListener() + { + uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); + uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); + } + protected override void RemoveListener() + { + uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); + uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); + } + + protected override void AddServerListener() + { + + } + protected override void RemoveServerListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/LoginA/LoginAUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUICtrl.cs.meta new file mode 100644 index 0000000..46a798d --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/LoginA/LoginAUICtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 66ca3c84bf1bcdf4db260da89e5610db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoSun/Scripts/InfoC/CsjInfoC.cs b/Assets/BingoSun/Scripts/InfoC/CsjInfoC.cs index 41c5587..d8fd107 100644 --- a/Assets/BingoSun/Scripts/InfoC/CsjInfoC.cs +++ b/Assets/BingoSun/Scripts/InfoC/CsjInfoC.cs @@ -59,4 +59,5 @@ public static class CsjInfoC public static readonly uint WorldRaycast_EnableChange = ++Cursor_BASE; public static readonly uint LoginInit = ++Cursor_BASE; + public static readonly uint Show_uid = ++Cursor_BASE; } \ No newline at end of file diff --git a/Assets/BingoSun/Scripts/Keril/Pva.cs b/Assets/BingoSun/Scripts/Keril/Pva.cs index 31dabbe..2124392 100644 --- a/Assets/BingoSun/Scripts/Keril/Pva.cs +++ b/Assets/BingoSun/Scripts/Keril/Pva.cs @@ -53,6 +53,10 @@ namespace BingoBrain.Core { AppDispatcher.Instance.Dispatch(CsjInfoC.UI_DisplayLoadingUI); } + else + { + UICtrlDispatcher.Instance.Dispatch(SkinInfo.LoginAUI_Open); + } } diff --git a/Assets/BingoSun/Scripts/LoginSystem.cs b/Assets/BingoSun/Scripts/LoginSystem.cs index b46682c..2553335 100644 --- a/Assets/BingoSun/Scripts/LoginSystem.cs +++ b/Assets/BingoSun/Scripts/LoginSystem.cs @@ -97,11 +97,19 @@ public class LoginSystem : BaseSystem { AppDispatcher.Instance.Dispatch(CsjInfoC.UI_DisplayLoadingUI); } - PlayerPrefs.SetInt("is_gift", 1); + PlayerPrefs.SetInt("is_gift", 1); } else { +#if BingoBrainRelease BrigdeIOS.showGameA(true); +#else + AppDispatcher.Instance.Dispatch(CsjInfoC.Show_uid); + DOVirtual.DelayedCall(2, () => + { + BrigdeIOS.showGameA(true); + }); +#endif return; } loginModel.preferences = new Preferences(); diff --git a/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes index 5e6f9bb..95327b2 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JLoading_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/JLoading_atlas0.png index a76d48e..ecd102f 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JLoading_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/JLoading_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JLoading_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JLoading_fui.bytes index 5ee3f70..a816255 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JLoading_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JLoading_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png index cd58e32..6672d65 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes index 80be7a2..df388e7 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes differ