diff --git a/.vscode/settings.json b/.vscode/settings.json index 2334b1d..63f0cbf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -51,6 +51,6 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "BingoGrassland_android.sln", + "dotnet.defaultSolution": "BingoGrassland.sln", "git.ignoreLimitWarning": true } \ No newline at end of file diff --git a/Assets/BingoBrain/BingoScene.cs b/Assets/BingoBrain/BingoScene.cs index c89d6c3..c60872f 100644 --- a/Assets/BingoBrain/BingoScene.cs +++ b/Assets/BingoBrain/BingoScene.cs @@ -24,6 +24,9 @@ namespace BingoBrain protected override void OnSwhSceCompl(object param = null) { +#if UNITY_EDITOR + GameObject.Find("IngameDebugConsole").SetActive(false); +#endif StartUpAppProcess(); } @@ -39,7 +42,8 @@ namespace BingoBrain { CtrlDispatcher.Instance.AddListener(CtrlMsg.Login_Succeed, OnLoginSucceed); // #if !UNITY_EDITOR && UNITY_ANDROID - // MaxADKit.Init(); + MaxADKit.Init(); + Debug.Log("init"); // #endif OnInitAsset(); AppDispatcher.Instance.AddListener(CsjInfoC.UI_LoadingInitAsset, OnInitAsset); @@ -56,8 +60,8 @@ namespace BingoBrain AppDispatcher.Instance.Dispatch(CsjInfoC.InitUIMgr); AppDispatcher.Instance.AddListener(CsjInfoC.LoginInit, OnLoadingComplete); PreferencesMgr.Instance.InitPreferences(); - //NetworkDispatcher.Instance.Dispatch(ExternalInfo.GetConfig); - //NetworkDispatcher.Instance.AddListener(NetworkMsg.Start,ShowScene); + NetworkDispatcher.Instance.Dispatch(ExternalInfo.GetConfig);//quxiaozhushi + NetworkDispatcher.Instance.AddListener(NetworkMsg.Start, ShowScene);//quxiaozhushi } private void OnLoadingComplete(object param = null) @@ -72,6 +76,7 @@ namespace BingoBrain SaveingPotHelper.TestingClearTime(); // HideLoadingUI(); }); + SaveingPotHelper.ResetHistory(); } private void ShowScene(object a = null) diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/ACommonBinder.cs b/Assets/BingoBrain/FGUI/Package/ACommon/ACommonBinder.cs index bd98a21..aabae96 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/ACommonBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/ACommonBinder.cs @@ -18,6 +18,7 @@ namespace FGUI.ACommon UIObjectFactory.SetPackageItemExtension(btn_102.URL, typeof(btn_102)); UIObjectFactory.SetPackageItemExtension(btn_101.URL, typeof(btn_101)); UIObjectFactory.SetPackageItemExtension(btn_hall_h5.URL, typeof(btn_hall_h5)); + UIObjectFactory.SetPackageItemExtension(btn_fight.URL, typeof(btn_fight)); UIObjectFactory.SetPackageItemExtension(btn_h5.URL, typeof(btn_h5)); UIObjectFactory.SetPackageItemExtension(btn_main.URL, typeof(btn_main)); UIObjectFactory.SetPackageItemExtension(btn_todo.URL, typeof(btn_todo)); diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/btn_101.cs b/Assets/BingoBrain/FGUI/Package/ACommon/btn_101.cs index b112846..6645354 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/btn_101.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/btn_101.cs @@ -7,8 +7,6 @@ namespace FGUI.ACommon { public partial class btn_101 : GButton { - public GImage bg; - public GImage load_icon; public GGraph gp_hand; public const string URL = "ui://pmf3wbjilbaaeu"; @@ -21,9 +19,7 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); - bg = (GImage)GetChildAt(0); - load_icon = (GImage)GetChildAt(1); - gp_hand = (GGraph)GetChildAt(3); + gp_hand = (GGraph)GetChildAt(2); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/btn_102.cs b/Assets/BingoBrain/FGUI/Package/ACommon/btn_102.cs index 668a7b8..51ca2b6 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/btn_102.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/btn_102.cs @@ -7,6 +7,7 @@ namespace FGUI.ACommon { public partial class btn_102 : GButton { + public Controller gift; public GImage load_icon; public GGraph gp_hand; public const string URL = "ui://pmf3wbjilbaa8"; @@ -20,8 +21,9 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); + gift = GetControllerAt(0); load_icon = (GImage)GetChildAt(1); - gp_hand = (GGraph)GetChildAt(3); + gp_hand = (GGraph)GetChildAt(2); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_img.cs b/Assets/BingoBrain/FGUI/Package/ACommon/btn_fight.cs similarity index 50% rename from Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_img.cs rename to Assets/BingoBrain/FGUI/Package/ACommon/btn_fight.cs index e29607a..7938015 100644 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_img.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/btn_fight.cs @@ -3,17 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G006_menu_animal +namespace FGUI.ACommon { - public partial class btn_img : GButton + public partial class btn_fight : GButton { public Controller cont_select; - public GComponent head_loader; - public const string URL = "ui://fdihxyogrezm1d"; + public const string URL = "ui://pmf3wbjiog7vpiz"; - public static btn_img CreateInstance() + public static btn_fight CreateInstance() { - return (btn_img)UIPackage.CreateObject("G006_menu_animal", "btn_img"); + return (btn_fight)UIPackage.CreateObject("ACommon", "btn_fight"); } public override void ConstructFromXML(XML xml) @@ -21,7 +20,6 @@ namespace FGUI.G006_menu_animal base.ConstructFromXML(xml); cont_select = GetControllerAt(0); - head_loader = (GComponent)GetChildAt(0); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabad.cs.meta b/Assets/BingoBrain/FGUI/Package/ACommon/btn_fight.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabad.cs.meta rename to Assets/BingoBrain/FGUI/Package/ACommon/btn_fight.cs.meta index 0103712..a37c028 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabad.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/ACommon/btn_fight.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a6e903d2f84c34290b7c3fb24a1a7345 +guid: fda3cb79834b23349813834461c12fe9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_avatar.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_avatar.cs index 3625055..e2bdc69 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_avatar.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_avatar.cs @@ -7,8 +7,8 @@ namespace FGUI.ACommon { public partial class com_avatar : GComponent { - public GTextField text_name; public GLoader loader_flag; + public GTextField text_name; public const string URL = "ui://pmf3wbjix6ybho"; public static com_avatar CreateInstance() @@ -20,8 +20,8 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); + loader_flag = (GLoader)GetChildAt(1); text_name = (GTextField)GetChildAt(3); - loader_flag = (GLoader)GetChildAt(4); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs index 773ce78..4c51820 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs @@ -11,6 +11,7 @@ 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() @@ -26,6 +27,7 @@ namespace FGUI.ACommon btn_coin = (btn_101)GetChildAt(2); btn_cash = (btn_102)GetChildAt(3); com_avatar = (com_avatar)GetChildAt(4); + top_group = (GGroup)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs index 15db829..4ece0b8 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs @@ -9,9 +9,10 @@ namespace FGUI.ACommon { public Controller gift; public btn_main btn_main; - public btn_h5 btn_h5; + public btn_h5 btn_shop; public btn_todo btn_tab_redem; public btn_hall btn_hall; + public btn_fight btn_fight; public const string URL = "ui://pmf3wbjiokk5gf"; public static com_di CreateInstance() @@ -25,9 +26,10 @@ namespace FGUI.ACommon gift = GetControllerAt(0); btn_main = (btn_main)GetChildAt(1); - btn_h5 = (btn_h5)GetChildAt(2); + btn_shop = (btn_h5)GetChildAt(2); btn_tab_redem = (btn_todo)GetChildAt(3); btn_hall = (btn_hall)GetChildAt(4); + btn_fight = (btn_fight)GetChildAt(7); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_maindi.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_maindi.cs index 62ff126..e89f36e 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_maindi.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_maindi.cs @@ -7,6 +7,7 @@ namespace FGUI.ACommon { public partial class com_maindi : GComponent { + public Controller show_fight; public com_di com_di; public const string URL = "ui://pmf3wbjiokk5gg"; @@ -19,7 +20,8 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); - com_di = (com_di)GetChildAt(0); + show_fight = GetControllerAt(0); + com_di = (com_di)GetChildAt(2); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal.meta b/Assets/BingoBrain/FGUI/Package/Common_01.meta similarity index 77% rename from Assets/BingoBrain/FGUI/Package/Common_animal.meta rename to Assets/BingoBrain/FGUI/Package/Common_01.meta index a3b37fb..9174938 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6b1e422bf4f784501b009d7990349c29 +guid: 26ad4d79e34cc744ca9c152664f2d3eb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs b/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs new file mode 100644 index 0000000..eb557ae --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs @@ -0,0 +1,47 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; + +namespace FGUI.Common_01 +{ + public class Common_01Binder + { + public static void BindAll() + { + UIObjectFactory.SetPackageItemExtension(com_money.URL, typeof(com_money)); + UIObjectFactory.SetPackageItemExtension(btn_task_pass.URL, typeof(btn_task_pass)); + UIObjectFactory.SetPackageItemExtension(btn_watchAd.URL, typeof(btn_watchAd)); + UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1)); + UIObjectFactory.SetPackageItemExtension(btn_noads.URL, typeof(btn_noads)); + UIObjectFactory.SetPackageItemExtension(btn_get.URL, typeof(btn_get)); + UIObjectFactory.SetPackageItemExtension(btn_task.URL, typeof(btn_task)); + UIObjectFactory.SetPackageItemExtension(btn_faq.URL, typeof(btn_faq)); + UIObjectFactory.SetPackageItemExtension(btn_buy1.URL, typeof(btn_buy1)); + UIObjectFactory.SetPackageItemExtension(btn_rank.URL, typeof(btn_rank)); + UIObjectFactory.SetPackageItemExtension(com_adcoming.URL, typeof(com_adcoming)); + UIObjectFactory.SetPackageItemExtension(btn_max_buy.URL, typeof(btn_max_buy)); + UIObjectFactory.SetPackageItemExtension(btn_curr.URL, typeof(btn_curr)); + UIObjectFactory.SetPackageItemExtension(com_gold.URL, typeof(com_gold)); + UIObjectFactory.SetPackageItemExtension(btn_head.URL, typeof(btn_head)); + UIObjectFactory.SetPackageItemExtension(btn_claim3.URL, typeof(btn_claim3)); + UIObjectFactory.SetPackageItemExtension(com_add_points.URL, typeof(com_add_points)); + UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1)); + UIObjectFactory.SetPackageItemExtension(com_broadcast1.URL, typeof(com_broadcast1)); + UIObjectFactory.SetPackageItemExtension(wheel.URL, typeof(wheel)); + UIObjectFactory.SetPackageItemExtension(item_wheel.URL, typeof(item_wheel)); + UIObjectFactory.SetPackageItemExtension(wheel_.URL, typeof(wheel_)); + UIObjectFactory.SetPackageItemExtension(com_broadcast_new.URL, typeof(com_broadcast_new)); + UIObjectFactory.SetPackageItemExtension(broadcast_top.URL, typeof(broadcast_top)); + UIObjectFactory.SetPackageItemExtension(broadcast_topitem.URL, typeof(broadcast_topitem)); + UIObjectFactory.SetPackageItemExtension(com_tips.URL, typeof(com_tips)); + UIObjectFactory.SetPackageItemExtension(btn_saveingpot.URL, typeof(btn_saveingpot)); + UIObjectFactory.SetPackageItemExtension(btn_yellow.URL, typeof(btn_yellow)); + UIObjectFactory.SetPackageItemExtension(btn_claim.URL, typeof(btn_claim)); + UIObjectFactory.SetPackageItemExtension(btn_boxreward.URL, typeof(btn_boxreward)); + UIObjectFactory.SetPackageItemExtension(btn_threeday.URL, typeof(btn_threeday)); + UIObjectFactory.SetPackageItemExtension(btn_card.URL, typeof(btn_card)); + UIObjectFactory.SetPackageItemExtension(btn_failpack.URL, typeof(btn_failpack)); + UIObjectFactory.SetPackageItemExtension(btn_luck_gift.URL, typeof(btn_luck_gift)); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_green.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_animal/btn_green.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs.meta index 6c50426..bed7bbb 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_green.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8024f0607f8e54b07a962ab2c8bb8a5e +guid: a9caa22ae0e13144193de7eab59a62ec MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs new file mode 100644 index 0000000..3c01ace --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs @@ -0,0 +1,35 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class broadcast_top : GComponent + { + public broadcast_topitem item_0; + public broadcast_topitem item_1; + public broadcast_topitem item_2; + public Transition t1; + public Transition t2; + public Transition t3; + public const string URL = "ui://jq2t9glprdgq9b"; + + public static broadcast_top CreateInstance() + { + return (broadcast_top)UIPackage.CreateObject("Common_01", "broadcast_top"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + item_0 = (broadcast_topitem)GetChildAt(0); + item_1 = (broadcast_topitem)GetChildAt(1); + item_2 = (broadcast_topitem)GetChildAt(2); + t1 = GetTransitionAt(0); + t2 = GetTransitionAt(1); + t3 = GetTransitionAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/Common_animalBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_animal/Common_animalBinder.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs.meta index fe0abf1..328543b 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/Common_animalBinder.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2cb49eb5ab4a946aea77a678a848dd96 +guid: 9eda1f3f8ab03d6448a9719cb6d2a128 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs new file mode 100644 index 0000000..dcf811e --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.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.Common_01 +{ + public partial class broadcast_topitem : GComponent + { + public GTextField text_1; + public Transition t0; + public const string URL = "ui://jq2t9glprdgq9c"; + + public static broadcast_topitem CreateInstance() + { + return (broadcast_topitem)UIPackage.CreateObject("Common_01", "broadcast_topitem"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_1 = (GTextField)GetChildAt(1); + t0 = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_menu.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_animal/btn_menu.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs.meta index 2af72fb..9d9534c 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_menu.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c35ce9dcfe774d1cbd2f0286ae760b2 +guid: 07a17015e5df63d45b79b4c917b9cb63 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_payloading.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs similarity index 53% rename from Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_payloading.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs index dcefb26..1abc3d8 100644 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_payloading.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs @@ -3,16 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G008_reward_animal +namespace FGUI.Common_01 { - public partial class com_payloading : GComponent + public partial class btn_boxreward : GButton { public Transition t0; - public const string URL = "ui://1x1w9cxnttbj1w"; + public const string URL = "ui://jq2t9glptil24j"; - public static com_payloading CreateInstance() + public static btn_boxreward CreateInstance() { - return (com_payloading)UIPackage.CreateObject("G008_reward_animal", "com_payloading"); + return (btn_boxreward)UIPackage.CreateObject("Common_01", "btn_boxreward"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs.meta new file mode 100644 index 0000000..b829ad5 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b29662a8bc53af1489ac6c6974ef163c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs new file mode 100644 index 0000000..2de9535 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.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.Common_01 +{ + public partial class btn_buy1 : GButton + { + public GTextField text_gold; + public const string URL = "ui://jq2t9glpirrg1e"; + + public static btn_buy1 CreateInstance() + { + return (btn_buy1)UIPackage.CreateObject("Common_01", "btn_buy1"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_gold = (GTextField)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs.meta new file mode 100644 index 0000000..ebfa211 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bcc4ea4c13d5e0e4e8f722c28e967e85 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_three.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs similarity index 56% rename from Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_three.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs index 56c3912..39fbf45 100644 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_three.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs @@ -3,16 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G003_play_animal +namespace FGUI.Common_01 { - public partial class btn_three : GButton + public partial class btn_card : GButton { public GImage red; - public const string URL = "ui://bmphtricp9sp11"; + public const string URL = "ui://jq2t9glpy1du2p"; - public static btn_three CreateInstance() + public static btn_card CreateInstance() { - return (btn_three)UIPackage.CreateObject("G003_play_animal", "btn_three"); + return (btn_card)UIPackage.CreateObject("Common_01", "btn_card"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs.meta new file mode 100644 index 0000000..c26ea27 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6fa8949ec620b8c4b8064c98e47a4f40 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs new file mode 100644 index 0000000..c820d78 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs @@ -0,0 +1,29 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class btn_claim : GButton + { + public Controller state; + public GImage ad_icon; + public GImage img_saveingpot; + public const string URL = "ui://jq2t9glpsebxc"; + + public static btn_claim CreateInstance() + { + return (btn_claim)UIPackage.CreateObject("Common_01", "btn_claim"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + ad_icon = (GImage)GetChildAt(1); + img_saveingpot = (GImage)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_claim.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_claim.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs.meta index f1bd0c5..351b2c6 100644 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_claim.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56a22436903fb45dca5349aed8d702aa +guid: 7f21fd5491b87db49a1b591cf8a5aa24 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs new file mode 100644 index 0000000..6eab061 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs @@ -0,0 +1,29 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class btn_claim3 : GButton + { + public Controller state; + public GImage ad_icon; + public GImage img_saveingpot; + public const string URL = "ui://jq2t9glppeww38"; + + public static btn_claim3 CreateInstance() + { + return (btn_claim3)UIPackage.CreateObject("Common_01", "btn_claim3"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + ad_icon = (GImage)GetChildAt(1); + img_saveingpot = (GImage)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs.meta new file mode 100644 index 0000000..992adb7 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 30f6a0f4a68254f49a23286d6d85fe28 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs new file mode 100644 index 0000000..7de8b68 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.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.Common_01 +{ + public partial class btn_curr : GButton + { + public GTextField text_value; + public const string URL = "ui://jq2t9glpopwgc"; + + public static btn_curr CreateInstance() + { + return (btn_curr)UIPackage.CreateObject("Common_01", "btn_curr"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_value = (GTextField)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs.meta new file mode 100644 index 0000000..5c8dbba --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 15a5f002a23bd8247974ab8aba010886 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs new file mode 100644 index 0000000..7a5bd65 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.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.Common_01 +{ + public partial class btn_failpack : GButton + { + public GTextField lab_time; + public const string URL = "ui://jq2t9glpy1du2q"; + + public static btn_failpack CreateInstance() + { + return (btn_failpack)UIPackage.CreateObject("Common_01", "btn_failpack"); + } + + 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/Common_01/btn_failpack.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs.meta new file mode 100644 index 0000000..8e52ef3 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e9dd4b6c4102c84db60b173c0d52a30 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs new file mode 100644 index 0000000..f3a04dd --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.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.Common_01 +{ + public partial class btn_faq : GButton + { + public GTextField lab_time; + public const string URL = "ui://jq2t9glpiec4aw"; + + public static btn_faq CreateInstance() + { + return (btn_faq)UIPackage.CreateObject("Common_01", "btn_faq"); + } + + 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/Common_01/btn_faq.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs.meta new file mode 100644 index 0000000..d97a1c8 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5c3aeb8216e3c464394f79b00a64bffd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs new file mode 100644 index 0000000..dbbbfbf --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.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.Common_01 +{ + public partial class btn_get : GButton + { + public Controller state; + public GImage img_saveingpot; + public const string URL = "ui://jq2t9glpcphly"; + + public static btn_get CreateInstance() + { + return (btn_get)UIPackage.CreateObject("Common_01", "btn_get"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + img_saveingpot = (GImage)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs.meta new file mode 100644 index 0000000..03ccaed --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec1f800220e8668419ba72a8077fdcc8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs new file mode 100644 index 0000000..a70f479 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.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.Common_01 +{ + public partial class btn_head : GButton + { + public GLoader load_avatar; + public const string URL = "ui://jq2t9glpopwgh"; + + public static btn_head CreateInstance() + { + return (btn_head)UIPackage.CreateObject("Common_01", "btn_head"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + load_avatar = (GLoader)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs.meta new file mode 100644 index 0000000..474282c --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26c67053e1cadf240b513d736aec41f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs new file mode 100644 index 0000000..d7e0d70 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.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.Common_01 +{ + public partial class btn_luck_gift : GButton + { + public GImage red; + public const string URL = "ui://jq2t9glpybesal"; + + public static btn_luck_gift CreateInstance() + { + return (btn_luck_gift)UIPackage.CreateObject("Common_01", "btn_luck_gift"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + red = (GImage)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs.meta new file mode 100644 index 0000000..89dd440 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 399f5945d21f665479f030d5b680eac5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabblue.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs similarity index 57% rename from Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabblue.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs index 5dda32f..40ea539 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabblue.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs @@ -3,16 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.Common_animal +namespace FGUI.Common_01 { - public partial class btn_tabblue : GButton + public partial class btn_max_buy : GButton { public GImage img_saveingpot; - public const string URL = "ui://fqu8817of4bdv"; + public const string URL = "ui://jq2t9glpnrk720"; - public static btn_tabblue CreateInstance() + public static btn_max_buy CreateInstance() { - return (btn_tabblue)UIPackage.CreateObject("Common_animal", "btn_tabblue"); + return (btn_max_buy)UIPackage.CreateObject("Common_01", "btn_max_buy"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs.meta new file mode 100644 index 0000000..b4cfcb9 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 960e1d8ae6b843240b4458cab8c463e7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_noads.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs similarity index 80% rename from Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_noads.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs index 46a637f..c1c6c0b 100644 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_noads.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs @@ -3,7 +3,7 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G003_play_animal +namespace FGUI.Common_01 { public partial class btn_noads : GButton { @@ -12,11 +12,11 @@ namespace FGUI.G003_play_animal public GImage img_pack; public Transition t0; public Transition t1; - public const string URL = "ui://bmphtricoxqi3l"; + public const string URL = "ui://jq2t9glpcou6ba"; public static btn_noads CreateInstance() { - return (btn_noads)UIPackage.CreateObject("G003_play_animal", "btn_noads"); + return (btn_noads)UIPackage.CreateObject("Common_01", "btn_noads"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_noads.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_noads.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs.meta index 9107c78..f8456fd 100644 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_noads.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 345872341e1eb4f6d969142cebd3fad0 +guid: 5fa2a317837192641bc9171ed55f4c40 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs new file mode 100644 index 0000000..bb70f07 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs @@ -0,0 +1,29 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class btn_rank : GButton + { + public GImage red; + public com_add_points add_points; + public Transition t0; + public const string URL = "ui://jq2t9glpiwfgb0"; + + public static btn_rank CreateInstance() + { + return (btn_rank)UIPackage.CreateObject("Common_01", "btn_rank"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + red = (GImage)GetChildAt(1); + add_points = (com_add_points)GetChildAt(2); + t0 = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs.meta new file mode 100644 index 0000000..82d8907 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2537573c11c29ab4999e0df6b14c85c1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs new file mode 100644 index 0000000..3e4afc8 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.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.Common_01 +{ + public partial class btn_saveingpot : GButton + { + public GImage img; + public GTextField lab_time; + public const string URL = "ui://jq2t9glprj3b4h"; + + public static btn_saveingpot CreateInstance() + { + return (btn_saveingpot)UIPackage.CreateObject("Common_01", "btn_saveingpot"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + img = (GImage)GetChildAt(0); + lab_time = (GTextField)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs.meta new file mode 100644 index 0000000..101ab61 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 389a12f42dad1724fb9f0ff17aea3b26 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/btn_task.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs similarity index 51% rename from Assets/BingoBrain/FGUI/Package/G009_video_animal/btn_task.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs index ea30a89..1d630a4 100644 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/btn_task.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs @@ -3,25 +3,23 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G009_video_animal +namespace FGUI.Common_01 { public partial class btn_task : GButton { - public Controller state; - public GTextField progress_text; - public const string URL = "ui://y6hi0pcjagfuz"; + public GImage red; + public const string URL = "ui://jq2t9glpfhzacg"; public static btn_task CreateInstance() { - return (btn_task)UIPackage.CreateObject("G009_video_animal", "btn_task"); + return (btn_task)UIPackage.CreateObject("Common_01", "btn_task"); } public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); - state = GetControllerAt(0); - progress_text = (GTextField)GetChildAt(2); + red = (GImage)GetChildAt(1); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/btn_task.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G009_video_animal/btn_task.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs.meta index 23f23c7..607d6eb 100644 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/btn_task.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 481f4ee475821421b8ded82eb1478f13 +guid: 5194e9401d7d3314d9ce13221d33debc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs new file mode 100644 index 0000000..699646e --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs @@ -0,0 +1,29 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class btn_task_pass : GButton + { + public GImage red; + public GProgressBar pass_pro; + public GTextField number_text; + public const string URL = "ui://jq2t9glp9eojh"; + + public static btn_task_pass CreateInstance() + { + return (btn_task_pass)UIPackage.CreateObject("Common_01", "btn_task_pass"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + red = (GImage)GetChildAt(1); + pass_pro = (GProgressBar)GetChildAt(2); + number_text = (GTextField)GetChildAt(3); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs.meta new file mode 100644 index 0000000..ca4d5c4 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2c493f79b9634441a326b3912acf506 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs new file mode 100644 index 0000000..471e18c --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.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.Common_01 +{ + public partial class btn_threeday : GButton + { + public GImage red; + public GTextField lab_time; + public const string URL = "ui://jq2t9glpy1du2o"; + + public static btn_threeday CreateInstance() + { + return (btn_threeday)UIPackage.CreateObject("Common_01", "btn_threeday"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + red = (GImage)GetChildAt(1); + lab_time = (GTextField)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs.meta new file mode 100644 index 0000000..46a22c1 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 89b36c1d6645cfa4695509b9bc159ace +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs new file mode 100644 index 0000000..fe72086 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs @@ -0,0 +1,37 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class btn_watchAd : GButton + { + public Controller buy_state; + public Controller can_buy; + public Controller buy_type; + public GTextField btn_text; + public GTextField watch; + public GImage ad_icon; + public GImage img_saveingpot; + public const string URL = "ui://jq2t9glpb7ax1h"; + + public static btn_watchAd CreateInstance() + { + return (btn_watchAd)UIPackage.CreateObject("Common_01", "btn_watchAd"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + buy_state = GetControllerAt(0); + can_buy = GetControllerAt(1); + buy_type = GetControllerAt(2); + btn_text = (GTextField)GetChildAt(3); + watch = (GTextField)GetChildAt(4); + ad_icon = (GImage)GetChildAt(5); + img_saveingpot = (GImage)GetChildAt(7); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs.meta new file mode 100644 index 0000000..8cd7c74 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d76da7f9b5a99d0468735a491ed16058 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/failpack/btn_get_1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs similarity index 58% rename from Assets/BingoBrain/FGUI/Package/failpack/btn_get_1.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs index ca0ee6b..94ac3d5 100644 --- a/Assets/BingoBrain/FGUI/Package/failpack/btn_get_1.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs @@ -3,16 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.failpack +namespace FGUI.Common_01 { - public partial class btn_get_1 : GButton + public partial class btn_yellow : GButton { public GImage img_saveingpot; - public const string URL = "ui://fr2jeuh5hrbwj"; + public const string URL = "ui://jq2t9glpsebx9"; - public static btn_get_1 CreateInstance() + public static btn_yellow CreateInstance() { - return (btn_get_1)UIPackage.CreateObject("failpack", "btn_get_1"); + return (btn_yellow)UIPackage.CreateObject("Common_01", "btn_yellow"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs.meta new file mode 100644 index 0000000..c38ecf9 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ffeb680974e89d4db508a4fd7bddaa4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_adcoming.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs similarity index 69% rename from Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_adcoming.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs index 81a36e1..b461512 100644 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_adcoming.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs @@ -3,19 +3,19 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G008_reward_animal +namespace FGUI.Common_01 { public partial class com_adcoming : GComponent { public GTextField money_text; public GTextField time_text; - public GButton btn_removead; + public btn_get btn_removead; public Transition t0; - public const string URL = "ui://1x1w9cxnagfu1q"; + public const string URL = "ui://jq2t9glpjobfas"; public static com_adcoming CreateInstance() { - return (com_adcoming)UIPackage.CreateObject("G008_reward_animal", "com_adcoming"); + return (com_adcoming)UIPackage.CreateObject("Common_01", "com_adcoming"); } public override void ConstructFromXML(XML xml) @@ -24,7 +24,7 @@ namespace FGUI.G008_reward_animal money_text = (GTextField)GetChildAt(2); time_text = (GTextField)GetChildAt(3); - btn_removead = (GButton)GetChildAt(4); + btn_removead = (btn_get)GetChildAt(4); t0 = GetTransitionAt(0); } } diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_adcoming.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_adcoming.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs.meta index eb72c74..bf491ca 100644 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_adcoming.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f735c6360902d473a843977d2b8f49a3 +guid: 97c802e2348ba0d4cb14b62dc2233b15 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs new file mode 100644 index 0000000..f289339 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.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.Common_01 +{ + public partial class com_add_points : GComponent + { + public Controller type; + public GTextField lab_addPoints; + public const string URL = "ui://jq2t9glppmolb6"; + + public static com_add_points CreateInstance() + { + return (com_add_points)UIPackage.CreateObject("Common_01", "com_add_points"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + type = GetControllerAt(0); + lab_addPoints = (GTextField)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs.meta new file mode 100644 index 0000000..5113918 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4b1be32cd96ef9846a360b64c1db248d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs new file mode 100644 index 0000000..9f07835 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs @@ -0,0 +1,35 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class com_broadcast1 : GComponent + { + public GButton btn_record; + public com_broadcast_text1 broad_cast_text; + public GGroup broad; + public GGroup group_; + public Transition t0; + public Transition t1; + public const string URL = "ui://jq2t9glpqp92ao"; + + public static com_broadcast1 CreateInstance() + { + return (com_broadcast1)UIPackage.CreateObject("Common_01", "com_broadcast1"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + btn_record = (GButton)GetChildAt(1); + broad_cast_text = (com_broadcast_text1)GetChildAt(2); + broad = (GGroup)GetChildAt(3); + group_ = (GGroup)GetChildAt(4); + t0 = GetTransitionAt(0); + t1 = GetTransitionAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs.meta new file mode 100644 index 0000000..6ccbc13 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 627229fe81ce36343afe1061659602bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_broadcast.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs similarity index 69% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_broadcast.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs index c5911aa..caf3086 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_broadcast.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs @@ -3,20 +3,20 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.Common_01 { - public partial class com_broadcast : GComponent + public partial class com_broadcast_new : GComponent { public GTextField text_0; public GTextField text_1; public GTextField text_2; public GTextField text_3; public Transition t1; - public const string URL = "ui://sddomhj3upx71v"; + public const string URL = "ui://jq2t9glpr8lg9a"; - public static com_broadcast CreateInstance() + public static com_broadcast_new CreateInstance() { - return (com_broadcast)UIPackage.CreateObject("SaveingPot", "com_broadcast"); + return (com_broadcast_new)UIPackage.CreateObject("Common_01", "com_broadcast_new"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs.meta new file mode 100644 index 0000000..ef4a684 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: de12be8b96f957d4e8e24e791f217564 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs new file mode 100644 index 0000000..04744bc --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs @@ -0,0 +1,31 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class com_broadcast_text1 : GComponent + { + public GGraph bg_panel; + public GRichTextField cast_text; + public GRichTextField hide_text; + public GButton btn_broad; + public const string URL = "ui://jq2t9glpqp92an"; + + public static com_broadcast_text1 CreateInstance() + { + return (com_broadcast_text1)UIPackage.CreateObject("Common_01", "com_broadcast_text1"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + bg_panel = (GGraph)GetChildAt(0); + cast_text = (GRichTextField)GetChildAt(1); + hide_text = (GRichTextField)GetChildAt(2); + btn_broad = (GButton)GetChildAt(3); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs.meta new file mode 100644 index 0000000..8afec6a --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a2199a860c777e8459ffda38e438d0c1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs new file mode 100644 index 0000000..f4eca7a --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs @@ -0,0 +1,33 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class com_gold : GButton + { + public Controller state; + public GGraph gold_anim; + public GTextField text_gold; + public GTextField tips_text; + public Transition anim_coin; + public const string URL = "ui://jq2t9glpopwgd"; + + public static com_gold CreateInstance() + { + return (com_gold)UIPackage.CreateObject("Common_01", "com_gold"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + gold_anim = (GGraph)GetChildAt(1); + text_gold = (GTextField)GetChildAt(2); + tips_text = (GTextField)GetChildAt(6); + anim_coin = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs.meta new file mode 100644 index 0000000..4b2c38f --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e1308f1da82b084081409153f5fe5bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs new file mode 100644 index 0000000..af6ce72 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs @@ -0,0 +1,33 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class com_money : GComponent + { + public GImage icon; + public GButton btn_ch; + public GTextField text_gold; + public GTextField text_time; + public GGroup group_tips; + public const string URL = "ui://jq2t9glp733f48"; + + public static com_money CreateInstance() + { + return (com_money)UIPackage.CreateObject("Common_01", "com_money"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + icon = (GImage)GetChildAt(1); + btn_ch = (GButton)GetChildAt(2); + text_gold = (GTextField)GetChildAt(3); + text_time = (GTextField)GetChildAt(5); + group_tips = (GGroup)GetChildAt(6); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs.meta new file mode 100644 index 0000000..4893d6d --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 39dbbd576de35054fb0b813a3b63bef8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/com_tips.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs similarity index 52% rename from Assets/BingoBrain/FGUI/Package/Common_animal/com_tips.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs index 2d27f57..542442b 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/com_tips.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs @@ -3,25 +3,27 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.Common_animal +namespace FGUI.Common_01 { public partial class com_tips : GComponent { - public btn_tabblue btn_relog; + public GTextField title; + public btn_yellow btn_relog; public GTextField content; - public const string URL = "ui://fqu8817oenegpil"; + public const string URL = "ui://jq2t9glpre5l1i"; public static com_tips CreateInstance() { - return (com_tips)UIPackage.CreateObject("Common_animal", "com_tips"); + return (com_tips)UIPackage.CreateObject("Common_01", "com_tips"); } public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); - btn_relog = (btn_tabblue)GetChildAt(1); - content = (GTextField)GetChildAt(2); + title = (GTextField)GetChildAt(1); + btn_relog = (btn_yellow)GetChildAt(2); + content = (GTextField)GetChildAt(3); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/com_tips.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_animal/com_tips.cs.meta rename to Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs.meta index 5a6ab2f..38095f6 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/com_tips.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fa9a781aa9d54485985710f3a826782b +guid: b7f2065cca1cfba40b08ecee02f32bd7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs b/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs new file mode 100644 index 0000000..2a17e71 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs @@ -0,0 +1,33 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class item_wheel : GComponent + { + public Controller type; + public GImage img_light; + public GTextField text_rate; + public Transition show; + public Transition hide; + public const string URL = "ui://jq2t9glpr8lg4r"; + + public static item_wheel CreateInstance() + { + return (item_wheel)UIPackage.CreateObject("Common_01", "item_wheel"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + type = GetControllerAt(0); + img_light = (GImage)GetChildAt(3); + text_rate = (GTextField)GetChildAt(4); + show = GetTransitionAt(0); + hide = GetTransitionAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs.meta new file mode 100644 index 0000000..42cc0a6 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 44cb91a8b3c2ddb488dd2d0ed3966804 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_fly.cs b/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs similarity index 52% rename from Assets/BingoBrain/FGUI/Package/G004_webview/btn_fly.cs rename to Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs index 120deb6..7fa1c1b 100644 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_fly.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs @@ -3,25 +3,25 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G004_webview +namespace FGUI.Common_01 { - public partial class btn_fly : GButton + public partial class wheel : GComponent { + public wheel_ wheel_; public Transition t0; - public Transition t1; - public const string URL = "ui://bfkmhq3qym5rf"; + public const string URL = "ui://jq2t9glpr8lg4q"; - public static btn_fly CreateInstance() + public static wheel CreateInstance() { - return (btn_fly)UIPackage.CreateObject("G004_webview", "btn_fly"); + return (wheel)UIPackage.CreateObject("Common_01", "wheel"); } public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); + wheel_ = (wheel_)GetChildAt(0); t0 = GetTransitionAt(0); - t1 = GetTransitionAt(1); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs.meta new file mode 100644 index 0000000..3dac333 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d7a09222df377e41b68061af00cca0f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs b/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs new file mode 100644 index 0000000..10f06a8 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs @@ -0,0 +1,43 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.Common_01 +{ + public partial class wheel_ : GComponent + { + public item_wheel item_0; + public item_wheel item_1; + public item_wheel item_2; + public item_wheel item_3; + public item_wheel item_4; + public item_wheel item_5; + public item_wheel item_6; + public item_wheel item_7; + public Transition t0; + public Transition t1; + public const string URL = "ui://jq2t9glpr8lg4t"; + + public static wheel_ CreateInstance() + { + return (wheel_)UIPackage.CreateObject("Common_01", "wheel_"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + item_0 = (item_wheel)GetChildAt(2); + item_1 = (item_wheel)GetChildAt(3); + item_2 = (item_wheel)GetChildAt(4); + item_3 = (item_wheel)GetChildAt(5); + item_4 = (item_wheel)GetChildAt(6); + item_5 = (item_wheel)GetChildAt(7); + item_6 = (item_wheel)GetChildAt(8); + item_7 = (item_wheel)GetChildAt(9); + t0 = GetTransitionAt(0); + t1 = GetTransitionAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs.meta new file mode 100644 index 0000000..1be29f6 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e7ca7ec6f1e0684a96f69d1284c54a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/Common_animalBinder.cs b/Assets/BingoBrain/FGUI/Package/Common_animal/Common_animalBinder.cs deleted file mode 100644 index 00ff75e..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/Common_animalBinder.cs +++ /dev/null @@ -1,20 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.Common_animal -{ - public class Common_animalBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_tips.URL, typeof(com_tips)); - UIObjectFactory.SetPackageItemExtension(btn_tabwhite.URL, typeof(btn_tabwhite)); - UIObjectFactory.SetPackageItemExtension(btn_tabad.URL, typeof(btn_tabad)); - UIObjectFactory.SetPackageItemExtension(btn_menu.URL, typeof(btn_menu)); - UIObjectFactory.SetPackageItemExtension(com_loadingBlacklist.URL, typeof(com_loadingBlacklist)); - UIObjectFactory.SetPackageItemExtension(btn_tabblue.URL, typeof(btn_tabblue)); - UIObjectFactory.SetPackageItemExtension(btn_green.URL, typeof(btn_green)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_green.cs b/Assets/BingoBrain/FGUI/Package/Common_animal/btn_green.cs deleted file mode 100644 index ef00754..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_green.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_animal -{ - public partial class btn_green : GButton - { - public Controller state; - public Controller cooldown; - public GImage img_saveingpot; - public const string URL = "ui://fqu8817onp1h2e"; - - public static btn_green CreateInstance() - { - return (btn_green)UIPackage.CreateObject("Common_animal", "btn_green"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - cooldown = GetControllerAt(1); - img_saveingpot = (GImage)GetChildAt(4); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_menu.cs b/Assets/BingoBrain/FGUI/Package/Common_animal/btn_menu.cs deleted file mode 100644 index 10d84df..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_menu.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_animal -{ - public partial class btn_menu : GButton - { - public GLoader head_loader; - public const string URL = "ui://fqu8817of4bdp"; - - public static btn_menu CreateInstance() - { - return (btn_menu)UIPackage.CreateObject("Common_animal", "btn_menu"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - head_loader = (GLoader)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabad.cs b/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabad.cs deleted file mode 100644 index 9f19f9a..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabad.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_animal -{ - public partial class btn_tabad : GButton - { - public Controller color; - public GImage img_saveingpot; - public const string URL = "ui://fqu8817of4bdn"; - - public static btn_tabad CreateInstance() - { - return (btn_tabad)UIPackage.CreateObject("Common_animal", "btn_tabad"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - color = GetControllerAt(0); - img_saveingpot = (GImage)GetChildAt(4); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabblue.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabblue.cs.meta deleted file mode 100644 index 7eb7fe8..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabblue.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 244c3ef4f127c4d3484fecd459e6a5ef -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabwhite.cs b/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabwhite.cs deleted file mode 100644 index 356c600..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabwhite.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_animal -{ - public partial class btn_tabwhite : GButton - { - public Controller btn_state; - public GTextField number_text; - public GTextField buy_text; - public const string URL = "ui://fqu8817of4bd1r"; - - public static btn_tabwhite CreateInstance() - { - return (btn_tabwhite)UIPackage.CreateObject("Common_animal", "btn_tabwhite"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - btn_state = GetControllerAt(0); - number_text = (GTextField)GetChildAt(1); - buy_text = (GTextField)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabwhite.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabwhite.cs.meta deleted file mode 100644 index 2eb96b9..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/btn_tabwhite.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2bee3c512de6f49bca6a53f3b4e6709e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/com_loadingBlacklist.cs b/Assets/BingoBrain/FGUI/Package/Common_animal/com_loadingBlacklist.cs deleted file mode 100644 index 2024f80..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/com_loadingBlacklist.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_animal -{ - public partial class com_loadingBlacklist : GComponent - { - public GRichTextField text_privacy; - public const string URL = "ui://fqu8817of4bds"; - - public static com_loadingBlacklist CreateInstance() - { - return (com_loadingBlacklist)UIPackage.CreateObject("Common_animal", "com_loadingBlacklist"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_privacy = (GRichTextField)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_animal/com_loadingBlacklist.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_animal/com_loadingBlacklist.cs.meta deleted file mode 100644 index 618f233..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_animal/com_loadingBlacklist.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3398b2c71d62e4e828f53b1f11761f28 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/G001_rewardPopBinder.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/G001_rewardPopBinder.cs deleted file mode 100644 index 6db5993..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/G001_rewardPopBinder.cs +++ /dev/null @@ -1,21 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.G001_rewardPop -{ - public class G001_rewardPopBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(btn_collect.URL, typeof(btn_collect)); - UIObjectFactory.SetPackageItemExtension(btn_nothank.URL, typeof(btn_nothank)); - UIObjectFactory.SetPackageItemExtension(btn_double.URL, typeof(btn_double)); - UIObjectFactory.SetPackageItemExtension(btn_claim.URL, typeof(btn_claim)); - UIObjectFactory.SetPackageItemExtension(com_extraItem.URL, typeof(com_extraItem)); - UIObjectFactory.SetPackageItemExtension(com_multi.URL, typeof(com_multi)); - UIObjectFactory.SetPackageItemExtension(com_reward.URL, typeof(com_reward)); - UIObjectFactory.SetPackageItemExtension(com_roll.URL, typeof(com_roll)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/G001_rewardPopBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/G001_rewardPopBinder.cs.meta deleted file mode 100644 index ab8c63b..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/G001_rewardPopBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 380c9f8573b104dd58487b16714b5534 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_claim.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_claim.cs deleted file mode 100644 index 5f52b49..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_claim.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class btn_claim : GButton - { - public GTextField text_claim; - public const string URL = "ui://tm1qhgb4jgbufn"; - - public static btn_claim CreateInstance() - { - return (btn_claim)UIPackage.CreateObject("G001_rewardPop", "btn_claim"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_claim = (GTextField)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_collect.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_collect.cs deleted file mode 100644 index 18b8a1e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_collect.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class btn_collect : GButton - { - public Controller cont_state; - public const string URL = "ui://tm1qhgb4b9hhfh"; - - public static btn_collect CreateInstance() - { - return (btn_collect)UIPackage.CreateObject("G001_rewardPop", "btn_collect"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_state = GetControllerAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_collect.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_collect.cs.meta deleted file mode 100644 index b7a2f58..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_collect.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1b860d38c7b1848d8b020419f3953649 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_double.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_double.cs deleted file mode 100644 index a31266e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_double.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class btn_double : GButton - { - public Controller cont_button; - public GTextField text_num; - public const string URL = "ui://tm1qhgb4jgbufl"; - - public static btn_double CreateInstance() - { - return (btn_double)UIPackage.CreateObject("G001_rewardPop", "btn_double"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_button = GetControllerAt(0); - text_num = (GTextField)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_double.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_double.cs.meta deleted file mode 100644 index 1d5e423..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_double.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c98118e12649a4d5d9123cbd7da39fe8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_nothank.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_nothank.cs deleted file mode 100644 index ac8582f..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_nothank.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class btn_nothank : GButton - { - public GRichTextField text_no; - public const string URL = "ui://tm1qhgb4jgbufk"; - - public static btn_nothank CreateInstance() - { - return (btn_nothank)UIPackage.CreateObject("G001_rewardPop", "btn_nothank"); - } - - 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/G001_rewardPop/btn_nothank.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_nothank.cs.meta deleted file mode 100644 index b300077..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/btn_nothank.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 33d4a784ccb2444afba4299df5097479 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_extraItem.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_extraItem.cs deleted file mode 100644 index 5e5f2bf..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_extraItem.cs +++ /dev/null @@ -1,39 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class com_extraItem : GComponent - { - public Controller cont_extra; - public GTextField title; - public GTextField text_num; - public GButton closeButton; - public GButton btn_more; - public com_roll com_roll; - public GTextField text_cardnum; - public btn_claim btn_claim; - public const string URL = "ui://tm1qhgb4n5d50"; - - public static com_extraItem CreateInstance() - { - return (com_extraItem)UIPackage.CreateObject("G001_rewardPop", "com_extraItem"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_extra = GetControllerAt(0); - title = (GTextField)GetChildAt(1); - text_num = (GTextField)GetChildAt(4); - closeButton = (GButton)GetChildAt(5); - btn_more = (GButton)GetChildAt(6); - com_roll = (com_roll)GetChildAt(7); - text_cardnum = (GTextField)GetChildAt(11); - btn_claim = (btn_claim)GetChildAt(14); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_extraItem.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_extraItem.cs.meta deleted file mode 100644 index c065961..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_extraItem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ff994e8cfcabd4266ab68440a64e0e5a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_multi.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_multi.cs deleted file mode 100644 index 2d7bdc5..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_multi.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class com_multi : GComponent - { - public GTextField text_multi; - public const string URL = "ui://tm1qhgb4n5d52"; - - public static com_multi CreateInstance() - { - return (com_multi)UIPackage.CreateObject("G001_rewardPop", "com_multi"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_multi = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_multi.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_multi.cs.meta deleted file mode 100644 index 32d1352..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_multi.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7e5bfb3ff8d3e47e29e68a15e9982dc9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_reward.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_reward.cs deleted file mode 100644 index e0fd6c9..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_reward.cs +++ /dev/null @@ -1,37 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class com_reward : GComponent - { - public GGraph fx_lihua; - public btn_collect btn_collect; - public GGraph fx_bg; - public GTextField text_num; - public btn_nothank btn_no; - public GGraph fx_PiaoDai; - public GLoader loader_puzzle; - public const string URL = "ui://tm1qhgb4n5d53"; - - public static com_reward CreateInstance() - { - return (com_reward)UIPackage.CreateObject("G001_rewardPop", "com_reward"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - fx_lihua = (GGraph)GetChildAt(0); - btn_collect = (btn_collect)GetChildAt(1); - fx_bg = (GGraph)GetChildAt(2); - text_num = (GTextField)GetChildAt(4); - btn_no = (btn_nothank)GetChildAt(5); - fx_PiaoDai = (GGraph)GetChildAt(6); - loader_puzzle = (GLoader)GetChildAt(7); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_reward.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_reward.cs.meta deleted file mode 100644 index ee8fe28..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_reward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6c923e6d38eaf464bbe31daedaddbfaa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_roll.cs b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_roll.cs deleted file mode 100644 index 318b044..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_roll.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G001_rewardPop -{ - public partial class com_roll : GComponent - { - public GList list_roll; - public const string URL = "ui://tm1qhgb4n5d5fi"; - - public static com_roll CreateInstance() - { - return (com_roll)UIPackage.CreateObject("G001_rewardPop", "com_roll"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - list_roll = (GList)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_roll.cs.meta b/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_roll.cs.meta deleted file mode 100644 index 99d077e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop/com_roll.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d4a8dd4be0b724c4e83a53633cb44bee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G002_login/com_login.cs b/Assets/BingoBrain/FGUI/Package/G002_login/com_login.cs index 633e1b9..66f4e6a 100644 --- a/Assets/BingoBrain/FGUI/Package/G002_login/com_login.cs +++ b/Assets/BingoBrain/FGUI/Package/G002_login/com_login.cs @@ -9,7 +9,6 @@ namespace FGUI.G002_login { public GButton btn_play; public GComponent com_blklist1; - public GButton btn_debug; public GButton btn_showmax; public Transition logo; public const string URL = "ui://idbyf66gknau5"; @@ -25,8 +24,7 @@ namespace FGUI.G002_login btn_play = (GButton)GetChildAt(0); com_blklist1 = (GComponent)GetChildAt(1); - btn_debug = (GButton)GetChildAt(2); - btn_showmax = (GButton)GetChildAt(3); + btn_showmax = (GButton)GetChildAt(2); logo = GetTransitionAt(0); } } diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/G003_play_animalBinder.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/G003_play_animalBinder.cs deleted file mode 100644 index d4981c7..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/G003_play_animalBinder.cs +++ /dev/null @@ -1,28 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.G003_play_animal -{ - public class G003_play_animalBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(btn_cashout.URL, typeof(btn_cashout)); - UIObjectFactory.SetPackageItemExtension(com_opengame.URL, typeof(com_opengame)); - UIObjectFactory.SetPackageItemExtension(com_hall.URL, typeof(com_hall)); - UIObjectFactory.SetPackageItemExtension(btn_hall_click.URL, typeof(btn_hall_click)); - UIObjectFactory.SetPackageItemExtension(new_topmoney.URL, typeof(new_topmoney)); - UIObjectFactory.SetPackageItemExtension(new_topgold.URL, typeof(new_topgold)); - UIObjectFactory.SetPackageItemExtension(btn_noads.URL, typeof(btn_noads)); - UIObjectFactory.SetPackageItemExtension(btn_battle.URL, typeof(btn_battle)); - UIObjectFactory.SetPackageItemExtension(btn_hall.URL, typeof(btn_hall)); - UIObjectFactory.SetPackageItemExtension(btn_openslot.URL, typeof(btn_openslot)); - UIObjectFactory.SetPackageItemExtension(btn_look_ad.URL, typeof(btn_look_ad)); - UIObjectFactory.SetPackageItemExtension(head_loader.URL, typeof(head_loader)); - UIObjectFactory.SetPackageItemExtension(btn_three.URL, typeof(btn_three)); - UIObjectFactory.SetPackageItemExtension(sheep_play.URL, typeof(sheep_play)); - UIObjectFactory.SetPackageItemExtension(sheep_funcbtn.URL, typeof(sheep_funcbtn)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/G003_play_animalBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/G003_play_animalBinder.cs.meta deleted file mode 100644 index e9fe53b..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/G003_play_animalBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ab9c0ac0ced274c30ab44a5ba616b97f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_battle.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_battle.cs deleted file mode 100644 index ab86e76..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_battle.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class btn_battle : GButton - { - public GProgressBar progress; - public GTextField number_text; - public GImage red; - public const string URL = "ui://bmphtricoxqi3m"; - - public static btn_battle CreateInstance() - { - return (btn_battle)UIPackage.CreateObject("G003_play_animal", "btn_battle"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - progress = (GProgressBar)GetChildAt(1); - number_text = (GTextField)GetChildAt(2); - red = (GImage)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_battle.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_battle.cs.meta deleted file mode 100644 index 05085b3..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_battle.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 98a5ee5299769479089e52caf080e56a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_cashout.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_cashout.cs deleted file mode 100644 index d32c3ad..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_cashout.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class btn_cashout : GButton - { - public GTextField number_text; - public const string URL = "ui://bmphtricagfu3y"; - - public static btn_cashout CreateInstance() - { - return (btn_cashout)UIPackage.CreateObject("G003_play_animal", "btn_cashout"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - number_text = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_cashout.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_cashout.cs.meta deleted file mode 100644 index dd88695..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_cashout.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 59efdef867adf48eaa83f43e7de90e8b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall.cs deleted file mode 100644 index b2f0082..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class btn_hall : GButton - { - public GTextField number_text; - public GTextField number_text_2; - public Transition t0; - public const string URL = "ui://bmphtricoxqi3n"; - - public static btn_hall CreateInstance() - { - return (btn_hall)UIPackage.CreateObject("G003_play_animal", "btn_hall"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - number_text = (GTextField)GetChildAt(1); - number_text_2 = (GTextField)GetChildAt(3); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall.cs.meta deleted file mode 100644 index 933b19e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5f2d8a9153e3a4d4caee4503d956fa25 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall_click.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall_click.cs.meta deleted file mode 100644 index 8ddf34b..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall_click.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0ae0c4162d0864119b531685d2b6e109 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_look_ad.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_look_ad.cs deleted file mode 100644 index f80cbe1..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_look_ad.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class btn_look_ad : GButton - { - public Controller cool_down; - public GTextField cool_down_time; - public GGraph gp; - public const string URL = "ui://bmphtricoxqi3t"; - - public static btn_look_ad CreateInstance() - { - return (btn_look_ad)UIPackage.CreateObject("G003_play_animal", "btn_look_ad"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cool_down = GetControllerAt(0); - cool_down_time = (GTextField)GetChildAt(0); - gp = (GGraph)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_look_ad.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_look_ad.cs.meta deleted file mode 100644 index 70d4091..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_look_ad.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 346a85e6b872842d0b857ea9794c7a27 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_openslot.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_openslot.cs deleted file mode 100644 index cf60d11..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_openslot.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class btn_openslot : GButton - { - public GImage tips_bg; - public GTextField number_text; - public const string URL = "ui://bmphtricoxqi3r"; - - public static btn_openslot CreateInstance() - { - return (btn_openslot)UIPackage.CreateObject("G003_play_animal", "btn_openslot"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - tips_bg = (GImage)GetChildAt(1); - number_text = (GTextField)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_openslot.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_openslot.cs.meta deleted file mode 100644 index 6f0a042..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_openslot.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a439c2998f1f54dbc8bca65c32acdf64 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_three.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_three.cs.meta deleted file mode 100644 index 5387298..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_three.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4087e63542a71480d81279dfddcb30e1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_hall.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_hall.cs deleted file mode 100644 index 2e01f6e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_hall.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.G003_play_animal -{ - public partial class com_hall : GComponent - { - public btn_hall_click btn_task; - public btn_hall_click btn_pass; - public btn_hall_click btn_elimiti; - public GButton btn_play; - public GGraph bg_parent1; - public GComponent btn_menu; - public new_topgold gold; - public GButton btn_setting; - public GGroup top_group; - public const string URL = "ui://bmphtricnp615b"; - - public static com_hall CreateInstance() - { - return (com_hall)UIPackage.CreateObject("G003_play_animal", "com_hall"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - btn_task = (btn_hall_click)GetChildAt(2); - btn_pass = (btn_hall_click)GetChildAt(3); - btn_elimiti = (btn_hall_click)GetChildAt(4); - btn_play = (GButton)GetChildAt(7); - bg_parent1 = (GGraph)GetChildAt(11); - btn_menu = (GComponent)GetChildAt(12); - gold = (new_topgold)GetChildAt(13); - btn_setting = (GButton)GetChildAt(14); - top_group = (GGroup)GetChildAt(15); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_hall.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_hall.cs.meta deleted file mode 100644 index 3fa316d..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_hall.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f92ce2ee64d114610a7cd6b02d392bee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_opengame.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_opengame.cs deleted file mode 100644 index 987a92c..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_opengame.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class com_opengame : GComponent - { - public GTextField lv_text; - public GGraph tips_node; - public Transition t1; - public const string URL = "ui://bmphtricagfu4f"; - - public static com_opengame CreateInstance() - { - return (com_opengame)UIPackage.CreateObject("G003_play_animal", "com_opengame"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - lv_text = (GTextField)GetChildAt(3); - tips_node = (GGraph)GetChildAt(5); - t1 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_opengame.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_opengame.cs.meta deleted file mode 100644 index 3563d4c..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/com_opengame.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 383914f85ac4a49969e7e090088ee282 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/head_loader.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/head_loader.cs deleted file mode 100644 index e328142..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/head_loader.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class head_loader : GComponent - { - public GLoader loader_avatar; - public const string URL = "ui://bmphtricoxqi3u"; - - public static head_loader CreateInstance() - { - return (head_loader)UIPackage.CreateObject("G003_play_animal", "head_loader"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - loader_avatar = (GLoader)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/head_loader.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/head_loader.cs.meta deleted file mode 100644 index 857b93f..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/head_loader.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0c3b0d4faadf54037991e8579b30c2c6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topgold.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topgold.cs deleted file mode 100644 index 9dac9a6..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topgold.cs +++ /dev/null @@ -1,37 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class new_topgold : GComponent - { - public Controller state; - public GTextField number_text; - public GImage red; - public GImage tips_bg; - public GTextField tips_text; - public GButton btn_buygold; - public Transition t0; - public const string URL = "ui://bmphtricoxqi3k"; - - public static new_topgold CreateInstance() - { - return (new_topgold)UIPackage.CreateObject("G003_play_animal", "new_topgold"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - number_text = (GTextField)GetChildAt(2); - red = (GImage)GetChildAt(3); - tips_bg = (GImage)GetChildAt(4); - tips_text = (GTextField)GetChildAt(5); - btn_buygold = (GButton)GetChildAt(6); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topgold.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topgold.cs.meta deleted file mode 100644 index 6e89b65..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topgold.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a3c6811a5c3b8455f8ddd32adb754608 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topmoney.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topmoney.cs deleted file mode 100644 index 66e69c6..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topmoney.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class new_topmoney : GComponent - { - public GTextField number_text; - public btn_cashout btn_cashout; - public const string URL = "ui://bmphtricoxqi3j"; - - public static new_topmoney CreateInstance() - { - return (new_topmoney)UIPackage.CreateObject("G003_play_animal", "new_topmoney"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - number_text = (GTextField)GetChildAt(1); - btn_cashout = (btn_cashout)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topmoney.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topmoney.cs.meta deleted file mode 100644 index 6e575ad..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/new_topmoney.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9de483369554c4985b825f686972ced0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_funcbtn.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_funcbtn.cs deleted file mode 100644 index b1ea42e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_funcbtn.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class sheep_funcbtn : GButton - { - public Controller state; - public GImage red; - public GTextField number_text; - public GImage img_add; - public const string URL = "ui://bmphtricv4gj1o"; - - public static sheep_funcbtn CreateInstance() - { - return (sheep_funcbtn)UIPackage.CreateObject("G003_play_animal", "sheep_funcbtn"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - red = (GImage)GetChildAt(3); - number_text = (GTextField)GetChildAt(4); - img_add = (GImage)GetChildAt(6); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_funcbtn.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_funcbtn.cs.meta deleted file mode 100644 index 03ceb9a..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_funcbtn.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4470f24551e2247a4907d3660d890e07 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_play.cs b/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_play.cs deleted file mode 100644 index 613d36a..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_play.cs +++ /dev/null @@ -1,73 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G003_play_animal -{ - public partial class sheep_play : GComponent - { - public GComponent slot; - public GComponent broadcast; - public new_topmoney money; - public new_topgold gold; - public btn_noads btn_noads; - public btn_battle btn_task; - public GButton btn_failpack; - public btn_hall btn_h5; - public GTextField level_text; - public GButton btn_menu_; - public GGraph point; - public GButton btn_saveingpot; - public GGroup move_group1; - public btn_openslot btn_buyslot; - public sheep_funcbtn btn_back; - public sheep_funcbtn btn_out; - public sheep_funcbtn btn_refresh; - public GButton btn_setting; - public btn_look_ad btn_look_ad; - public btn_battle btn_clear; - public GButton btn_buyout; - public GButton btn_buyback; - public GButton btn_buyrefresh; - public GComponent btn_close; - public btn_three btn_three_day; - public const string URL = "ui://bmphtricv4gj1l"; - - public static sheep_play CreateInstance() - { - return (sheep_play)UIPackage.CreateObject("G003_play_animal", "sheep_play"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - slot = (GComponent)GetChildAt(1); - broadcast = (GComponent)GetChildAt(2); - money = (new_topmoney)GetChildAt(3); - gold = (new_topgold)GetChildAt(4); - btn_noads = (btn_noads)GetChildAt(5); - btn_task = (btn_battle)GetChildAt(6); - btn_failpack = (GButton)GetChildAt(7); - btn_h5 = (btn_hall)GetChildAt(8); - level_text = (GTextField)GetChildAt(9); - btn_menu_ = (GButton)GetChildAt(10); - point = (GGraph)GetChildAt(11); - btn_saveingpot = (GButton)GetChildAt(12); - move_group1 = (GGroup)GetChildAt(13); - btn_buyslot = (btn_openslot)GetChildAt(14); - btn_back = (sheep_funcbtn)GetChildAt(15); - btn_out = (sheep_funcbtn)GetChildAt(16); - btn_refresh = (sheep_funcbtn)GetChildAt(17); - btn_setting = (GButton)GetChildAt(18); - btn_look_ad = (btn_look_ad)GetChildAt(19); - btn_clear = (btn_battle)GetChildAt(20); - btn_buyout = (GButton)GetChildAt(21); - btn_buyback = (GButton)GetChildAt(22); - btn_buyrefresh = (GButton)GetChildAt(23); - btn_close = (GComponent)GetChildAt(24); - btn_three_day = (btn_three)GetChildAt(25); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_play.cs.meta b/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_play.cs.meta deleted file mode 100644 index 1e46a93..0000000 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/sheep_play.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8e8b8e47651c9462b8a875c65dd0643f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/G004_webviewBinder.cs b/Assets/BingoBrain/FGUI/Package/G004_webview/G004_webviewBinder.cs deleted file mode 100644 index ab6083d..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/G004_webviewBinder.cs +++ /dev/null @@ -1,17 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.G004_webview -{ - public class G004_webviewBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_webtop.URL, typeof(com_webtop)); - UIObjectFactory.SetPackageItemExtension(com_webview.URL, typeof(com_webview)); - UIObjectFactory.SetPackageItemExtension(btn_fly.URL, typeof(btn_fly)); - UIObjectFactory.SetPackageItemExtension(btn_icon.URL, typeof(btn_icon)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/G004_webviewBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G004_webview/G004_webviewBinder.cs.meta deleted file mode 100644 index aa10def..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/G004_webviewBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 077dfead8070141e5bba498e064183ce -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_fly.cs.meta b/Assets/BingoBrain/FGUI/Package/G004_webview/btn_fly.cs.meta deleted file mode 100644 index b1b551e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_fly.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fd0ec4c928f08489c85bad7a3132b41c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_icon.cs b/Assets/BingoBrain/FGUI/Package/G004_webview/btn_icon.cs deleted file mode 100644 index 551e996..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_icon.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G004_webview -{ - public partial class btn_icon : GButton - { - public Controller cont_state; - public GImage pb_time; - public Transition fx_ready; - public const string URL = "ui://bfkmhq3qym5rg"; - - public static btn_icon CreateInstance() - { - return (btn_icon)UIPackage.CreateObject("G004_webview", "btn_icon"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_state = GetControllerAt(0); - pb_time = (GImage)GetChildAt(2); - fx_ready = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_icon.cs.meta b/Assets/BingoBrain/FGUI/Package/G004_webview/btn_icon.cs.meta deleted file mode 100644 index 1416f51..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/btn_icon.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c8b4ebc9303cb4da19d70864f7dda263 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webtop.cs b/Assets/BingoBrain/FGUI/Package/G004_webview/com_webtop.cs deleted file mode 100644 index d11a4b2..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webtop.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G004_webview -{ - public partial class com_webtop : GComponent - { - public GTextField text_num; - public GTextField text_more; - public GProgressBar pb_num; - public const string URL = "ui://bfkmhq3qfbkwe"; - - public static com_webtop CreateInstance() - { - return (com_webtop)UIPackage.CreateObject("G004_webview", "com_webtop"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_num = (GTextField)GetChildAt(1); - text_more = (GTextField)GetChildAt(2); - pb_num = (GProgressBar)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webtop.cs.meta b/Assets/BingoBrain/FGUI/Package/G004_webview/com_webtop.cs.meta deleted file mode 100644 index a48e62d..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webtop.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4404b129642b141428d35425c5f033cd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webview.cs b/Assets/BingoBrain/FGUI/Package/G004_webview/com_webview.cs deleted file mode 100644 index 54fe1ce..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webview.cs +++ /dev/null @@ -1,39 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G004_webview -{ - public partial class com_webview : GComponent - { - public GComponent com_fly; - public GGraph fly_area; - public com_webtop com_top; - public btn_icon btn_icon; - public GButton btn_out; - public GTextField money_text; - public GButton btn_close; - public GGroup gruop_; - public const string URL = "ui://bfkmhq3qfd7s0"; - - public static com_webview CreateInstance() - { - return (com_webview)UIPackage.CreateObject("G004_webview", "com_webview"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - com_fly = (GComponent)GetChildAt(0); - fly_area = (GGraph)GetChildAt(2); - com_top = (com_webtop)GetChildAt(3); - btn_icon = (btn_icon)GetChildAt(4); - btn_out = (GButton)GetChildAt(5); - money_text = (GTextField)GetChildAt(7); - btn_close = (GButton)GetChildAt(8); - gruop_ = (GGroup)GetChildAt(9); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webview.cs.meta b/Assets/BingoBrain/FGUI/Package/G004_webview/com_webview.cs.meta deleted file mode 100644 index 85710b6..0000000 --- a/Assets/BingoBrain/FGUI/Package/G004_webview/com_webview.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1ba3d3c6b241e4ac3a7ff9ef55af36ca -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal.meta deleted file mode 100644 index 7fede23..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 68d9c92bf033d42acaea694079216733 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/G006_menu_animalBinder.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/G006_menu_animalBinder.cs deleted file mode 100644 index 34708c9..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/G006_menu_animalBinder.cs +++ /dev/null @@ -1,23 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.G006_menu_animal -{ - public class G006_menu_animalBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(btn_switch_sound.URL, typeof(btn_switch_sound)); - UIObjectFactory.SetPackageItemExtension(com_sheepwindow.URL, typeof(com_sheepwindow)); - UIObjectFactory.SetPackageItemExtension(com_buyslot.URL, typeof(com_buyslot)); - UIObjectFactory.SetPackageItemExtension(com_remake.URL, typeof(com_remake)); - UIObjectFactory.SetPackageItemExtension(btn_img.URL, typeof(btn_img)); - UIObjectFactory.SetPackageItemExtension(btn_lang.URL, typeof(btn_lang)); - UIObjectFactory.SetPackageItemExtension(btn_switch_music.URL, typeof(btn_switch_music)); - UIObjectFactory.SetPackageItemExtension(btn_avatar.URL, typeof(btn_avatar)); - UIObjectFactory.SetPackageItemExtension(com_edit.URL, typeof(com_edit)); - UIObjectFactory.SetPackageItemExtension(com_setting_ani.URL, typeof(com_setting_ani)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/G006_menu_animalBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/G006_menu_animalBinder.cs.meta deleted file mode 100644 index 026481a..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/G006_menu_animalBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7abcab90636734e8a873420c31929dbc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_avatar.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_avatar.cs deleted file mode 100644 index 875f311..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_avatar.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class btn_avatar : GButton - { - public GLoader loader_avatar; - public const string URL = "ui://fdihxyogrezm1l"; - - public static btn_avatar CreateInstance() - { - return (btn_avatar)UIPackage.CreateObject("G006_menu_animal", "btn_avatar"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - loader_avatar = (GLoader)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_avatar.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_avatar.cs.meta deleted file mode 100644 index 06d0dc4..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_avatar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 08f1b9c5f23354dfea928be7dc77d8ec -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_img.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_img.cs.meta deleted file mode 100644 index 76928e2..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_img.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 566c29da3552147758404fef91191c7d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_lang.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_lang.cs deleted file mode 100644 index 73aa4da..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_lang.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class btn_lang : GButton - { - public Controller cont_btn; - public Controller btn_state; - public GTextField text_lang; - public const string URL = "ui://fdihxyogrezm1e"; - - public static btn_lang CreateInstance() - { - return (btn_lang)UIPackage.CreateObject("G006_menu_animal", "btn_lang"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_btn = GetControllerAt(0); - btn_state = GetControllerAt(1); - text_lang = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_lang.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_lang.cs.meta deleted file mode 100644 index 96a85bf..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_lang.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19b84fec8c58543568117989df09f31f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_music.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_music.cs deleted file mode 100644 index cfbb8be..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_music.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class btn_switch_music : GButton - { - public Controller cont_button; - public const string URL = "ui://fdihxyogrezm1f"; - - public static btn_switch_music CreateInstance() - { - return (btn_switch_music)UIPackage.CreateObject("G006_menu_animal", "btn_switch_music"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_button = GetControllerAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_music.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_music.cs.meta deleted file mode 100644 index 0df78b5..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_music.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fec9a09a30bea4b78b7ecea9fee05ee5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_sound.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_sound.cs deleted file mode 100644 index bc9f8fa..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_sound.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class btn_switch_sound : GButton - { - public Controller cont_button; - public const string URL = "ui://fdihxyogahbj22"; - - public static btn_switch_sound CreateInstance() - { - return (btn_switch_sound)UIPackage.CreateObject("G006_menu_animal", "btn_switch_sound"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_button = GetControllerAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_sound.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_sound.cs.meta deleted file mode 100644 index 0defca2..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/btn_switch_sound.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9eb38872c8a2f4db79d9894bb6c8643a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_buyslot.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_buyslot.cs deleted file mode 100644 index 24719a7..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_buyslot.cs +++ /dev/null @@ -1,37 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class com_buyslot : GComponent - { - public Controller pay_type; - public GTextField off_text; - public GButton btn_close; - public GTextField text_have; - public GTextField need_text; - public GButton btn_buy; - public GButton btn_max_pay; - public const string URL = "ui://fdihxyogoxqi31"; - - public static com_buyslot CreateInstance() - { - return (com_buyslot)UIPackage.CreateObject("G006_menu_animal", "com_buyslot"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pay_type = GetControllerAt(0); - off_text = (GTextField)GetChildAt(6); - btn_close = (GButton)GetChildAt(10); - text_have = (GTextField)GetChildAt(11); - need_text = (GTextField)GetChildAt(12); - btn_buy = (GButton)GetChildAt(13); - btn_max_pay = (GButton)GetChildAt(14); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_buyslot.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_buyslot.cs.meta deleted file mode 100644 index 9dab77e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_buyslot.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7aef8f410f91b4ce889c762cef99dde4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_edit.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_edit.cs deleted file mode 100644 index 3e3be40..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_edit.cs +++ /dev/null @@ -1,35 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class com_edit : GComponent - { - public GTextField t2; - public GTextInput textp_name; - public GGraph img_cheat; - public GList list_avatar; - public GTextField t2_2; - public GButton btn_ok; - public const string URL = "ui://fdihxyogsi1f0"; - - public static com_edit CreateInstance() - { - return (com_edit)UIPackage.CreateObject("G006_menu_animal", "com_edit"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - t2 = (GTextField)GetChildAt(3); - textp_name = (GTextInput)GetChildAt(4); - img_cheat = (GGraph)GetChildAt(6); - list_avatar = (GList)GetChildAt(7); - t2_2 = (GTextField)GetChildAt(10); - btn_ok = (GButton)GetChildAt(11); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_edit.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_edit.cs.meta deleted file mode 100644 index 0558620..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_edit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8464230e72ea64108ad43cee1b039465 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_remake.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_remake.cs deleted file mode 100644 index 4c041d5..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_remake.cs +++ /dev/null @@ -1,35 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class com_remake : GComponent - { - public Controller state; - public GButton btn_close; - public GButton btn_gold; - public GButton btn_ad; - public GButton btn_back; - public GImage out_img; - public const string URL = "ui://fdihxyogoxqi32"; - - public static com_remake CreateInstance() - { - return (com_remake)UIPackage.CreateObject("G006_menu_animal", "com_remake"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - btn_close = (GButton)GetChildAt(4); - btn_gold = (GButton)GetChildAt(5); - btn_ad = (GButton)GetChildAt(6); - btn_back = (GButton)GetChildAt(7); - out_img = (GImage)GetChildAt(8); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_remake.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_remake.cs.meta deleted file mode 100644 index 32482f6..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_remake.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 828a40e82409c4613a550623d9448f35 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_setting_ani.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_setting_ani.cs deleted file mode 100644 index a261b2b..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_setting_ani.cs +++ /dev/null @@ -1,61 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class com_setting_ani : GComponent - { - public Controller switchgift; - public GTextField title0; - public GList list_tab; - public btn_switch_sound btn_sound; - public btn_switch_sound btn_music; - public btn_avatar btn_edit; - public GTextField text_name; - public GLoader loader_flag; - public GTextField text_uid; - public GTextField text_version; - public GTextField title1; - public GTextField title2; - public GList list_lang; - public GTextField title1_2; - public btn_lang btn_contact; - public btn_lang btn_pri; - public btn_lang btn_terms; - public btn_lang btn_record; - public GButton btn_close; - public const string URL = "ui://fdihxyogu6tn12"; - - public static com_setting_ani CreateInstance() - { - return (com_setting_ani)UIPackage.CreateObject("G006_menu_animal", "com_setting_ani"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - switchgift = GetControllerAt(0); - title0 = (GTextField)GetChildAt(1); - list_tab = (GList)GetChildAt(2); - btn_sound = (btn_switch_sound)GetChildAt(3); - btn_music = (btn_switch_sound)GetChildAt(4); - btn_edit = (btn_avatar)GetChildAt(5); - text_name = (GTextField)GetChildAt(6); - loader_flag = (GLoader)GetChildAt(7); - text_uid = (GTextField)GetChildAt(8); - text_version = (GTextField)GetChildAt(9); - title1 = (GTextField)GetChildAt(11); - title2 = (GTextField)GetChildAt(12); - list_lang = (GList)GetChildAt(13); - title1_2 = (GTextField)GetChildAt(14); - btn_contact = (btn_lang)GetChildAt(17); - btn_pri = (btn_lang)GetChildAt(18); - btn_terms = (btn_lang)GetChildAt(19); - btn_record = (btn_lang)GetChildAt(21); - btn_close = (GButton)GetChildAt(24); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_setting_ani.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_setting_ani.cs.meta deleted file mode 100644 index 21d6187..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_setting_ani.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6cfc34ddbda24466f83ae60c989e1edb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_sheepwindow.cs b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_sheepwindow.cs deleted file mode 100644 index 98f32b5..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_sheepwindow.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G006_menu_animal -{ - public partial class com_sheepwindow : GComponent - { - public Controller window_state; - public GButton btn_close; - public GButton btn_buy; - public const string URL = "ui://fdihxyogoxqi2j"; - - public static com_sheepwindow CreateInstance() - { - return (com_sheepwindow)UIPackage.CreateObject("G006_menu_animal", "com_sheepwindow"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - window_state = GetControllerAt(0); - btn_close = (GButton)GetChildAt(7); - btn_buy = (GButton)GetChildAt(8); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_sheepwindow.cs.meta b/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_sheepwindow.cs.meta deleted file mode 100644 index 633e566..0000000 --- a/Assets/BingoBrain/FGUI/Package/G006_menu_animal/com_sheepwindow.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e0cf403a719824aa5a0ca1565c6323d3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup.meta b/Assets/BingoBrain/FGUI/Package/G007_makeup.meta deleted file mode 100644 index 9fb6a9b..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7cf0d4bafc7f74ebe84fbe253cfe3e21 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/G007_makeupBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G007_makeup/G007_makeupBinder.cs.meta deleted file mode 100644 index 31cb370..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/G007_makeupBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d63b59ca309454747a107d8e84712217 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_confirm.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_confirm.cs deleted file mode 100644 index 5832934..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_confirm.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class btn_confirm : GButton - { - public Controller country; - public GTextField con; - public const string URL = "ui://md8tkwlzif1e7"; - - public static btn_confirm CreateInstance() - { - return (btn_confirm)UIPackage.CreateObject("G007_makeup", "btn_confirm"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - country = GetControllerAt(0); - con = (GTextField)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_watch.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_watch.cs deleted file mode 100644 index 7741beb..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_watch.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class btn_watch : GButton - { - public Controller show_cd; - public GTextField text_cd; - public const string URL = "ui://md8tkwlzqgv24n"; - - public static btn_watch CreateInstance() - { - return (btn_watch)UIPackage.CreateObject("G007_makeup", "btn_watch"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - show_cd = GetControllerAt(0); - text_cd = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_watch.cs.meta b/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_watch.cs.meta deleted file mode 100644 index 48ac86e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_watch.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b6b4a5a0a938f4d4095b4ac075b0d699 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_confirm.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_confirm.cs deleted file mode 100644 index e442dd3..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_confirm.cs +++ /dev/null @@ -1,123 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_confirm : GComponent - { - public Controller cont_state; - public Controller cont_confirm; - public Controller lang; - public Controller show_pay; - public GButton btn_record; - public com_enter com_info; - public com_firstname com_fname; - public com_lastname com_lname; - public GComponent com_rule; - public GTextField text_payhint; - public GTextField text_title; - public GTextField text_smaill_title; - public GTextField nrules; - public com_task com_task; - public GButton btn_back; - public GTextField text_query; - public GTextField text_condi1; - public GTextField text_condi2; - public GTextField nrules_2; - public GTextField text_payhint_2; - public GTextField text_wallet; - public GTextField text_cash; - public GTextField text_account; - public GRichTextField pay_text1; - public GButton btn_pay1; - public GTextField text_title_2; - public GProgressBar pb_condi2; - public GProgressBar pb_condi1; - public com_newRecord com_newRecord; - public btn_watch btn_watch; - public com_info com_pay; - public GTextField text_smaill_title_2; - public cash_levelcom com_cashlevel; - public GTextField text_cashneedlv; - public GTextField text_nowcash; - public GTextField text_cashdate; - public GTextField text_cashdate_2; - public GTextField text_cashdate_3; - public GTextField text_cashdate_4; - public GTextField text_number0; - public GTextField text_number1; - public GTextField text_number2; - public GTextField text_cash_title; - public GButton btn_close; - public GButton btn_tab; - public GButton btn_earn; - public GButton btn_cashout; - public GButton btn_confirm; - public GButton btn_check_level; - public Transition t0; - public const string URL = "ui://md8tkwlzut66d"; - - public static com_confirm CreateInstance() - { - return (com_confirm)UIPackage.CreateObject("G007_makeup", "com_confirm"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_state = GetControllerAt(0); - cont_confirm = GetControllerAt(1); - lang = GetControllerAt(2); - show_pay = GetControllerAt(3); - btn_record = (GButton)GetChildAt(7); - com_info = (com_enter)GetChildAt(9); - com_fname = (com_firstname)GetChildAt(10); - com_lname = (com_lastname)GetChildAt(11); - com_rule = (GComponent)GetChildAt(12); - text_payhint = (GTextField)GetChildAt(13); - text_title = (GTextField)GetChildAt(14); - text_smaill_title = (GTextField)GetChildAt(15); - nrules = (GTextField)GetChildAt(16); - com_task = (com_task)GetChildAt(17); - btn_back = (GButton)GetChildAt(18); - text_query = (GTextField)GetChildAt(19); - text_condi1 = (GTextField)GetChildAt(21); - text_condi2 = (GTextField)GetChildAt(22); - nrules_2 = (GTextField)GetChildAt(23); - text_payhint_2 = (GTextField)GetChildAt(25); - text_wallet = (GTextField)GetChildAt(27); - text_cash = (GTextField)GetChildAt(28); - text_account = (GTextField)GetChildAt(29); - pay_text1 = (GRichTextField)GetChildAt(33); - btn_pay1 = (GButton)GetChildAt(34); - text_title_2 = (GTextField)GetChildAt(36); - pb_condi2 = (GProgressBar)GetChildAt(37); - pb_condi1 = (GProgressBar)GetChildAt(38); - com_newRecord = (com_newRecord)GetChildAt(39); - btn_watch = (btn_watch)GetChildAt(40); - com_pay = (com_info)GetChildAt(41); - text_smaill_title_2 = (GTextField)GetChildAt(43); - com_cashlevel = (cash_levelcom)GetChildAt(44); - text_cashneedlv = (GTextField)GetChildAt(45); - text_nowcash = (GTextField)GetChildAt(47); - text_cashdate = (GTextField)GetChildAt(49); - text_cashdate_2 = (GTextField)GetChildAt(56); - text_cashdate_3 = (GTextField)GetChildAt(57); - text_cashdate_4 = (GTextField)GetChildAt(58); - text_number0 = (GTextField)GetChildAt(59); - text_number1 = (GTextField)GetChildAt(60); - text_number2 = (GTextField)GetChildAt(61); - text_cash_title = (GTextField)GetChildAt(62); - btn_close = (GButton)GetChildAt(64); - btn_tab = (GButton)GetChildAt(65); - btn_earn = (GButton)GetChildAt(66); - btn_cashout = (GButton)GetChildAt(67); - btn_confirm = (GButton)GetChildAt(68); - btn_check_level = (GButton)GetChildAt(69); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_enter.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_enter.cs deleted file mode 100644 index 1b0a99c..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_enter.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_enter : GComponent - { - public Controller cont_type; - public GTextInput enter_email; - public GTextInput enter_phone; - public GTextField ph_7; - public const string URL = "ui://md8tkwlzdeiw1k"; - - public static com_enter CreateInstance() - { - return (com_enter)UIPackage.CreateObject("G007_makeup", "com_enter"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_type = GetControllerAt(0); - enter_email = (GTextInput)GetChildAt(2); - enter_phone = (GTextInput)GetChildAt(3); - ph_7 = (GTextField)GetChildAt(4); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_info.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_info.cs deleted file mode 100644 index f7382d4..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_info.cs +++ /dev/null @@ -1,33 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_info : GComponent - { - public Controller cont_counrty; - public GTextField text_name; - public GTextField text_email; - public GButton btn_change; - public GButton btn_menu; - public const string URL = "ui://md8tkwlzif1eb"; - - public static com_info CreateInstance() - { - return (com_info)UIPackage.CreateObject("G007_makeup", "com_info"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_counrty = GetControllerAt(0); - text_name = (GTextField)GetChildAt(0); - text_email = (GTextField)GetChildAt(1); - btn_change = (GButton)GetChildAt(2); - btn_menu = (GButton)GetChildAt(5); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_newRecord.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_newRecord.cs deleted file mode 100644 index a7c7e8d..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_newRecord.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_newRecord : GComponent - { - public com_rank com_rank; - public com_cord com_cord; - public const string URL = "ui://md8tkwlzqgv24k"; - - public static com_newRecord CreateInstance() - { - return (com_newRecord)UIPackage.CreateObject("G007_makeup", "com_newRecord"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - com_rank = (com_rank)GetChildAt(0); - com_cord = (com_cord)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_rank.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_rank.cs deleted file mode 100644 index 4d8e92e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_rank.cs +++ /dev/null @@ -1,43 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_rank : GComponent - { - public Controller content1; - public Controller content2; - public Controller content3; - public GTextField text_ranks; - public GTextField text_rank1; - public GTextField text_rank2; - public GTextField text_rank3; - public GImage img_gou1; - public GImage img_gou2; - public GImage img_gou3; - public const string URL = "ui://md8tkwlzqgv24f"; - - public static com_rank CreateInstance() - { - return (com_rank)UIPackage.CreateObject("G007_makeup", "com_rank"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - content1 = GetControllerAt(0); - content2 = GetControllerAt(1); - content3 = GetControllerAt(2); - text_ranks = (GTextField)GetChildAt(3); - text_rank1 = (GTextField)GetChildAt(5); - text_rank2 = (GTextField)GetChildAt(6); - text_rank3 = (GTextField)GetChildAt(7); - img_gou1 = (GImage)GetChildAt(8); - img_gou2 = (GImage)GetChildAt(9); - img_gou3 = (GImage)GetChildAt(10); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_step.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_step.cs deleted file mode 100644 index afe0055..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_step.cs +++ /dev/null @@ -1,37 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_step : GComponent - { - public Controller lang; - public com_info com_info; - public btn_confirm btn_confirm; - public com_trans com_trans; - public GTextField text_warn; - public GLoader loader_payer; - public Transition fx_in; - public const string URL = "ui://md8tkwlzrezm0"; - - public static com_step CreateInstance() - { - return (com_step)UIPackage.CreateObject("G007_makeup", "com_step"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - lang = GetControllerAt(0); - com_info = (com_info)GetChildAt(1); - btn_confirm = (btn_confirm)GetChildAt(2); - com_trans = (com_trans)GetChildAt(4); - text_warn = (GTextField)GetChildAt(5); - loader_payer = (GLoader)GetChildAt(6); - fx_in = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_step.cs.meta b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_step.cs.meta deleted file mode 100644 index 57d2732..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_step.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cd01d0acf7d9c499781f5098c2b343ea -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_task.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_task.cs deleted file mode 100644 index c1d8542..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_task.cs +++ /dev/null @@ -1,43 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_task : GComponent - { - public Controller cont_process; - public Controller lang; - public GTextField text_orderid; - public GTextField text_task_title; - public GTextField text_ads; - public GTextField text_payer; - public GRichTextField pay_text1; - public GButton btn_pay2; - public GTextField title; - public GTextField title_2; - public const string URL = "ui://md8tkwlzes171x"; - - public static com_task CreateInstance() - { - return (com_task)UIPackage.CreateObject("G007_makeup", "com_task"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_process = GetControllerAt(0); - lang = GetControllerAt(1); - text_orderid = (GTextField)GetChildAt(4); - text_task_title = (GTextField)GetChildAt(5); - text_ads = (GTextField)GetChildAt(6); - text_payer = (GTextField)GetChildAt(8); - pay_text1 = (GRichTextField)GetChildAt(11); - btn_pay2 = (GButton)GetChildAt(12); - title = (GTextField)GetChildAt(13); - title_2 = (GTextField)GetChildAt(14); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_trans.cs b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_trans.cs deleted file mode 100644 index f5792b2..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_trans.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G007_makeup -{ - public partial class com_trans : GComponent - { - public Controller cont_country; - public GLoader loader_payer; - public const string URL = "ui://md8tkwlzif1e9"; - - public static com_trans CreateInstance() - { - return (com_trans)UIPackage.CreateObject("G007_makeup", "com_trans"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_country = GetControllerAt(0); - loader_payer = (GLoader)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_trans.cs.meta b/Assets/BingoBrain/FGUI/Package/G007_makeup/com_trans.cs.meta deleted file mode 100644 index 506381b..0000000 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_trans.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dfc0876f507c14b679a293f5d34fce6e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal.meta deleted file mode 100644 index ddb8747..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1d8c725be5c0d414a8142262066289f4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/G008_reward_animalBinder.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/G008_reward_animalBinder.cs deleted file mode 100644 index f29fc2e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/G008_reward_animalBinder.cs +++ /dev/null @@ -1,23 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.G008_reward_animal -{ - public class G008_reward_animalBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_success_cash.URL, typeof(com_success_cash)); - UIObjectFactory.SetPackageItemExtension(cash_broad.URL, typeof(cash_broad)); - UIObjectFactory.SetPackageItemExtension(com_packreward.URL, typeof(com_packreward)); - UIObjectFactory.SetPackageItemExtension(com_adcoming.URL, typeof(com_adcoming)); - UIObjectFactory.SetPackageItemExtension(com_lvsuccess.URL, typeof(com_lvsuccess)); - UIObjectFactory.SetPackageItemExtension(com_rewardbox.URL, typeof(com_rewardbox)); - UIObjectFactory.SetPackageItemExtension(com_reward.URL, typeof(com_reward)); - UIObjectFactory.SetPackageItemExtension(pack_panel.URL, typeof(pack_panel)); - UIObjectFactory.SetPackageItemExtension(com_payloading.URL, typeof(com_payloading)); - UIObjectFactory.SetPackageItemExtension(pack_panelparent.URL, typeof(pack_panelparent)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/G008_reward_animalBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/G008_reward_animalBinder.cs.meta deleted file mode 100644 index dbf49a2..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/G008_reward_animalBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 71219b540fb9542a8b40ad6ae4dbabd8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/cash_broad.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/cash_broad.cs deleted file mode 100644 index de93895..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/cash_broad.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class cash_broad : GComponent - { - public GRichTextField cast_text; - public Transition t0; - public Transition t1; - public const string URL = "ui://1x1w9cxnagfu14"; - - public static cash_broad CreateInstance() - { - return (cash_broad)UIPackage.CreateObject("G008_reward_animal", "cash_broad"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cast_text = (GRichTextField)GetChildAt(0); - t0 = GetTransitionAt(0); - t1 = GetTransitionAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/cash_broad.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/cash_broad.cs.meta deleted file mode 100644 index f761fb0..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/cash_broad.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bfe2d4883b58446869281b308f544dbd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_lvsuccess.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_lvsuccess.cs deleted file mode 100644 index e72a05e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_lvsuccess.cs +++ /dev/null @@ -1,51 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class com_lvsuccess : GComponent - { - public Controller state; - public Controller switchgift; - public GGraph bg_parent; - public GComponent top_money; - public GImage tips_bg; - public GTextField tips_text; - public GTextField money_text; - public GTextField level_text; - public com_success_cash com_cash; - public GComponent gold; - public GButton btn_adclaim; - public GButton btn_claim; - public GButton btn_restart; - public Transition t0; - public const string URL = "ui://1x1w9cxnagfue"; - - public static com_lvsuccess CreateInstance() - { - return (com_lvsuccess)UIPackage.CreateObject("G008_reward_animal", "com_lvsuccess"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - switchgift = GetControllerAt(1); - bg_parent = (GGraph)GetChildAt(0); - top_money = (GComponent)GetChildAt(3); - tips_bg = (GImage)GetChildAt(4); - tips_text = (GTextField)GetChildAt(5); - money_text = (GTextField)GetChildAt(6); - level_text = (GTextField)GetChildAt(9); - com_cash = (com_success_cash)GetChildAt(11); - gold = (GComponent)GetChildAt(13); - btn_adclaim = (GButton)GetChildAt(18); - btn_claim = (GButton)GetChildAt(19); - btn_restart = (GButton)GetChildAt(20); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_lvsuccess.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_lvsuccess.cs.meta deleted file mode 100644 index 302b2e7..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_lvsuccess.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2441a38fddde9485fac8513e9c1a2666 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_packreward.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_packreward.cs deleted file mode 100644 index c8647c5..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_packreward.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class com_packreward : GComponent - { - public pack_panelparent panel_parent; - public GComponent gold; - public const string URL = "ui://1x1w9cxnagfu17"; - - public static com_packreward CreateInstance() - { - return (com_packreward)UIPackage.CreateObject("G008_reward_animal", "com_packreward"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - panel_parent = (pack_panelparent)GetChildAt(0); - gold = (GComponent)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_packreward.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_packreward.cs.meta deleted file mode 100644 index c4b3419..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_packreward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b19a1672f90c8481c9ac7f39b3235fe3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_payloading.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_payloading.cs.meta deleted file mode 100644 index e7a8423..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_payloading.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ffda62e3ec3c846c7a19d6b923251011 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_reward.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_reward.cs deleted file mode 100644 index 7512ed5..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_reward.cs +++ /dev/null @@ -1,43 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class com_reward : GComponent - { - public Controller cont_collect; - public Controller cont_white; - public GComponent com_playbox; - public GComponent btn_nor; - public GGraph fx_place; - public GTextField title0; - public GTextField text_num; - public GComponent btn_multi; - public GComponent btn_collect; - public Transition t0; - public const string URL = "ui://1x1w9cxnkj3h1"; - - public static com_reward CreateInstance() - { - return (com_reward)UIPackage.CreateObject("G008_reward_animal", "com_reward"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cont_collect = GetControllerAt(0); - cont_white = GetControllerAt(1); - com_playbox = (GComponent)GetChildAt(0); - btn_nor = (GComponent)GetChildAt(2); - fx_place = (GGraph)GetChildAt(3); - title0 = (GTextField)GetChildAt(5); - text_num = (GTextField)GetChildAt(7); - btn_multi = (GComponent)GetChildAt(8); - btn_collect = (GComponent)GetChildAt(9); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_reward.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_reward.cs.meta deleted file mode 100644 index 862929f..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_reward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 036a15063c74541d4ae3f46d9ff9babe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_rewardbox.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_rewardbox.cs deleted file mode 100644 index fca5bc5..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_rewardbox.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class com_rewardbox : GComponent - { - public Controller switchgift; - public GTextField gold_text; - public GButton btn_lookad; - public GButton btn_close; - public const string URL = "ui://1x1w9cxnagfuk"; - - public static com_rewardbox CreateInstance() - { - return (com_rewardbox)UIPackage.CreateObject("G008_reward_animal", "com_rewardbox"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - switchgift = GetControllerAt(0); - gold_text = (GTextField)GetChildAt(3); - btn_lookad = (GButton)GetChildAt(6); - btn_close = (GButton)GetChildAt(7); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_rewardbox.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_rewardbox.cs.meta deleted file mode 100644 index f4ef022..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_rewardbox.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 823e7662be2474ba49e62497f3e6175e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_success_cash.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_success_cash.cs deleted file mode 100644 index e676d50..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_success_cash.cs +++ /dev/null @@ -1,33 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class com_success_cash : GComponent - { - public GTextField cash_text; - public GImage progress; - public GTextField progress_text; - public GButton btn_cash; - public cash_broad broad; - public const string URL = "ui://1x1w9cxnagfu11"; - - public static com_success_cash CreateInstance() - { - return (com_success_cash)UIPackage.CreateObject("G008_reward_animal", "com_success_cash"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cash_text = (GTextField)GetChildAt(1); - progress = (GImage)GetChildAt(3); - progress_text = (GTextField)GetChildAt(4); - btn_cash = (GButton)GetChildAt(5); - broad = (cash_broad)GetChildAt(6); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_success_cash.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_success_cash.cs.meta deleted file mode 100644 index c24f986..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/com_success_cash.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 52d7519ded0d54e0eb86f1c707367adb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panel.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panel.cs deleted file mode 100644 index c112636..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panel.cs +++ /dev/null @@ -1,63 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class pack_panel : GComponent - { - public Controller pay_type; - public GTextField title; - public GImage text_backnum; - public GTextField text_goldnum; - public GTextField text_outnum; - public GTextField text_backnum1; - public GTextField text_refreshnum; - public GTextField text_goldnum2; - public GTextField title_2; - public GTextField text_goldnum2_2; - public GButton btn_close0; - public GButton btn_close1; - public GTextField text_have1; - public GTextField need_text1; - public GTextField text_have2; - public GTextField need_text2; - public GButton btn_buypack; - public GButton btn_buyremovead; - public GButton btn_max_pack; - public GButton btn_max_remove; - public const string URL = "ui://1x1w9cxnttbj1v"; - - public static pack_panel CreateInstance() - { - return (pack_panel)UIPackage.CreateObject("G008_reward_animal", "pack_panel"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pay_type = GetControllerAt(0); - title = (GTextField)GetChildAt(7); - text_backnum = (GImage)GetChildAt(11); - text_goldnum = (GTextField)GetChildAt(12); - text_outnum = (GTextField)GetChildAt(13); - text_backnum1 = (GTextField)GetChildAt(14); - text_refreshnum = (GTextField)GetChildAt(15); - text_goldnum2 = (GTextField)GetChildAt(19); - title_2 = (GTextField)GetChildAt(20); - text_goldnum2_2 = (GTextField)GetChildAt(21); - btn_close0 = (GButton)GetChildAt(24); - btn_close1 = (GButton)GetChildAt(25); - text_have1 = (GTextField)GetChildAt(26); - need_text1 = (GTextField)GetChildAt(27); - text_have2 = (GTextField)GetChildAt(28); - need_text2 = (GTextField)GetChildAt(29); - btn_buypack = (GButton)GetChildAt(30); - btn_buyremovead = (GButton)GetChildAt(31); - btn_max_pack = (GButton)GetChildAt(32); - btn_max_remove = (GButton)GetChildAt(33); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panel.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panel.cs.meta deleted file mode 100644 index c4b6e7f..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e2d1326cbf80d4c148358f31b0f29e51 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panelparent.cs b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panelparent.cs deleted file mode 100644 index 808c1ea..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panelparent.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G008_reward_animal -{ - public partial class pack_panelparent : GComponent - { - public pack_panel panel; - public const string URL = "ui://1x1w9cxnttbj1x"; - - public static pack_panelparent CreateInstance() - { - return (pack_panelparent)UIPackage.CreateObject("G008_reward_animal", "pack_panelparent"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - panel = (pack_panel)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panelparent.cs.meta b/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panelparent.cs.meta deleted file mode 100644 index 4750031..0000000 --- a/Assets/BingoBrain/FGUI/Package/G008_reward_animal/pack_panelparent.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8488a1c9ebacb45608e275526c46489b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal.meta deleted file mode 100644 index 4a221a6..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c08f18b331a742069fb02e748c9d6c9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/G009_video_animalBinder.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/G009_video_animalBinder.cs deleted file mode 100644 index de896f8..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/G009_video_animalBinder.cs +++ /dev/null @@ -1,22 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.G009_video_animal -{ - public class G009_video_animalBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_battlepass.URL, typeof(com_battlepass)); - UIObjectFactory.SetPackageItemExtension(com_passitem.URL, typeof(com_passitem)); - UIObjectFactory.SetPackageItemExtension(com_passreward.URL, typeof(com_passreward)); - UIObjectFactory.SetPackageItemExtension(com_gettaskreward.URL, typeof(com_gettaskreward)); - UIObjectFactory.SetPackageItemExtension(com_newtask.URL, typeof(com_newtask)); - UIObjectFactory.SetPackageItemExtension(com_toptab.URL, typeof(com_toptab)); - UIObjectFactory.SetPackageItemExtension(task_item.URL, typeof(task_item)); - UIObjectFactory.SetPackageItemExtension(btn_task.URL, typeof(btn_task)); - UIObjectFactory.SetPackageItemExtension(com_passunlock.URL, typeof(com_passunlock)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/G009_video_animalBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/G009_video_animalBinder.cs.meta deleted file mode 100644 index 2a75e9a..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/G009_video_animalBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 973897a61b0a04e208eff7683a6d7b83 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_battlepass.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_battlepass.cs deleted file mode 100644 index 575e8ea..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_battlepass.cs +++ /dev/null @@ -1,39 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class com_battlepass : GComponent - { - public GList pass_list; - public GTextField remain_time; - public GImage progress; - public GTextField now_exp; - public GButton btn_pay; - public GTextField now_level; - public GButton btn_showtips; - public Transition t0; - public const string URL = "ui://y6hi0pcjagfu1t"; - - public static com_battlepass CreateInstance() - { - return (com_battlepass)UIPackage.CreateObject("G009_video_animal", "com_battlepass"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pass_list = (GList)GetChildAt(1); - remain_time = (GTextField)GetChildAt(5); - progress = (GImage)GetChildAt(7); - now_exp = (GTextField)GetChildAt(9); - btn_pay = (GButton)GetChildAt(12); - now_level = (GTextField)GetChildAt(13); - btn_showtips = (GButton)GetChildAt(14); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_battlepass.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_battlepass.cs.meta deleted file mode 100644 index 751750b..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_battlepass.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 90f33603fe97b4b5abc3155e624ae7ec -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_gettaskreward.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_gettaskreward.cs deleted file mode 100644 index 1134014..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_gettaskreward.cs +++ /dev/null @@ -1,33 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class com_gettaskreward : GComponent - { - public GGraph bg_parent; - public GButton btn_adclaim; - public GTextField money_text; - public GButton btn_claim; - public Transition t0; - public const string URL = "ui://y6hi0pcjagfu1z"; - - public static com_gettaskreward CreateInstance() - { - return (com_gettaskreward)UIPackage.CreateObject("G009_video_animal", "com_gettaskreward"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - bg_parent = (GGraph)GetChildAt(0); - btn_adclaim = (GButton)GetChildAt(1); - money_text = (GTextField)GetChildAt(3); - btn_claim = (GButton)GetChildAt(7); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_gettaskreward.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_gettaskreward.cs.meta deleted file mode 100644 index cbc2a5d..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_gettaskreward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0aa3d10b6b51d4b8f8d1022fd4e3cdf1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_newtask.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_newtask.cs deleted file mode 100644 index d3ebe6d..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_newtask.cs +++ /dev/null @@ -1,35 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class com_newtask : GComponent - { - public GList task_list; - public GComponent gold; - public GComponent money; - public com_battlepass pass_com; - public com_toptab com_toptab; - public GButton btn_close; - public const string URL = "ui://y6hi0pcjagfue"; - - public static com_newtask CreateInstance() - { - return (com_newtask)UIPackage.CreateObject("G009_video_animal", "com_newtask"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - task_list = (GList)GetChildAt(2); - gold = (GComponent)GetChildAt(3); - money = (GComponent)GetChildAt(4); - pass_com = (com_battlepass)GetChildAt(5); - com_toptab = (com_toptab)GetChildAt(7); - btn_close = (GButton)GetChildAt(8); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_newtask.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_newtask.cs.meta deleted file mode 100644 index b361104..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_newtask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4cc69df17b7d24c1c9b94682cb9f1d31 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passitem.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passitem.cs deleted file mode 100644 index d3a7ec0..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passitem.cs +++ /dev/null @@ -1,43 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class com_passitem : GComponent - { - public Controller state; - public Controller full; - public GImage progress_0_top; - public GImage progress_0_down; - public GImage progress_1_top; - public GImage progress_1_down; - public GImage progress_2_top; - public GTextField index_text; - public com_passreward free_item; - public com_passreward pay_item; - public const string URL = "ui://y6hi0pcjagfu1v"; - - public static com_passitem CreateInstance() - { - return (com_passitem)UIPackage.CreateObject("G009_video_animal", "com_passitem"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - full = GetControllerAt(1); - progress_0_top = (GImage)GetChildAt(11); - progress_0_down = (GImage)GetChildAt(12); - progress_1_top = (GImage)GetChildAt(13); - progress_1_down = (GImage)GetChildAt(14); - progress_2_top = (GImage)GetChildAt(15); - index_text = (GTextField)GetChildAt(17); - free_item = (com_passreward)GetChildAt(18); - pay_item = (com_passreward)GetChildAt(19); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passitem.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passitem.cs.meta deleted file mode 100644 index 48ca054..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passitem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d5648341875644296a727c3281d6c7ab -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passreward.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passreward.cs deleted file mode 100644 index 3c56efc..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passreward.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class com_passreward : GButton - { - public Controller type; - public Controller state; - public GLoader item_loader; - public GTextField number_text; - public const string URL = "ui://y6hi0pcjagfu1w"; - - public static com_passreward CreateInstance() - { - return (com_passreward)UIPackage.CreateObject("G009_video_animal", "com_passreward"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - type = GetControllerAt(0); - state = GetControllerAt(1); - item_loader = (GLoader)GetChildAt(4); - number_text = (GTextField)GetChildAt(5); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passreward.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passreward.cs.meta deleted file mode 100644 index dc9b433..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passreward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fb70e9bbe67fe423e93b398ed2fbaf87 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passunlock.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passunlock.cs deleted file mode 100644 index 7e1addd..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passunlock.cs +++ /dev/null @@ -1,37 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class com_passunlock : GComponent - { - public Controller pay_type; - public GTextField text_allgold; - public GButton btn_close; - public GTextField text_have; - public GTextField need_text; - public GButton btn_buypass; - public GButton btn_max_pay; - public const string URL = "ui://y6hi0pcjttbj2b"; - - public static com_passunlock CreateInstance() - { - return (com_passunlock)UIPackage.CreateObject("G009_video_animal", "com_passunlock"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pay_type = GetControllerAt(0); - text_allgold = (GTextField)GetChildAt(3); - btn_close = (GButton)GetChildAt(7); - text_have = (GTextField)GetChildAt(8); - need_text = (GTextField)GetChildAt(9); - btn_buypass = (GButton)GetChildAt(10); - btn_max_pay = (GButton)GetChildAt(11); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passunlock.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passunlock.cs.meta deleted file mode 100644 index e619c76..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_passunlock.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5836bae2d25c24898a1eced89551fc42 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_toptab.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_toptab.cs deleted file mode 100644 index 67802b0..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_toptab.cs +++ /dev/null @@ -1,37 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class com_toptab : GComponent - { - public Controller tab; - public GButton btn_battle; - public GButton btn_pass; - public GButton btn_time; - public GImage red_0; - public GImage red_1; - public GImage red_2; - public const string URL = "ui://y6hi0pcjagfux"; - - public static com_toptab CreateInstance() - { - return (com_toptab)UIPackage.CreateObject("G009_video_animal", "com_toptab"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - tab = GetControllerAt(0); - btn_battle = (GButton)GetChildAt(9); - btn_pass = (GButton)GetChildAt(10); - btn_time = (GButton)GetChildAt(11); - red_0 = (GImage)GetChildAt(12); - red_1 = (GImage)GetChildAt(13); - red_2 = (GImage)GetChildAt(14); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_toptab.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_toptab.cs.meta deleted file mode 100644 index c3e3a2f..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/com_toptab.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 572d96c773b7347bf99d8539e407b682 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/task_item.cs b/Assets/BingoBrain/FGUI/Package/G009_video_animal/task_item.cs deleted file mode 100644 index f6b9044..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/task_item.cs +++ /dev/null @@ -1,35 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G009_video_animal -{ - public partial class task_item : GComponent - { - public GImage gold_img; - public GImage progress; - public GTextField content_text; - public GTextField progress_text; - public GTextField number_text; - public btn_task btn_get; - public const string URL = "ui://y6hi0pcjagfuy"; - - public static task_item CreateInstance() - { - return (task_item)UIPackage.CreateObject("G009_video_animal", "task_item"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - gold_img = (GImage)GetChildAt(1); - progress = (GImage)GetChildAt(3); - content_text = (GTextField)GetChildAt(4); - progress_text = (GTextField)GetChildAt(5); - number_text = (GTextField)GetChildAt(6); - btn_get = (btn_task)GetChildAt(7); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G009_video_animal/task_item.cs.meta b/Assets/BingoBrain/FGUI/Package/G009_video_animal/task_item.cs.meta deleted file mode 100644 index fb3d192..0000000 --- a/Assets/BingoBrain/FGUI/Package/G009_video_animal/task_item.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8e38ae2fce227460cb6e8af5c6d1a539 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal.meta b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal.meta deleted file mode 100644 index 201ee05..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb22f10337a764ddcbce8c1f384b5ad2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/G012_openReward_animalBinder.cs b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/G012_openReward_animalBinder.cs deleted file mode 100644 index c23f632..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/G012_openReward_animalBinder.cs +++ /dev/null @@ -1,18 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.G012_openReward_animal -{ - public class G012_openReward_animalBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(buygold_item.URL, typeof(buygold_item)); - UIObjectFactory.SetPackageItemExtension(btn_buy.URL, typeof(btn_buy)); - UIObjectFactory.SetPackageItemExtension(com_buygold.URL, typeof(com_buygold)); - UIObjectFactory.SetPackageItemExtension(btn_buy_2.URL, typeof(btn_buy_2)); - UIObjectFactory.SetPackageItemExtension(btn_watchAd1.URL, typeof(btn_watchAd1)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/G012_openReward_animalBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/G012_openReward_animalBinder.cs.meta deleted file mode 100644 index 43ca428..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/G012_openReward_animalBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 93738f3832b5f4e76a409290d1b882c7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy.cs b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy.cs deleted file mode 100644 index b34f146..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G012_openReward_animal -{ - public partial class btn_buy : GButton - { - public Controller cooldown; - public Controller state; - public GTextField btn_text; - public GTextField receive_title; - public const string URL = "ui://ulg8pausagfu1b"; - - public static btn_buy CreateInstance() - { - return (btn_buy)UIPackage.CreateObject("G012_openReward_animal", "btn_buy"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - cooldown = GetControllerAt(0); - state = GetControllerAt(1); - btn_text = (GTextField)GetChildAt(2); - receive_title = (GTextField)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy.cs.meta b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy.cs.meta deleted file mode 100644 index 1797344..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 90526ba2f19ec447db3a4451d2eab93f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy_2.cs b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy_2.cs deleted file mode 100644 index 7fb90b8..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy_2.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G012_openReward_animal -{ - public partial class btn_buy_2 : GButton - { - public Controller can_buy; - public GTextField btn_text; - public GImage img_saveingpot; - public const string URL = "ui://ulg8pauseneg1e"; - - public static btn_buy_2 CreateInstance() - { - return (btn_buy_2)UIPackage.CreateObject("G012_openReward_animal", "btn_buy 2"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - can_buy = GetControllerAt(0); - btn_text = (GTextField)GetChildAt(1); - img_saveingpot = (GImage)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy_2.cs.meta b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy_2.cs.meta deleted file mode 100644 index 1fd0483..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_buy_2.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 12e8392fa955741a0bb3a864d22c8f3a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_watchAd1.cs b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_watchAd1.cs deleted file mode 100644 index b11706e..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_watchAd1.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G012_openReward_animal -{ - public partial class btn_watchAd1 : GButton - { - public Controller can_buy; - public GTextField btn_text; - public GTextField watch; - public GImage img_saveingpot; - public const string URL = "ui://ulg8pauseneg1f"; - - public static btn_watchAd1 CreateInstance() - { - return (btn_watchAd1)UIPackage.CreateObject("G012_openReward_animal", "btn_watchAd1"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - can_buy = GetControllerAt(0); - btn_text = (GTextField)GetChildAt(1); - watch = (GTextField)GetChildAt(2); - img_saveingpot = (GImage)GetChildAt(4); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_watchAd1.cs.meta b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_watchAd1.cs.meta deleted file mode 100644 index 581228a..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/btn_watchAd1.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a2e1d1abba1d5458fa86b0ac26b9eee4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/buygold_item.cs b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/buygold_item.cs deleted file mode 100644 index 43df213..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/buygold_item.cs +++ /dev/null @@ -1,37 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G012_openReward_animal -{ - public partial class buygold_item : GComponent - { - public Controller index; - public btn_buy_2 btn_buy; - public GTextField coin_text; - public GTextField need_text; - public GTextField off_text; - public GTextField content_text; - public GGroup discount; - public const string URL = "ui://ulg8pausagfu1a"; - - public static buygold_item CreateInstance() - { - return (buygold_item)UIPackage.CreateObject("G012_openReward_animal", "buygold_item"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - index = GetControllerAt(0); - btn_buy = (btn_buy_2)GetChildAt(7); - coin_text = (GTextField)GetChildAt(8); - need_text = (GTextField)GetChildAt(9); - off_text = (GTextField)GetChildAt(11); - content_text = (GTextField)GetChildAt(12); - discount = (GGroup)GetChildAt(13); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/buygold_item.cs.meta b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/buygold_item.cs.meta deleted file mode 100644 index df26871..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/buygold_item.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1d961d1cd33154e73b8bf9b7cb223df2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/com_buygold.cs b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/com_buygold.cs deleted file mode 100644 index 8001c22..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/com_buygold.cs +++ /dev/null @@ -1,35 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.G012_openReward_animal -{ - public partial class com_buygold : GComponent - { - public Controller pay_type; - public GComponent top_gold; - public GButton btn_close; - public GTextField text_have; - public GList list; - public btn_watchAd1 btn_watch; - public const string URL = "ui://ulg8pausagfus"; - - public static com_buygold CreateInstance() - { - return (com_buygold)UIPackage.CreateObject("G012_openReward_animal", "com_buygold"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pay_type = GetControllerAt(0); - top_gold = (GComponent)GetChildAt(2); - btn_close = (GButton)GetChildAt(3); - text_have = (GTextField)GetChildAt(4); - list = (GList)GetChildAt(5); - btn_watch = (btn_watchAd1)GetChildAt(6); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/com_buygold.cs.meta b/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/com_buygold.cs.meta deleted file mode 100644 index 77cbe8f..0000000 --- a/Assets/BingoBrain/FGUI/Package/G012_openReward_animal/com_buygold.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 92e8591b1f1084f94946dd687e6e720a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs index e7bf74c..f4ba240 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs @@ -22,9 +22,9 @@ namespace FGUI.JBingoPlay { base.ConstructFromXML(xml); - com_endPop = (com_endpop)GetChildAt(0); - btn_playagain = (btn_playagain)GetChildAt(1); - btn_home = (GButton)GetChildAt(2); + com_endPop = (com_endpop)GetChildAt(2); + btn_playagain = (btn_playagain)GetChildAt(3); + btn_home = (GButton)GetChildAt(4); fx_enter = GetTransitionAt(0); } } diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_endpop.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_endpop.cs index a57e4c2..e4edb94 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_endpop.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_endpop.cs @@ -10,7 +10,6 @@ namespace FGUI.JBingoPlay public Controller cont_end; public Controller cont_giftSwitch; public Controller gift; - public GGraph gp_fx; public GTextField text_coin; public GTextField text_cash; public GTextField title; @@ -29,11 +28,10 @@ namespace FGUI.JBingoPlay cont_end = GetControllerAt(0); cont_giftSwitch = GetControllerAt(1); gift = GetControllerAt(2); - gp_fx = (GGraph)GetChildAt(0); - text_coin = (GTextField)GetChildAt(4); - text_cash = (GTextField)GetChildAt(5); - title = (GTextField)GetChildAt(7); - txt = (GTextField)GetChildAt(8); + text_coin = (GTextField)GetChildAt(2); + text_cash = (GTextField)GetChildAt(3); + title = (GTextField)GetChildAt(5); + txt = (GTextField)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_leavegame.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_leavegame.cs index 5fe5a4b..3f870f3 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_leavegame.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_leavegame.cs @@ -23,11 +23,11 @@ namespace FGUI.JBingoPlay { base.ConstructFromXML(xml); - title = (GTextField)GetChildAt(1); - text = (GTextField)GetChildAt(2); - btn_leave = (GButton)GetChildAt(3); - btn_stay = (GButton)GetChildAt(4); - closeButton = (GButton)GetChildAt(5); + title = (GTextField)GetChildAt(2); + text = (GTextField)GetChildAt(3); + btn_leave = (GButton)GetChildAt(4); + btn_stay = (GButton)GetChildAt(5); + closeButton = (GButton)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_morecard.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_morecard.cs index 5276efe..f4e2b1c 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_morecard.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_morecard.cs @@ -7,7 +7,7 @@ namespace FGUI.JBingoPlay { public partial class com_morecard : GComponent { - public GTextField title; + public GTextField txt_title; public GButton closeButton; public GButton btn_more; public GTextField text_cardnum; @@ -22,10 +22,10 @@ namespace FGUI.JBingoPlay { base.ConstructFromXML(xml); - title = (GTextField)GetChildAt(1); + txt_title = (GTextField)GetChildAt(2); closeButton = (GButton)GetChildAt(3); - btn_more = (GButton)GetChildAt(4); - text_cardnum = (GTextField)GetChildAt(6); + btn_more = (GButton)GetChildAt(5); + text_cardnum = (GTextField)GetChildAt(7); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_play.cs b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_play.cs index 8f21c89..e0fdb7e 100644 --- a/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_play.cs +++ b/Assets/BingoBrain/FGUI/Package/JBingoPlay/com_play.cs @@ -14,11 +14,11 @@ namespace FGUI.JBingoPlay public com_prop com_prop; public com_AddBall com_AddBall; public GButton btn_close; - public GComponent btn_coin; + public GButton btn_coin; + public GButton btn_cash; public com_carddi com_carddi; public btn_star btn_star; public GGraph spine_parent; - public GComponent btn_cash; public com_CallNum com_CallNum; public com_ball com_ballleft; public GGroup group_; @@ -44,11 +44,11 @@ namespace FGUI.JBingoPlay com_prop = (com_prop)GetChildAt(4); com_AddBall = (com_AddBall)GetChildAt(5); btn_close = (GButton)GetChildAt(6); - btn_coin = (GComponent)GetChildAt(7); - com_carddi = (com_carddi)GetChildAt(8); - btn_star = (btn_star)GetChildAt(9); - spine_parent = (GGraph)GetChildAt(10); - btn_cash = (GComponent)GetChildAt(11); + btn_coin = (GButton)GetChildAt(7); + btn_cash = (GButton)GetChildAt(8); + com_carddi = (com_carddi)GetChildAt(9); + btn_star = (btn_star)GetChildAt(10); + spine_parent = (GGraph)GetChildAt(11); com_CallNum = (com_CallNum)GetChildAt(12); com_ballleft = (com_ball)GetChildAt(13); group_ = (GGroup)GetChildAt(14); diff --git a/Assets/BingoBrain/FGUI/Package/JLogin.meta b/Assets/BingoBrain/FGUI/Package/JLogin.meta deleted file mode 100644 index 4b45886..0000000 --- a/Assets/BingoBrain/FGUI/Package/JLogin.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ab5d1876eba1b3346965dafe5b9187aa -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JLogin/JLoginBinder.cs b/Assets/BingoBrain/FGUI/Package/JLogin/JLoginBinder.cs deleted file mode 100644 index 6c22905..0000000 --- a/Assets/BingoBrain/FGUI/Package/JLogin/JLoginBinder.cs +++ /dev/null @@ -1,14 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.JLogin -{ - public class JLoginBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_login.URL, typeof(com_login)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JLogin/JLoginBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/JLogin/JLoginBinder.cs.meta deleted file mode 100644 index e565dbe..0000000 --- a/Assets/BingoBrain/FGUI/Package/JLogin/JLoginBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9937fedd334aa344299ae4c706300ba6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JLogin/com_login.cs b/Assets/BingoBrain/FGUI/Package/JLogin/com_login.cs deleted file mode 100644 index 5baa86b..0000000 --- a/Assets/BingoBrain/FGUI/Package/JLogin/com_login.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.JLogin -{ - public partial class com_login : GComponent - { - public GButton btn_play; - public GComponent com_blklist1; - public GButton btn_showmax; - public Transition logo; - public const string URL = "ui://idbyf66gknau5"; - - public static com_login CreateInstance() - { - return (com_login)UIPackage.CreateObject("JLogin", "com_login"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - btn_play = (GButton)GetChildAt(0); - com_blklist1 = (GComponent)GetChildAt(1); - btn_showmax = (GButton)GetChildAt(2); - logo = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JLogin/com_login.cs.meta b/Assets/BingoBrain/FGUI/Package/JLogin/com_login.cs.meta deleted file mode 100644 index 09b57f5..0000000 --- a/Assets/BingoBrain/FGUI/Package/JLogin/com_login.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9f0e948debe600d4e940eb4c595792bb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs index 98e7793..5f39d4c 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs @@ -10,12 +10,12 @@ namespace FGUI.JMain public Controller state; public GGraph spine_parent; public GButton btn_getreward; - public GTextField end_point; + public GTextField txt_title; + public GButton closeButton; + public GImage img_gold; public GTextField text_num; - public GTextField title0; - public GButton btn_close; - public GImage img_cash; public GButton btn_get; + public GTextField end_point; public const string URL = "ui://qw9x6rf3ngxz38"; public static com_firstreward CreateInstance() @@ -30,12 +30,12 @@ namespace FGUI.JMain state = GetControllerAt(0); spine_parent = (GGraph)GetChildAt(0); btn_getreward = (GButton)GetChildAt(1); - end_point = (GTextField)GetChildAt(2); - text_num = (GTextField)GetChildAt(4); - title0 = (GTextField)GetChildAt(5); - btn_close = (GButton)GetChildAt(6); - img_cash = (GImage)GetChildAt(7); + txt_title = (GTextField)GetChildAt(4); + closeButton = (GButton)GetChildAt(5); + img_gold = (GImage)GetChildAt(6); + text_num = (GTextField)GetChildAt(7); btn_get = (GButton)GetChildAt(8); + end_point = (GTextField)GetChildAt(10); } } } \ 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 67d19c5..1dc97bf 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs @@ -8,6 +8,7 @@ namespace FGUI.JMain public partial class com_main : GComponent { public Controller gift; + public Controller type; public GGraph gp_fx; public GButton btn_play; public com_cardnum com_cardnum; @@ -18,7 +19,8 @@ namespace FGUI.JMain public makeup makeup; public GButton btn_admin; public btn_question btn_question; - public GButton btn_h5; + public GButton btn_saveingpot; + public GButton btn_cashout; public const string URL = "ui://qw9x6rf3lbaa0"; public static com_main CreateInstance() @@ -31,17 +33,19 @@ namespace FGUI.JMain base.ConstructFromXML(xml); gift = GetControllerAt(0); + type = GetControllerAt(1); gp_fx = (GGraph)GetChildAt(0); - btn_play = (GButton)GetChildAt(1); - com_cardnum = (com_cardnum)GetChildAt(2); - com_cards = (com_playnum)GetChildAt(3); - com_cardplay = (com_cardplaytext)GetChildAt(4); - btn_ballon = (GButton)GetChildAt(5); - btn_set = (GButton)GetChildAt(6); - makeup = (makeup)GetChildAt(7); - btn_admin = (GButton)GetChildAt(8); - btn_question = (btn_question)GetChildAt(9); - btn_h5 = (GButton)GetChildAt(10); + btn_play = (GButton)GetChildAt(6); + com_cardnum = (com_cardnum)GetChildAt(7); + com_cards = (com_playnum)GetChildAt(8); + com_cardplay = (com_cardplaytext)GetChildAt(9); + btn_ballon = (GButton)GetChildAt(10); + btn_set = (GButton)GetChildAt(11); + makeup = (makeup)GetChildAt(12); + btn_admin = (GButton)GetChildAt(13); + btn_question = (btn_question)GetChildAt(14); + btn_saveingpot = (GButton)GetChildAt(15); + btn_cashout = (GButton)GetChildAt(16); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMall/JMallBinder.cs b/Assets/BingoBrain/FGUI/Package/JMall/JMallBinder.cs index 589808e..8844f44 100644 --- a/Assets/BingoBrain/FGUI/Package/JMall/JMallBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/JMall/JMallBinder.cs @@ -11,6 +11,7 @@ namespace FGUI.JMall UIObjectFactory.SetPackageItemExtension(com_mall.URL, typeof(com_mall)); UIObjectFactory.SetPackageItemExtension(com_mall_carditem.URL, typeof(com_mall_carditem)); UIObjectFactory.SetPackageItemExtension(com_mall_coinitem.URL, typeof(com_mall_coinitem)); + UIObjectFactory.SetPackageItemExtension(btn_redeem_coin.URL, typeof(btn_redeem_coin)); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMall/btn_redeem_coin.cs b/Assets/BingoBrain/FGUI/Package/JMall/btn_redeem_coin.cs new file mode 100644 index 0000000..53bfb21 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMall/btn_redeem_coin.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.JMall +{ + public partial class btn_redeem_coin : GButton + { + public Controller type; + public const string URL = "ui://wj1zvor9x6ybe"; + + public static btn_redeem_coin CreateInstance() + { + return (btn_redeem_coin)UIPackage.CreateObject("JMall", "btn_redeem_coin"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + type = GetControllerAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMall/btn_redeem_coin.cs.meta b/Assets/BingoBrain/FGUI/Package/JMall/btn_redeem_coin.cs.meta new file mode 100644 index 0000000..563a8d4 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMall/btn_redeem_coin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fe4a8043718fddf44809176747389f06 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JMall/com_mall_carditem.cs b/Assets/BingoBrain/FGUI/Package/JMall/com_mall_carditem.cs index 98cfd5d..3e45df5 100644 --- a/Assets/BingoBrain/FGUI/Package/JMall/com_mall_carditem.cs +++ b/Assets/BingoBrain/FGUI/Package/JMall/com_mall_carditem.cs @@ -8,8 +8,7 @@ namespace FGUI.JMall public partial class com_mall_carditem : GComponent { public GTextField text_count; - public GTextField text_number; - public GButton btn_redeem; + public btn_redeem_coin btn_redeem_coin; public const string URL = "ui://wj1zvor9x6ybb"; public static com_mall_carditem CreateInstance() @@ -21,9 +20,8 @@ namespace FGUI.JMall { base.ConstructFromXML(xml); - text_count = (GTextField)GetChildAt(3); - text_number = (GTextField)GetChildAt(5); - btn_redeem = (GButton)GetChildAt(6); + text_count = (GTextField)GetChildAt(2); + btn_redeem_coin = (btn_redeem_coin)GetChildAt(3); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMall/com_mall_coinitem.cs b/Assets/BingoBrain/FGUI/Package/JMall/com_mall_coinitem.cs index 70cc93f..b9d6f97 100644 --- a/Assets/BingoBrain/FGUI/Package/JMall/com_mall_coinitem.cs +++ b/Assets/BingoBrain/FGUI/Package/JMall/com_mall_coinitem.cs @@ -8,7 +8,7 @@ namespace FGUI.JMall public partial class com_mall_coinitem : GComponent { public GTextField text_count; - public GButton btn_redeem_coin; + public btn_redeem_coin btn_redeem_coin; public const string URL = "ui://wj1zvor9x6ybd"; public static com_mall_coinitem CreateInstance() @@ -21,7 +21,7 @@ namespace FGUI.JMall base.ConstructFromXML(xml); text_count = (GTextField)GetChildAt(2); - btn_redeem_coin = (GButton)GetChildAt(3); + btn_redeem_coin = (btn_redeem_coin)GetChildAt(3); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JPrivacy/com_privacy.cs b/Assets/BingoBrain/FGUI/Package/JPrivacy/com_privacy.cs index 3e2e9a0..6ee12c3 100644 --- a/Assets/BingoBrain/FGUI/Package/JPrivacy/com_privacy.cs +++ b/Assets/BingoBrain/FGUI/Package/JPrivacy/com_privacy.cs @@ -21,7 +21,7 @@ namespace FGUI.JPrivacy { base.ConstructFromXML(xml); - txt_title = (GTextField)GetChildAt(1); + txt_title = (GTextField)GetChildAt(2); closeButton = (GButton)GetChildAt(3); list_privacy = (GList)GetChildAt(4); } diff --git a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs index 27e9185..5e1b507 100644 --- a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs +++ b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs @@ -9,9 +9,9 @@ namespace FGUI.JRewardPop { public Controller cont_extra; public Controller curr_type; - public GTextField title; - public GTextField text_num; + public GTextField txt_title; public GButton closeButton; + public GTextField text_num; public GButton btn_more; public com_roll com_roll; public GTextField text_cardnum; @@ -29,13 +29,13 @@ namespace FGUI.JRewardPop cont_extra = GetControllerAt(0); curr_type = GetControllerAt(1); - title = (GTextField)GetChildAt(1); - text_num = (GTextField)GetChildAt(5); - closeButton = (GButton)GetChildAt(6); - btn_more = (GButton)GetChildAt(7); - com_roll = (com_roll)GetChildAt(8); - text_cardnum = (GTextField)GetChildAt(12); - btn_claim = (btn_claim)GetChildAt(15); + 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); + text_cardnum = (GTextField)GetChildAt(13); + btn_claim = (btn_claim)GetChildAt(16); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JSettings/com_howto.cs b/Assets/BingoBrain/FGUI/Package/JSettings/com_howto.cs index 2fbd98a..5448af7 100644 --- a/Assets/BingoBrain/FGUI/Package/JSettings/com_howto.cs +++ b/Assets/BingoBrain/FGUI/Package/JSettings/com_howto.cs @@ -7,7 +7,7 @@ namespace FGUI.JSettings { public partial class com_howto : GComponent { - public GTextField title; + public GTextField txt_title; public GButton closeButton; public const string URL = "ui://ae8hdoudrhllp"; @@ -20,8 +20,8 @@ namespace FGUI.JSettings { base.ConstructFromXML(xml); - title = (GTextField)GetChildAt(1); - closeButton = (GButton)GetChildAt(2); + txt_title = (GTextField)GetChildAt(2); + closeButton = (GButton)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JSettings/com_setting.cs b/Assets/BingoBrain/FGUI/Package/JSettings/com_setting.cs index 59bec96..d633200 100644 --- a/Assets/BingoBrain/FGUI/Package/JSettings/com_setting.cs +++ b/Assets/BingoBrain/FGUI/Package/JSettings/com_setting.cs @@ -7,17 +7,17 @@ namespace FGUI.JSettings { public partial class com_setting : GComponent { - public GRichTextField txt_title; - public GButton closeButton; + public btn_6contact btn_contact; + public btn_record btn_record; public GTextField text_uid; public GTextField text_version; public btn_4music btn_music; public btn_5sounds btn_sound; public btn_2howto btn_how; - public btn_6contact btn_contact; - public btn_record btn_record; public btn_pri btn_pri; public btn_terns btn_terms; + public GTextField txt_title; + public GButton closeButton; public const string URL = "ui://ae8hdoudrhll0"; public static com_setting CreateInstance() @@ -29,17 +29,17 @@ namespace FGUI.JSettings { base.ConstructFromXML(xml); - txt_title = (GRichTextField)GetChildAt(1); - closeButton = (GButton)GetChildAt(2); + btn_contact = (btn_6contact)GetChildAt(0); + btn_record = (btn_record)GetChildAt(1); text_uid = (GTextField)GetChildAt(3); text_version = (GTextField)GetChildAt(4); btn_music = (btn_4music)GetChildAt(5); btn_sound = (btn_5sounds)GetChildAt(6); btn_how = (btn_2howto)GetChildAt(7); - btn_contact = (btn_6contact)GetChildAt(8); - btn_record = (btn_record)GetChildAt(9); - btn_pri = (btn_pri)GetChildAt(10); - btn_terms = (btn_terns)GetChildAt(11); + btn_pri = (btn_pri)GetChildAt(8); + btn_terms = (btn_terns)GetChildAt(9); + txt_title = (GTextField)GetChildAt(11); + closeButton = (GButton)GetChildAt(12); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JSign/btn_day.cs b/Assets/BingoBrain/FGUI/Package/JSign/btn_day.cs index 1c256ef..5d51621 100644 --- a/Assets/BingoBrain/FGUI/Package/JSign/btn_day.cs +++ b/Assets/BingoBrain/FGUI/Package/JSign/btn_day.cs @@ -38,7 +38,7 @@ namespace FGUI.JSign loader_reward_ = (GLoader)GetChildAt(4); text_reward = (GTextField)GetChildAt(5); text_resign = (GTextField)GetChildAt(6); - gp_fx = (GGraph)GetChildAt(10); + gp_fx = (GGraph)GetChildAt(8); fx_collect = GetTransitionAt(0); } } diff --git a/Assets/BingoBrain/FGUI/Package/JSign/btn_day2.cs b/Assets/BingoBrain/FGUI/Package/JSign/btn_day2.cs index 44960ef..f1a4b80 100644 --- a/Assets/BingoBrain/FGUI/Package/JSign/btn_day2.cs +++ b/Assets/BingoBrain/FGUI/Package/JSign/btn_day2.cs @@ -11,11 +11,11 @@ namespace FGUI.JSign public Controller cont_collect; public Controller cont_currency; public Controller gift; - public GTextField text_day; public GLoader loader_reward; public GTextField text_reward; public GTextField text_resign; public GGraph gp_fx; + public GTextField text_day; public Transition fx_collect; public const string URL = "ui://9o0kw0z3k0b29"; @@ -32,11 +32,11 @@ namespace FGUI.JSign cont_collect = GetControllerAt(1); cont_currency = GetControllerAt(2); gift = GetControllerAt(3); - text_day = (GTextField)GetChildAt(1); - loader_reward = (GLoader)GetChildAt(2); - text_reward = (GTextField)GetChildAt(3); - text_resign = (GTextField)GetChildAt(4); + loader_reward = (GLoader)GetChildAt(3); + text_reward = (GTextField)GetChildAt(4); + text_resign = (GTextField)GetChildAt(5); gp_fx = (GGraph)GetChildAt(8); + text_day = (GTextField)GetChildAt(9); fx_collect = GetTransitionAt(0); } } diff --git a/Assets/BingoBrain/FGUI/Package/JSign/com_sign.cs b/Assets/BingoBrain/FGUI/Package/JSign/com_sign.cs index d3a2ddd..f749b38 100644 --- a/Assets/BingoBrain/FGUI/Package/JSign/com_sign.cs +++ b/Assets/BingoBrain/FGUI/Package/JSign/com_sign.cs @@ -8,9 +8,9 @@ namespace FGUI.JSign public partial class com_sign : GComponent { public GGraph gp_bg; - public GButton closeButton; public GList list_sign; public GTextField text_time; + public GButton closeButton; public const string URL = "ui://9o0kw0z3ouxd0"; public static com_sign CreateInstance() @@ -23,9 +23,9 @@ namespace FGUI.JSign base.ConstructFromXML(xml); gp_bg = (GGraph)GetChildAt(0); - closeButton = (GButton)GetChildAt(2); - list_sign = (GList)GetChildAt(3); + list_sign = (GList)GetChildAt(4); text_time = (GTextField)GetChildAt(5); + closeButton = (GButton)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JTask/btn_task.cs b/Assets/BingoBrain/FGUI/Package/JTask/btn_task.cs index f63a093..a934ed3 100644 --- a/Assets/BingoBrain/FGUI/Package/JTask/btn_task.cs +++ b/Assets/BingoBrain/FGUI/Package/JTask/btn_task.cs @@ -23,9 +23,9 @@ namespace FGUI.JTask base.ConstructFromXML(xml); cont_button = GetControllerAt(0); - text_num = (GTextField)GetChildAt(1); - text_collect = (GTextField)GetChildAt(2); - text_done = (GTextField)GetChildAt(3); + text_num = (GTextField)GetChildAt(3); + text_collect = (GTextField)GetChildAt(4); + text_done = (GTextField)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JTask/com_Singletask.cs b/Assets/BingoBrain/FGUI/Package/JTask/com_Singletask.cs index bbc145c..dbaa0bf 100644 --- a/Assets/BingoBrain/FGUI/Package/JTask/com_Singletask.cs +++ b/Assets/BingoBrain/FGUI/Package/JTask/com_Singletask.cs @@ -10,12 +10,13 @@ namespace FGUI.JTask public Controller cont_collect; public Controller cont_currency; public Controller gift; + public GProgressBar com_task_pb; public GTextField text_taskname; public GLoader loader_reward; public GLoader loader_reward_; public GTextField text_num; public btn_task btn_task; - public GProgressBar com_task_pb; + public GTextField text_progress; public const string URL = "ui://qmomwx89n5d58"; public static com_Singletask CreateInstance() @@ -30,12 +31,13 @@ namespace FGUI.JTask cont_collect = GetControllerAt(0); cont_currency = GetControllerAt(1); gift = GetControllerAt(2); - text_taskname = (GTextField)GetChildAt(2); - loader_reward = (GLoader)GetChildAt(3); - loader_reward_ = (GLoader)GetChildAt(4); - text_num = (GTextField)GetChildAt(5); - btn_task = (btn_task)GetChildAt(6); - com_task_pb = (GProgressBar)GetChildAt(7); + com_task_pb = (GProgressBar)GetChildAt(0); + text_taskname = (GTextField)GetChildAt(3); + loader_reward = (GLoader)GetChildAt(4); + loader_reward_ = (GLoader)GetChildAt(5); + text_num = (GTextField)GetChildAt(6); + btn_task = (btn_task)GetChildAt(7); + text_progress = (GTextField)GetChildAt(8); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JTask/com_task.cs b/Assets/BingoBrain/FGUI/Package/JTask/com_task.cs index 7d4280d..df680e3 100644 --- a/Assets/BingoBrain/FGUI/Package/JTask/com_task.cs +++ b/Assets/BingoBrain/FGUI/Package/JTask/com_task.cs @@ -22,8 +22,8 @@ namespace FGUI.JTask base.ConstructFromXML(xml); list_task = (GList)GetChildAt(2); - closeButton = (GButton)GetChildAt(3); - text_time = (GTextField)GetChildAt(5); + closeButton = (GButton)GetChildAt(5); + text_time = (GTextField)GetChildAt(8); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JTodo/com_todo.cs b/Assets/BingoBrain/FGUI/Package/JTodo/com_todo.cs index 1419829..ce5a0f9 100644 --- a/Assets/BingoBrain/FGUI/Package/JTodo/com_todo.cs +++ b/Assets/BingoBrain/FGUI/Package/JTodo/com_todo.cs @@ -25,13 +25,13 @@ namespace FGUI.JTodo { base.ConstructFromXML(xml); - btn_0 = (btn_todo)GetChildAt(0); - btn_1 = (btn_todo)GetChildAt(1); - btn_2 = (btn_todo)GetChildAt(2); - settings = (GButton)GetChildAt(3); - btn_coin = (GComponent)GetChildAt(4); - btn_cash = (GComponent)GetChildAt(5); - group_ = (GGroup)GetChildAt(6); + btn_0 = (btn_todo)GetChildAt(3); + btn_1 = (btn_todo)GetChildAt(4); + btn_2 = (btn_todo)GetChildAt(5); + settings = (GButton)GetChildAt(6); + btn_coin = (GComponent)GetChildAt(7); + btn_cash = (GComponent)GetChildAt(8); + group_ = (GGroup)GetChildAt(9); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JWheel/com_wheel.cs b/Assets/BingoBrain/FGUI/Package/JWheel/com_wheel.cs index a6eb7bd..ed651d3 100644 --- a/Assets/BingoBrain/FGUI/Package/JWheel/com_wheel.cs +++ b/Assets/BingoBrain/FGUI/Package/JWheel/com_wheel.cs @@ -13,7 +13,6 @@ namespace FGUI.JWheel public com_spin com_Spinn; public GButton closeButton; public GGraph gp_Fx; - public GImage img_zhen; public Transition fx_zhen; public Transition fx_exit; public Transition fx_enter; @@ -29,12 +28,11 @@ namespace FGUI.JWheel base.ConstructFromXML(xml); cont_state = GetControllerAt(0); - com_wheels = (com_wheels)GetChildAt(2); - btn_spin = (btn_spin)GetChildAt(3); - com_Spinn = (com_spin)GetChildAt(4); - closeButton = (GButton)GetChildAt(5); - gp_Fx = (GGraph)GetChildAt(6); - img_zhen = (GImage)GetChildAt(23); + com_wheels = (com_wheels)GetChildAt(0); + btn_spin = (btn_spin)GetChildAt(2); + com_Spinn = (com_spin)GetChildAt(3); + closeButton = (GButton)GetChildAt(4); + gp_Fx = (GGraph)GetChildAt(5); fx_zhen = GetTransitionAt(0); fx_exit = GetTransitionAt(1); fx_enter = GetTransitionAt(2); diff --git a/Assets/BingoBrain/FGUI/Package/JWheel/com_wheels.cs b/Assets/BingoBrain/FGUI/Package/JWheel/com_wheels.cs index b04504f..ed67f1b 100644 --- a/Assets/BingoBrain/FGUI/Package/JWheel/com_wheels.cs +++ b/Assets/BingoBrain/FGUI/Package/JWheel/com_wheels.cs @@ -29,15 +29,15 @@ namespace FGUI.JWheel base.ConstructFromXML(xml); cont_state = GetControllerAt(0); - com_reward1 = (com_reward)GetChildAt(2); - com_reward2 = (com_reward)GetChildAt(3); - com_reward3 = (com_reward)GetChildAt(4); - com_reward4 = (com_reward)GetChildAt(5); - com_reward5 = (com_reward)GetChildAt(6); - com_reward6 = (com_reward)GetChildAt(7); - com_reward7 = (com_reward)GetChildAt(8); - com_reward8 = (com_reward)GetChildAt(9); - gp_Select = (GGraph)GetChildAt(10); + com_reward1 = (com_reward)GetChildAt(1); + com_reward2 = (com_reward)GetChildAt(2); + com_reward3 = (com_reward)GetChildAt(3); + com_reward4 = (com_reward)GetChildAt(4); + com_reward5 = (com_reward)GetChildAt(5); + com_reward6 = (com_reward)GetChildAt(6); + com_reward7 = (com_reward)GetChildAt(7); + com_reward8 = (com_reward)GetChildAt(8); + gp_Select = (GGraph)GetChildAt(9); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot.meta deleted file mode 100644 index 305009c..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0a46d77153aa44e358cb9eaf38c18fcb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/SaveingPotBinder.cs b/Assets/BingoBrain/FGUI/Package/SaveingPot/SaveingPotBinder.cs deleted file mode 100644 index 0a10201..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/SaveingPotBinder.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.SaveingPot -{ - public class SaveingPotBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_firstname.URL, typeof(com_firstname)); - UIObjectFactory.SetPackageItemExtension(com_enter.URL, typeof(com_enter)); - UIObjectFactory.SetPackageItemExtension(com_task.URL, typeof(com_task)); - UIObjectFactory.SetPackageItemExtension(btn_pay.URL, typeof(btn_pay)); - UIObjectFactory.SetPackageItemExtension(com_info.URL, typeof(com_info)); - UIObjectFactory.SetPackageItemExtension(com_cord.URL, typeof(com_cord)); - UIObjectFactory.SetPackageItemExtension(com_rank.URL, typeof(com_rank)); - UIObjectFactory.SetPackageItemExtension(com_newRecord.URL, typeof(com_newRecord)); - UIObjectFactory.SetPackageItemExtension(com_saveingpot.URL, typeof(com_saveingpot)); - UIObjectFactory.SetPackageItemExtension(btn_top.URL, typeof(btn_top)); - UIObjectFactory.SetPackageItemExtension(com_broadcast.URL, typeof(com_broadcast)); - UIObjectFactory.SetPackageItemExtension(com_progress_item.URL, typeof(com_progress_item)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/SaveingPotBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/SaveingPotBinder.cs.meta deleted file mode 100644 index 1b9482e..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/SaveingPotBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8e9d3a85f69234c849eb7c2105adeaee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_cord.cs b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_cord.cs deleted file mode 100644 index d1e7f94..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_cord.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.SaveingPot -{ - public partial class com_cord : GComponent - { - public GTextField text_amt; - public GTextField text_payer; - public GTextField text_name; - public GLoader loader_logo; - public GTextField email_text; - public GTextField time_text; - public GTextField number_text; - public GTextField status_text_0; - public GTextField status_text_1; - public const string URL = "ui://sddomhj3meh8c"; - - public static com_cord CreateInstance() - { - return (com_cord)UIPackage.CreateObject("SaveingPot", "com_cord"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_amt = (GTextField)GetChildAt(3); - text_payer = (GTextField)GetChildAt(4); - text_name = (GTextField)GetChildAt(5); - loader_logo = (GLoader)GetChildAt(6); - email_text = (GTextField)GetChildAt(10); - time_text = (GTextField)GetChildAt(11); - number_text = (GTextField)GetChildAt(12); - status_text_0 = (GTextField)GetChildAt(13); - status_text_1 = (GTextField)GetChildAt(14); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_cord.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_cord.cs.meta deleted file mode 100644 index 63c0589..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_cord.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a1e8a93b33526462da46fd85114b21c2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_enter.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_enter.cs.meta deleted file mode 100644 index d4eba34..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_enter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 24bf3069194f7419abd080a97f370205 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_firstname.cs b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_firstname.cs deleted file mode 100644 index 971fa31..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_firstname.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.SaveingPot -{ - public partial class com_firstname : GComponent - { - public Controller type; - public GTextInput enter_fname; - public GTextInput enter_fname_1; - public const string URL = "ui://sddomhj3deiw1j"; - - public static com_firstname CreateInstance() - { - return (com_firstname)UIPackage.CreateObject("SaveingPot", "com_firstname"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - type = GetControllerAt(0); - enter_fname = (GTextInput)GetChildAt(1); - enter_fname_1 = (GTextInput)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_firstname.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_firstname.cs.meta deleted file mode 100644 index 85b5f84..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_firstname.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 12d96ddeb4d144660832adf7c41b3be3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_info.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_info.cs.meta deleted file mode 100644 index 9448066..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_info.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7eb07f633188d47269d579042e08fdb5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_newRecord.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_newRecord.cs.meta deleted file mode 100644 index fb958cf..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_newRecord.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 103ccb91f5a8f42ffb89c930f9dc45fe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_progress_item.cs b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_progress_item.cs deleted file mode 100644 index 3336e06..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_progress_item.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.SaveingPot -{ - public partial class com_progress_item : GComponent - { - public GTextField text_rank1; - public const string URL = "ui://sddomhj3upx71w"; - - public static com_progress_item CreateInstance() - { - return (com_progress_item)UIPackage.CreateObject("SaveingPot", "com_progress_item"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_rank1 = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_progress_item.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_progress_item.cs.meta deleted file mode 100644 index f481e04..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_progress_item.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1ca9b873eeee64e679480f80094976bf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_rank.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_rank.cs.meta deleted file mode 100644 index 928c76e..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_rank.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c32349692e65640e2b8564cb5dbe2860 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_saveingpot.cs b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_saveingpot.cs deleted file mode 100644 index 7fe259f..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_saveingpot.cs +++ /dev/null @@ -1,97 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.SaveingPot -{ - public partial class com_saveingpot : GComponent - { - public Controller type; - public Controller cont_confirm; - public GGraph ani_potparent; - public GTextField text_remaintime; - public GButton btn_close; - public GProgressBar progress_cash; - public GTextField text_cashprogress; - public GTextField text_nowcash; - public GTextField text_ad; - public GTextField text_pay; - public GButton btn_cash; - public GTextField text_lose; - public com_broadcast broad; - public com_enter com_info; - public com_firstname com_fname; - public com_firstname com_lname; - public GTextField text_title; - public GTextField text_smaill_title; - public GButton btn_confirm; - public GTextField text_smaill_title_2; - public com_info com_pay; - public GTextField text_wallet; - public GTextField text_cash; - public GTextField text_account; - public GProgressBar pb_condi2; - public GTextField text_condi2; - public com_task com_task; - public com_newRecord com_newRecord; - public btn_pay btn_watch; - public GTextField text_query; - public GTextField text_payhint; - public btn_top btn_level0; - public btn_top btn_level1; - public btn_top btn_level2; - public GGroup group_; - public GButton btn_close1; - public GTextField txt_title; - public const string URL = "ui://sddomhj3upx71p"; - - public static com_saveingpot CreateInstance() - { - return (com_saveingpot)UIPackage.CreateObject("SaveingPot", "com_saveingpot"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - type = GetControllerAt(0); - cont_confirm = GetControllerAt(1); - ani_potparent = (GGraph)GetChildAt(0); - text_remaintime = (GTextField)GetChildAt(4); - btn_close = (GButton)GetChildAt(5); - progress_cash = (GProgressBar)GetChildAt(6); - text_cashprogress = (GTextField)GetChildAt(7); - text_nowcash = (GTextField)GetChildAt(8); - text_ad = (GTextField)GetChildAt(10); - text_pay = (GTextField)GetChildAt(11); - btn_cash = (GButton)GetChildAt(12); - text_lose = (GTextField)GetChildAt(13); - broad = (com_broadcast)GetChildAt(14); - com_info = (com_enter)GetChildAt(19); - com_fname = (com_firstname)GetChildAt(20); - com_lname = (com_firstname)GetChildAt(21); - text_title = (GTextField)GetChildAt(22); - text_smaill_title = (GTextField)GetChildAt(23); - btn_confirm = (GButton)GetChildAt(24); - text_smaill_title_2 = (GTextField)GetChildAt(26); - com_pay = (com_info)GetChildAt(27); - text_wallet = (GTextField)GetChildAt(32); - text_cash = (GTextField)GetChildAt(33); - text_account = (GTextField)GetChildAt(34); - pb_condi2 = (GProgressBar)GetChildAt(38); - text_condi2 = (GTextField)GetChildAt(39); - com_task = (com_task)GetChildAt(40); - com_newRecord = (com_newRecord)GetChildAt(41); - btn_watch = (btn_pay)GetChildAt(42); - text_query = (GTextField)GetChildAt(45); - text_payhint = (GTextField)GetChildAt(47); - btn_level0 = (btn_top)GetChildAt(48); - btn_level1 = (btn_top)GetChildAt(49); - btn_level2 = (btn_top)GetChildAt(50); - group_ = (GGroup)GetChildAt(51); - btn_close1 = (GButton)GetChildAt(52); - txt_title = (GTextField)GetChildAt(53); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_task.cs.meta b/Assets/BingoBrain/FGUI/Package/SaveingPot/com_task.cs.meta deleted file mode 100644 index 3c86218..0000000 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_task.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e315af7c5d3f3492181707f3bd0ed389 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu.meta b/Assets/BingoBrain/FGUI/Package/bkg_jilu.meta index 98e2ee3..a6947e3 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu.meta +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63cb8c6851b6b45d2bc61ce8dc53d81a +guid: 45d5ef6b889d0d645ae3d19e7d0a8421 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/bkg_jiluBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_jilu/bkg_jiluBinder.cs.meta index 2b4e4ab..0f7aab0 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/bkg_jiluBinder.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/bkg_jiluBinder.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee63a94770f994a9daa5be66084690a4 +guid: edcbc4a1a1fe2704c99eb5e681c28085 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs index 2b8eaf1..1ae8ec1 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs @@ -7,10 +7,11 @@ namespace FGUI.bkg_jilu { public partial class com_jilu : GComponent { - public com_panel panel; - public GButton btn_close; public GTextField txt_title; - public const string URL = "ui://u5bqcwhxf6p00"; + public GButton btn_close; + public GList list; + public com_panel panel; + public const string URL = "ui://jsjnplk3f6p00"; public static com_jilu CreateInstance() { @@ -21,9 +22,10 @@ namespace FGUI.bkg_jilu { base.ConstructFromXML(xml); - panel = (com_panel)GetChildAt(2); + txt_title = (GTextField)GetChildAt(2); btn_close = (GButton)GetChildAt(3); - txt_title = (GTextField)GetChildAt(4); + list = (GList)GetChildAt(4); + panel = (com_panel)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs.meta index 5f1b82b..339a1f2 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2b1edb84a57614aa8bf1bb2c7a7742d8 +guid: e4ef7df22fd683c488788a543a42d3d1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs index 36996f8..8f076fb 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs @@ -12,11 +12,11 @@ namespace FGUI.bkg_jilu public com_record_item item2; public com_record_item item3; public com_record_item item4; - public com_record_item item5; public com_record_item item6; + public com_record_item item5; public com_record_item item7; public com_record_item item8; - public const string URL = "ui://u5bqcwhxf6p05"; + public const string URL = "ui://jsjnplk3f6p05"; public static com_panel CreateInstance() { @@ -32,8 +32,8 @@ namespace FGUI.bkg_jilu item2 = (com_record_item)GetChildAt(2); item3 = (com_record_item)GetChildAt(3); item4 = (com_record_item)GetChildAt(4); - item5 = (com_record_item)GetChildAt(5); - item6 = (com_record_item)GetChildAt(6); + item6 = (com_record_item)GetChildAt(5); + item5 = (com_record_item)GetChildAt(6); item7 = (com_record_item)GetChildAt(7); item8 = (com_record_item)GetChildAt(8); } diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs.meta index 27db35c..a367243 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 67339091009e242fbadeb71dfa2c75a0 +guid: 7cc1c618f75f334439c6486c555d5444 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs index 4b59bf9..fbee06a 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs @@ -8,9 +8,10 @@ namespace FGUI.bkg_jilu public partial class com_record_item : GComponent { public GTextField name; - public GTextField num; + public GTextField lab_claim; public GTextField time; - public const string URL = "ui://u5bqcwhxf6p04"; + public GRichTextField num; + public const string URL = "ui://jsjnplk3f6p04"; public static com_record_item CreateInstance() { @@ -22,8 +23,9 @@ namespace FGUI.bkg_jilu base.ConstructFromXML(xml); name = (GTextField)GetChildAt(2); - num = (GTextField)GetChildAt(4); - time = (GTextField)GetChildAt(5); + lab_claim = (GTextField)GetChildAt(3); + time = (GTextField)GetChildAt(4); + num = (GRichTextField)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs.meta index 3705c5b..2f648f5 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a73c524049bdd47b7810a67094b32cde +guid: b1fc17cbbda975449b01d45629860526 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new.meta b/Assets/BingoBrain/FGUI/Package/bkg_reward_new.meta deleted file mode 100644 index 397dd58..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a8c72213b5c82413d88558470eaf7ac9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/bkg_reward_newBinder.cs b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/bkg_reward_newBinder.cs deleted file mode 100644 index faaded3..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/bkg_reward_newBinder.cs +++ /dev/null @@ -1,18 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.bkg_reward_new -{ - public class bkg_reward_newBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_reward_mul.URL, typeof(com_reward_mul)); - UIObjectFactory.SetPackageItemExtension(com_reward_coin.URL, typeof(com_reward_coin)); - UIObjectFactory.SetPackageItemExtension(com_reward_undo.URL, typeof(com_reward_undo)); - UIObjectFactory.SetPackageItemExtension(com_reward_moveout.URL, typeof(com_reward_moveout)); - UIObjectFactory.SetPackageItemExtension(com_reward_refresh.URL, typeof(com_reward_refresh)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/bkg_reward_newBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/bkg_reward_newBinder.cs.meta deleted file mode 100644 index 1d165f6..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/bkg_reward_newBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f5b2df024f378435aaf7ffc51e4f44db -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_coin.cs b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_coin.cs deleted file mode 100644 index ccc7e86..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_coin.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.bkg_reward_new -{ - public partial class com_reward_coin : GComponent - { - public GTextField lab_num; - public const string URL = "ui://kajoyl9oq6oz5"; - - public static com_reward_coin CreateInstance() - { - return (com_reward_coin)UIPackage.CreateObject("bkg_reward_new", "com_reward_coin"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - lab_num = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_coin.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_coin.cs.meta deleted file mode 100644 index b892b07..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_coin.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2fd79f4fdc9be4f14bc97ba99d70696b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_moveout.cs b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_moveout.cs deleted file mode 100644 index a0c4438..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_moveout.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.bkg_reward_new -{ - public partial class com_reward_moveout : GComponent - { - public Controller state; - public GTextField lab_num; - public const string URL = "ui://kajoyl9oq6oz9"; - - public static com_reward_moveout CreateInstance() - { - return (com_reward_moveout)UIPackage.CreateObject("bkg_reward_new", "com_reward_moveout"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - lab_num = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_moveout.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_moveout.cs.meta deleted file mode 100644 index 621d8b2..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_moveout.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b2cbb588113cd48c2a6b6f10fff13da4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_mul.cs b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_mul.cs deleted file mode 100644 index dfe6f35..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_mul.cs +++ /dev/null @@ -1,51 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.bkg_reward_new -{ - public partial class com_reward_mul : GComponent - { - public GGraph ani_node; - public com_reward_coin node_coin; - public com_reward_undo node_undo; - public com_reward_moveout node_move_out; - public com_reward_refresh node_refresh; - public GGroup node_group; - public GGraph node_end; - public com_reward_undo add_undo; - public com_reward_moveout add_move_out; - public com_reward_refresh add_refresh; - public GGroup ani_group; - public GButton btn_mul; - public GButton btn_claim; - public Transition t0; - public const string URL = "ui://kajoyl9oq6oz0"; - - public static com_reward_mul CreateInstance() - { - return (com_reward_mul)UIPackage.CreateObject("bkg_reward_new", "com_reward_mul"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - ani_node = (GGraph)GetChildAt(0); - node_coin = (com_reward_coin)GetChildAt(3); - node_undo = (com_reward_undo)GetChildAt(4); - node_move_out = (com_reward_moveout)GetChildAt(5); - node_refresh = (com_reward_refresh)GetChildAt(6); - node_group = (GGroup)GetChildAt(7); - node_end = (GGraph)GetChildAt(9); - add_undo = (com_reward_undo)GetChildAt(10); - add_move_out = (com_reward_moveout)GetChildAt(11); - add_refresh = (com_reward_refresh)GetChildAt(12); - ani_group = (GGroup)GetChildAt(13); - btn_mul = (GButton)GetChildAt(14); - btn_claim = (GButton)GetChildAt(15); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_mul.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_mul.cs.meta deleted file mode 100644 index f8c5617..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_mul.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a1a11759e3404488af7b55f92c43d79 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_refresh.cs b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_refresh.cs deleted file mode 100644 index 0362f76..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_refresh.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.bkg_reward_new -{ - public partial class com_reward_refresh : GComponent - { - public Controller state; - public GTextField lab_num; - public const string URL = "ui://kajoyl9oq6oza"; - - public static com_reward_refresh CreateInstance() - { - return (com_reward_refresh)UIPackage.CreateObject("bkg_reward_new", "com_reward_refresh"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - lab_num = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_refresh.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_refresh.cs.meta deleted file mode 100644 index 4946312..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_refresh.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0a9530c2727bc4dc89c54cd8045627d5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_undo.cs b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_undo.cs deleted file mode 100644 index 1d55355..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_undo.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.bkg_reward_new -{ - public partial class com_reward_undo : GComponent - { - public Controller state; - public GTextField lab_num; - public const string URL = "ui://kajoyl9oq6oz8"; - - public static com_reward_undo CreateInstance() - { - return (com_reward_undo)UIPackage.CreateObject("bkg_reward_new", "com_reward_undo"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - lab_num = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_undo.cs.meta b/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_undo.cs.meta deleted file mode 100644 index 47d6aa4..0000000 --- a/Assets/BingoBrain/FGUI/Package/bkg_reward_new/com_reward_undo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6e0855b59030f45faa918f9a67e29ccb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/failpack.meta b/Assets/BingoBrain/FGUI/Package/failpack.meta deleted file mode 100644 index 542108b..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a2cf8185a87db4b09ad6fe6f1c96a359 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/failpack/btn_get_1.cs.meta b/Assets/BingoBrain/FGUI/Package/failpack/btn_get_1.cs.meta deleted file mode 100644 index 59be525..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack/btn_get_1.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 074048194c7fb4553919b156b0d91edf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/failpack/btn_green_1.cs b/Assets/BingoBrain/FGUI/Package/failpack/btn_green_1.cs deleted file mode 100644 index 570e2a9..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack/btn_green_1.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.failpack -{ - public partial class btn_green_1 : GButton - { - public Controller state; - public Controller cooldown; - public GImage img_saveingpot; - public const string URL = "ui://fr2jeuh5hrbwl"; - - public static btn_green_1 CreateInstance() - { - return (btn_green_1)UIPackage.CreateObject("failpack", "btn_green_1"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - cooldown = GetControllerAt(1); - img_saveingpot = (GImage)GetChildAt(4); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/failpack/btn_green_1.cs.meta b/Assets/BingoBrain/FGUI/Package/failpack/btn_green_1.cs.meta deleted file mode 100644 index aa6f911..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack/btn_green_1.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8bd7b952cb0744b06a3e59772507de46 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/failpack/com_resurgence.cs b/Assets/BingoBrain/FGUI/Package/failpack/com_resurgence.cs deleted file mode 100644 index cfa6eef..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack/com_resurgence.cs +++ /dev/null @@ -1,53 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.failpack -{ - public partial class com_resurgence : GComponent - { - public Controller pay_type; - public GImage bg; - public GProgressBar progress_1; - public GTextField text_have; - public GTextField need_text; - public GTextField text_remain; - public GTextField text_progress; - public GTextField text_refreshnum; - public GTextField text_outnum; - public GTextField text_backnum; - public GTextField text_goldnum; - public GTextField end_point; - public GButton btn_back; - public GButton btn_buy; - public GButton btn_max_pay; - public const string URL = "ui://fr2jeuh5upx737"; - - public static com_resurgence CreateInstance() - { - return (com_resurgence)UIPackage.CreateObject("failpack", "com_resurgence"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pay_type = GetControllerAt(0); - bg = (GImage)GetChildAt(2); - progress_1 = (GProgressBar)GetChildAt(3); - text_have = (GTextField)GetChildAt(4); - need_text = (GTextField)GetChildAt(5); - text_remain = (GTextField)GetChildAt(7); - text_progress = (GTextField)GetChildAt(12); - text_refreshnum = (GTextField)GetChildAt(13); - text_outnum = (GTextField)GetChildAt(14); - text_backnum = (GTextField)GetChildAt(15); - text_goldnum = (GTextField)GetChildAt(17); - end_point = (GTextField)GetChildAt(18); - btn_back = (GButton)GetChildAt(19); - btn_buy = (GButton)GetChildAt(20); - btn_max_pay = (GButton)GetChildAt(21); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/failpack/com_resurgence.cs.meta b/Assets/BingoBrain/FGUI/Package/failpack/com_resurgence.cs.meta deleted file mode 100644 index 6539df9..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack/com_resurgence.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9600eb9ba73184116b5c9ce8273f69db -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/failpack/failpackBinder.cs b/Assets/BingoBrain/FGUI/Package/failpack/failpackBinder.cs deleted file mode 100644 index 3a7a255..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack/failpackBinder.cs +++ /dev/null @@ -1,16 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.failpack -{ - public class failpackBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(btn_get_1.URL, typeof(btn_get_1)); - UIObjectFactory.SetPackageItemExtension(btn_green_1.URL, typeof(btn_green_1)); - UIObjectFactory.SetPackageItemExtension(com_resurgence.URL, typeof(com_resurgence)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/failpack/failpackBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/failpack/failpackBinder.cs.meta deleted file mode 100644 index 02d303b..0000000 --- a/Assets/BingoBrain/FGUI/Package/failpack/failpackBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fdb50f50c17894b6697e9a8fbb30e483 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift.meta b/Assets/BingoBrain/FGUI/Package/threeDaysGift.meta deleted file mode 100644 index 55f6617..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1aed2cc20052d444fb9cd45095ab6bde -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_item.cs b/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_item.cs deleted file mode 100644 index 5ae7bf0..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_item.cs +++ /dev/null @@ -1,39 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.threeDaysGift -{ - public partial class com_item : GComponent - { - public Controller state; - public Controller day; - public item_reward item1; - public item_reward item2; - public item_reward item3; - public item_reward item4; - public GImage img_select; - public GImage img_select2; - public const string URL = "ui://kw7ckyk6ke931"; - - public static com_item CreateInstance() - { - return (com_item)UIPackage.CreateObject("threeDaysGift", "com_item"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - day = GetControllerAt(1); - item1 = (item_reward)GetChildAt(3); - item2 = (item_reward)GetChildAt(4); - item3 = (item_reward)GetChildAt(5); - item4 = (item_reward)GetChildAt(6); - img_select = (GImage)GetChildAt(7); - img_select2 = (GImage)GetChildAt(8); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_item.cs.meta b/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_item.cs.meta deleted file mode 100644 index 7d1683b..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_item.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d76bff521395a4f01820610ec59a5a35 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_three_days.cs b/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_three_days.cs deleted file mode 100644 index 7161418..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_three_days.cs +++ /dev/null @@ -1,51 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.threeDaysGift -{ - public partial class com_three_days : GComponent - { - public Controller pay_type; - public GGraph ani_bg; - public GGraph node_end; - public com_item day1; - public com_item day2; - public com_item day3; - public GTextField text_have; - public GTextField need_text; - public GGraph ani_title; - public GButton btn_get; - public GButton btn_close; - public GButton btn_buypack; - public GButton btn_max_pack; - public GGroup groups; - public const string URL = "ui://kw7ckyk6ke930"; - - public static com_three_days CreateInstance() - { - return (com_three_days)UIPackage.CreateObject("threeDaysGift", "com_three_days"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pay_type = GetControllerAt(0); - ani_bg = (GGraph)GetChildAt(0); - node_end = (GGraph)GetChildAt(1); - day1 = (com_item)GetChildAt(3); - day2 = (com_item)GetChildAt(4); - day3 = (com_item)GetChildAt(5); - text_have = (GTextField)GetChildAt(6); - need_text = (GTextField)GetChildAt(7); - ani_title = (GGraph)GetChildAt(9); - btn_get = (GButton)GetChildAt(10); - btn_close = (GButton)GetChildAt(11); - btn_buypack = (GButton)GetChildAt(12); - btn_max_pack = (GButton)GetChildAt(13); - groups = (GGroup)GetChildAt(14); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_three_days.cs.meta b/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_three_days.cs.meta deleted file mode 100644 index 6385085..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/com_three_days.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5400f69d03fb04a15a8cdce405d9ac7a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/item_reward.cs b/Assets/BingoBrain/FGUI/Package/threeDaysGift/item_reward.cs deleted file mode 100644 index 9b0d289..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/item_reward.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.threeDaysGift -{ - public partial class item_reward : GComponent - { - public GLoader loader_; - public GTextField lab_num; - public const string URL = "ui://kw7ckyk6ke932"; - - public static item_reward CreateInstance() - { - return (item_reward)UIPackage.CreateObject("threeDaysGift", "item_reward"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - loader_ = (GLoader)GetChildAt(0); - lab_num = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/item_reward.cs.meta b/Assets/BingoBrain/FGUI/Package/threeDaysGift/item_reward.cs.meta deleted file mode 100644 index da2115b..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/item_reward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a82267b800fa447b1a6023e2d362f1de -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/threeDaysGiftBinder.cs b/Assets/BingoBrain/FGUI/Package/threeDaysGift/threeDaysGiftBinder.cs deleted file mode 100644 index 530caa4..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/threeDaysGiftBinder.cs +++ /dev/null @@ -1,16 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; - -namespace FGUI.threeDaysGift -{ - public class threeDaysGiftBinder - { - public static void BindAll() - { - UIObjectFactory.SetPackageItemExtension(com_three_days.URL, typeof(com_three_days)); - UIObjectFactory.SetPackageItemExtension(com_item.URL, typeof(com_item)); - UIObjectFactory.SetPackageItemExtension(item_reward.URL, typeof(item_reward)); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/threeDaysGift/threeDaysGiftBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/threeDaysGift/threeDaysGiftBinder.cs.meta deleted file mode 100644 index 3f96970..0000000 --- a/Assets/BingoBrain/FGUI/Package/threeDaysGift/threeDaysGiftBinder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 74bb0b09a8f9c4102b2ff060ded08c6e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G001_rewardPop.meta b/Assets/BingoBrain/FGUI/Package/tixian.meta similarity index 77% rename from Assets/BingoBrain/FGUI/Package/G001_rewardPop.meta rename to Assets/BingoBrain/FGUI/Package/tixian.meta index a465548..12d9285 100644 --- a/Assets/BingoBrain/FGUI/Package/G001_rewardPop.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e7047681a4b314cb392a2e355a0ef441 +guid: 139df1893c054bc48917858b1aab0398 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_code.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_code.cs new file mode 100644 index 0000000..f46dc03 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_code.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.tixian +{ + public partial class btn_code : GButton + { + public Controller type; + public const string URL = "ui://jwedp6jytivmeg"; + + public static btn_code CreateInstance() + { + return (btn_code)UIPackage.CreateObject("tixian", "btn_code"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + type = GetControllerAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_code.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/btn_code.cs.meta new file mode 100644 index 0000000..172fa7d --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_code.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2269892e45aaeed4596d0078aeef3531 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall_click.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_confirm.cs similarity index 54% rename from Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall_click.cs rename to Assets/BingoBrain/FGUI/Package/tixian/btn_confirm.cs index 48ff498..7e4d2a9 100644 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal/btn_hall_click.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_confirm.cs @@ -3,16 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G003_play_animal +namespace FGUI.tixian { - public partial class btn_hall_click : GButton + public partial class btn_confirm : GButton { public Controller state; - public const string URL = "ui://bmphtricnp615o"; + public const string URL = "ui://jwedp6jylsax1y"; - public static btn_hall_click CreateInstance() + public static btn_confirm CreateInstance() { - return (btn_hall_click)UIPackage.CreateObject("G003_play_animal", "btn_hall_click"); + return (btn_confirm)UIPackage.CreateObject("tixian", "btn_confirm"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_confirm.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/btn_confirm.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/btn_confirm.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/btn_confirm.cs.meta index ffee8f0..389a4ad 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/btn_confirm.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_confirm.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94377add384484d6fbe529400bd411a1 +guid: 39e0e3b0a981574448950f1a3e6d7bc0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_edit.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_edit.cs new file mode 100644 index 0000000..60a3cbe --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_edit.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.tixian +{ + public partial class btn_edit : GButton + { + public Controller state; + public const string URL = "ui://jwedp6jydeiw1s"; + + public static btn_edit CreateInstance() + { + return (btn_edit)UIPackage.CreateObject("tixian", "btn_edit"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_edit.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/btn_edit.cs.meta new file mode 100644 index 0000000..9cdd5b7 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_edit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 62bba6b1addd06a4da235e383a70bd86 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_get.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_get.cs new file mode 100644 index 0000000..14cac55 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_get.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.tixian +{ + public partial class btn_get : GButton + { + public Controller state; + public GImage img_saveingpot; + public const string URL = "ui://jwedp6jycphly"; + + public static btn_get CreateInstance() + { + return (btn_get)UIPackage.CreateObject("tixian", "btn_get"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + img_saveingpot = (GImage)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_get.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/btn_get.cs.meta new file mode 100644 index 0000000..9e5a68f --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_get.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 222c65cc88a602045890fcedd4e7c6bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_kicket.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_kicket.cs new file mode 100644 index 0000000..f6caaa7 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_kicket.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.tixian +{ + public partial class btn_kicket : GButton + { + public Controller state; + public const string URL = "ui://jwedp6jytivmef"; + + public static btn_kicket CreateInstance() + { + return (btn_kicket)UIPackage.CreateObject("tixian", "btn_kicket"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/btn_kicket.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/btn_kicket.cs.meta new file mode 100644 index 0000000..d808ccf --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_kicket.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 234368661df6dc84184af949d2d50f77 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_pay.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_pay.cs similarity index 51% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/btn_pay.cs rename to Assets/BingoBrain/FGUI/Package/tixian/btn_pay.cs index 27a6f08..aeb8b0c 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_pay.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_pay.cs @@ -3,17 +3,20 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.tixian { public partial class btn_pay : GButton { public Controller show_cd; public GTextField text_cd; - public const string URL = "ui://sddomhj3heqb2k"; + public GTextField watch; + public GImage ad_icon; + public GImage img_saveingpot; + public const string URL = "ui://jwedp6jyheqb2k"; public static btn_pay CreateInstance() { - return (btn_pay)UIPackage.CreateObject("SaveingPot", "btn_pay"); + return (btn_pay)UIPackage.CreateObject("tixian", "btn_pay"); } public override void ConstructFromXML(XML xml) @@ -21,7 +24,10 @@ namespace FGUI.SaveingPot base.ConstructFromXML(xml); show_cd = GetControllerAt(0); - text_cd = (GTextField)GetChildAt(2); + text_cd = (GTextField)GetChildAt(1); + watch = (GTextField)GetChildAt(2); + ad_icon = (GImage)GetChildAt(3); + img_saveingpot = (GImage)GetChildAt(4); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_pay.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/btn_pay.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/btn_pay.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/btn_pay.cs.meta index 57d5172..fd803a2 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_pay.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_pay.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7216734b690042d39b29c2397fe5464 +guid: 46e6e25c019faf943bceca3ef1e93bb7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_top.cs b/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs similarity index 63% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/btn_top.cs rename to Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs index 76187ca..e9fd06c 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_top.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs @@ -3,20 +3,20 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.tixian { public partial class btn_top : GButton { public Controller index; public Controller btn_state; public GTextField text_type; - public GTextField text_cash; + public GTextField text_ch; public GImage img_outline; - public const string URL = "ui://sddomhj3upx71r"; + public const string URL = "ui://jwedp6jyupx71r"; public static btn_top CreateInstance() { - return (btn_top)UIPackage.CreateObject("SaveingPot", "btn_top"); + return (btn_top)UIPackage.CreateObject("tixian", "btn_top"); } public override void ConstructFromXML(XML xml) @@ -25,9 +25,9 @@ namespace FGUI.SaveingPot index = GetControllerAt(0); btn_state = GetControllerAt(1); - text_type = (GTextField)GetChildAt(4); - text_cash = (GTextField)GetChildAt(5); - img_outline = (GImage)GetChildAt(6); + text_type = (GTextField)GetChildAt(5); + text_ch = (GTextField)GetChildAt(6); + img_outline = (GImage)GetChildAt(7); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_top.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/btn_top.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs.meta index 6be3fb4..59626f5 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/btn_top.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/btn_top.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6445c3aa488be4909a651e55a35b861d +guid: f8d2d4961f95bdd46836b0b8a955962f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/cash_levelcom.cs b/Assets/BingoBrain/FGUI/Package/tixian/cash_levelcom.cs similarity index 78% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/cash_levelcom.cs rename to Assets/BingoBrain/FGUI/Package/tixian/cash_levelcom.cs index a02e961..a6c4c83 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/cash_levelcom.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/cash_levelcom.cs @@ -3,18 +3,18 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { public partial class cash_levelcom : GComponent { public level_btn btn_0; public level_btn btn_1; public level_btn btn_2; - public const string URL = "ui://md8tkwlzfzz842"; + public const string URL = "ui://jwedp6jyfzz842"; public static cash_levelcom CreateInstance() { - return (cash_levelcom)UIPackage.CreateObject("G007_makeup", "cash_levelcom"); + return (cash_levelcom)UIPackage.CreateObject("tixian", "cash_levelcom"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/cash_levelcom.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/cash_levelcom.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/cash_levelcom.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/cash_levelcom.cs.meta index 6afc21b..df2f33c 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/cash_levelcom.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/cash_levelcom.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e782acaefbbf44c7b990c5d9e83bde6 +guid: 3448d0edf7276e547a4083c16250f56b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs new file mode 100644 index 0000000..eaada4a --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs @@ -0,0 +1,33 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.tixian +{ + public partial class com_broadcast : GComponent + { + public GRichTextField rich_text0; + public GRichTextField rich_text1; + public GRichTextField rich_text2; + public GRichTextField rich_text3; + public Transition t1; + public const string URL = "ui://jwedp6jygismek"; + + public static com_broadcast CreateInstance() + { + return (com_broadcast)UIPackage.CreateObject("tixian", "com_broadcast"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + rich_text0 = (GRichTextField)GetChildAt(1); + rich_text1 = (GRichTextField)GetChildAt(3); + rich_text2 = (GRichTextField)GetChildAt(5); + rich_text3 = (GRichTextField)GetChildAt(7); + t1 = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_broadcast.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_broadcast.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs.meta index c7bc7b8..2f2a676 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_broadcast.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_broadcast.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bdcf709697ee1400fbc3f2b5f088a477 +guid: 1f2041e1b968cc64184b30727742a621 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs new file mode 100644 index 0000000..1b5a8f6 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs @@ -0,0 +1,133 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.tixian +{ + public partial class com_confirm : GComponent + { + public Controller cont_state; + public Controller cont_confirm; + public Controller show_pay; + public Controller level_state; + public com_enter com_info; + public com_firstname com_fname; + public com_lastname com_lname; + public GTextField text_payhint; + public GTextField text_title; + public GTextField text_smaill_title; + public GTextField nrules; + public com_task com_task; + public GTextField text_query; + public GTextField nrules_2; + public GTextField text_payhint_2; + public GTextField text_title_2; + public GProgressBar pb_condi1; + public com_newRecord com_newRecord; + public com_info com_pay; + public GTextField text_smaill_title_2; + public GTextField text_chneedlv; + public GTextField text_ch_title; + public GTextField text_chdate; + public GTextField text_chdate3; + public GTextField text_number0; + public GTextField text_number1; + public GTextField text_number2; + public btn_pay btn_watch; + public btn_get btn_tab; + public btn_get btn_earn; + public btn_get btn_chout; + public btn_get btn_confirm; + public btn_get btn_check_level; + public GTextField text_nowch; + public GTextField text_cashneedlv; + public GTextField text_leveltime; + public GTextField lab_lv_need_des; + public cash_levelcom com_chlevel; + public GGroup group_; + public GTextField lab_mn; + public GList list_kicket; + public GTextField lab_mn2; + public GTextField lab_ticket; + public GTextField lab_code; + public btn_code btn_copy; + public btn_code btn_contact_us; + public GButton btn_back; + public GTextField lab_ads; + public btn_get btn_inline_ok; + public GRichTextField text_condi1; + public GRichTextField text_ch_number; + public GButton btn_close; + public GButton btn_watchad; + public GButton btn_task_watch; + public Transition t0; + public const string URL = "ui://jwedp6jyut66d"; + + public static com_confirm CreateInstance() + { + return (com_confirm)UIPackage.CreateObject("tixian", "com_confirm"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + cont_state = GetControllerAt(0); + cont_confirm = GetControllerAt(1); + show_pay = GetControllerAt(2); + level_state = GetControllerAt(3); + com_info = (com_enter)GetChildAt(6); + com_fname = (com_firstname)GetChildAt(7); + com_lname = (com_lastname)GetChildAt(8); + text_payhint = (GTextField)GetChildAt(9); + text_title = (GTextField)GetChildAt(10); + text_smaill_title = (GTextField)GetChildAt(11); + nrules = (GTextField)GetChildAt(12); + com_task = (com_task)GetChildAt(13); + text_query = (GTextField)GetChildAt(14); + nrules_2 = (GTextField)GetChildAt(16); + text_payhint_2 = (GTextField)GetChildAt(17); + text_title_2 = (GTextField)GetChildAt(18); + pb_condi1 = (GProgressBar)GetChildAt(19); + com_newRecord = (com_newRecord)GetChildAt(20); + com_pay = (com_info)GetChildAt(21); + text_smaill_title_2 = (GTextField)GetChildAt(23); + text_chneedlv = (GTextField)GetChildAt(24); + text_ch_title = (GTextField)GetChildAt(26); + text_chdate = (GTextField)GetChildAt(27); + text_chdate3 = (GTextField)GetChildAt(36); + text_number0 = (GTextField)GetChildAt(37); + text_number1 = (GTextField)GetChildAt(38); + text_number2 = (GTextField)GetChildAt(39); + btn_watch = (btn_pay)GetChildAt(40); + btn_tab = (btn_get)GetChildAt(41); + btn_earn = (btn_get)GetChildAt(42); + btn_chout = (btn_get)GetChildAt(43); + btn_confirm = (btn_get)GetChildAt(44); + btn_check_level = (btn_get)GetChildAt(45); + text_nowch = (GTextField)GetChildAt(47); + text_cashneedlv = (GTextField)GetChildAt(48); + text_leveltime = (GTextField)GetChildAt(49); + lab_lv_need_des = (GTextField)GetChildAt(51); + com_chlevel = (cash_levelcom)GetChildAt(54); + group_ = (GGroup)GetChildAt(55); + lab_mn = (GTextField)GetChildAt(59); + list_kicket = (GList)GetChildAt(64); + lab_mn2 = (GTextField)GetChildAt(69); + lab_ticket = (GTextField)GetChildAt(77); + lab_code = (GTextField)GetChildAt(79); + btn_copy = (btn_code)GetChildAt(80); + btn_contact_us = (btn_code)GetChildAt(81); + btn_back = (GButton)GetChildAt(85); + lab_ads = (GTextField)GetChildAt(88); + btn_inline_ok = (btn_get)GetChildAt(89); + text_condi1 = (GRichTextField)GetChildAt(90); + text_ch_number = (GRichTextField)GetChildAt(91); + btn_close = (GButton)GetChildAt(92); + btn_watchad = (GButton)GetChildAt(94); + btn_task_watch = (GButton)GetChildAt(96); + t0 = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_confirm.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_confirm.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs.meta index b86dbb4..d6abf62 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_confirm.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0735a0d3bf6a8470fa186c40cbfbc329 +guid: b4662301098535c448b2433570c8c5e9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord_new.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_cord.cs similarity index 50% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord_new.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_cord.cs index 54813a9..18e6c5f 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord_new.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_cord.cs @@ -3,24 +3,22 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { - public partial class com_cord_new : GComponent + public partial class com_cord : GComponent { public GTextField text_amt; public GTextField text_payer; public GTextField text_name; - public GLoader loader_logo; public GTextField email_text; public GTextField time_text; public GTextField number_text; public GTextField status_text_0; - public GTextField status_text_1; - public const string URL = "ui://md8tkwlzzeoz5v"; + public const string URL = "ui://jwedp6jymeh8c"; - public static com_cord_new CreateInstance() + public static com_cord CreateInstance() { - return (com_cord_new)UIPackage.CreateObject("G007_makeup", "com_cord_new"); + return (com_cord)UIPackage.CreateObject("tixian", "com_cord"); } public override void ConstructFromXML(XML xml) @@ -30,12 +28,10 @@ namespace FGUI.G007_makeup text_amt = (GTextField)GetChildAt(2); text_payer = (GTextField)GetChildAt(3); text_name = (GTextField)GetChildAt(4); - loader_logo = (GLoader)GetChildAt(5); - email_text = (GTextField)GetChildAt(9); - time_text = (GTextField)GetChildAt(10); - number_text = (GTextField)GetChildAt(11); - status_text_0 = (GTextField)GetChildAt(12); - status_text_1 = (GTextField)GetChildAt(13); + email_text = (GTextField)GetChildAt(8); + time_text = (GTextField)GetChildAt(9); + number_text = (GTextField)GetChildAt(10); + status_text_0 = (GTextField)GetChildAt(11); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_cord.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_cord.cs.meta index 22c704d..e35cd90 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_cord.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3ebbbce3d0b2547d2bad9ef012f20bc2 +guid: 18c32da1b3864a940afb35062dca916c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_cord_new.cs similarity index 80% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_cord_new.cs index f26faf8..2b1829c 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_cord_new.cs @@ -3,9 +3,9 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { - public partial class com_cord : GComponent + public partial class com_cord_new : GComponent { public GTextField text_amt; public GTextField text_payer; @@ -16,11 +16,11 @@ namespace FGUI.G007_makeup public GTextField number_text; public GTextField status_text_0; public GTextField status_text_1; - public const string URL = "ui://md8tkwlzmeh8c"; + public const string URL = "ui://jwedp6jy933h61"; - public static com_cord CreateInstance() + public static com_cord_new CreateInstance() { - return (com_cord)UIPackage.CreateObject("G007_makeup", "com_cord"); + return (com_cord_new)UIPackage.CreateObject("tixian", "com_cord_new"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord_new.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_cord_new.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord_new.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_cord_new.cs.meta index 390045f..01c3b65 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_cord_new.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_cord_new.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c965f0b35fbe54854bc27e51534e78b4 +guid: 478bcb66240cf4343b563b67f71096e0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_enter.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_enter.cs similarity index 65% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_enter.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_enter.cs index b988d78..6e90766 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_enter.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_enter.cs @@ -3,23 +3,23 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.tixian { public partial class com_enter : GComponent { public GTextInput enter_email; - public const string URL = "ui://sddomhj3deiw1k"; + public const string URL = "ui://jwedp6jydeiw1k"; public static com_enter CreateInstance() { - return (com_enter)UIPackage.CreateObject("SaveingPot", "com_enter"); + return (com_enter)UIPackage.CreateObject("tixian", "com_enter"); } public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); - enter_email = (GTextInput)GetChildAt(1); + enter_email = (GTextInput)GetChildAt(2); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_enter.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_enter.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_enter.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_enter.cs.meta index 5e49fba..6a55c7f 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_enter.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_enter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d9318dbc36b74fbba8081ff2f38fc10 +guid: 85619a3ee2ddd0242bc9987d794f6454 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_firstname.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_firstname.cs similarity index 73% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_firstname.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_firstname.cs index 098477a..17841ce 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_firstname.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_firstname.cs @@ -3,16 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { public partial class com_firstname : GComponent { public GTextInput enter_fname; - public const string URL = "ui://md8tkwlzdeiw1j"; + public const string URL = "ui://jwedp6jydeiw1j"; public static com_firstname CreateInstance() { - return (com_firstname)UIPackage.CreateObject("G007_makeup", "com_firstname"); + return (com_firstname)UIPackage.CreateObject("tixian", "com_firstname"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_firstname.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_firstname.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_firstname.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_firstname.cs.meta index c30515b..095afb4 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_firstname.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_firstname.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b6f516a4327a439eb8bcd783067c6fa +guid: 9629a804fd84727419d525a33274bacd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_info.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_info.cs similarity index 72% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_info.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_info.cs index b6f5b35..68dae8d 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_info.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_info.cs @@ -3,19 +3,18 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.tixian { public partial class com_info : GComponent { public GTextField text_name; public GTextField text_email; public GButton btn_change; - public GLoader load_avatar; - public const string URL = "ui://sddomhj3if1eb"; + public const string URL = "ui://jwedp6jyif1eb"; public static com_info CreateInstance() { - return (com_info)UIPackage.CreateObject("SaveingPot", "com_info"); + return (com_info)UIPackage.CreateObject("tixian", "com_info"); } public override void ConstructFromXML(XML xml) @@ -25,7 +24,6 @@ namespace FGUI.SaveingPot text_name = (GTextField)GetChildAt(0); text_email = (GTextField)GetChildAt(1); btn_change = (GButton)GetChildAt(2); - load_avatar = (GLoader)GetChildAt(3); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_info.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_info.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_info.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_info.cs.meta index 62b6e7f..76962c1 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_info.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_info.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 75f71dd060ba749b6a8947598609bbc3 +guid: 34addb58cfd62b341872c44eab3a8fce MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_lastname.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_lastname.cs similarity index 73% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_lastname.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_lastname.cs index 0bba0d7..e9fe996 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_lastname.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_lastname.cs @@ -3,16 +3,16 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { public partial class com_lastname : GComponent { public GTextInput enter_lname; - public const string URL = "ui://md8tkwlzdeiw1i"; + public const string URL = "ui://jwedp6jydeiw1i"; public static com_lastname CreateInstance() { - return (com_lastname)UIPackage.CreateObject("G007_makeup", "com_lastname"); + return (com_lastname)UIPackage.CreateObject("tixian", "com_lastname"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_lastname.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_lastname.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_lastname.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_lastname.cs.meta index 24448d5..9388fff 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_lastname.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_lastname.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5dfc602d4d4bb4722bb4518c02cede48 +guid: 4f54ef69acbee1147b5a6c2bfffc0ce6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_newRecord.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_newRecord.cs similarity index 76% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_newRecord.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_newRecord.cs index a884b94..4fde435 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_newRecord.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_newRecord.cs @@ -3,17 +3,17 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.tixian { public partial class com_newRecord : GComponent { public com_rank com_rank; public com_cord com_cord; - public const string URL = "ui://sddomhj3qgv24k"; + public const string URL = "ui://jwedp6jyqgv24k"; public static com_newRecord CreateInstance() { - return (com_newRecord)UIPackage.CreateObject("SaveingPot", "com_newRecord"); + return (com_newRecord)UIPackage.CreateObject("tixian", "com_newRecord"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_newRecord.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_newRecord.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_newRecord.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_newRecord.cs.meta index 3008ca3..a284c57 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_newRecord.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_newRecord.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 75716ba577aa843d29c832759a8bf3e5 +guid: 3643bcfa4e3e7e1479e65d1cb7fc9cd8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_rank.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_rank.cs similarity index 73% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_rank.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_rank.cs index 838c435..5cb98b7 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_rank.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_rank.cs @@ -3,22 +3,24 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.tixian { public partial class com_rank : GComponent { public Controller content1; public Controller content2; public Controller content3; + public GTextField lab_title_des; public GTextField text_ranks; + public GTextField lab_rank_tips; public GTextField text_rank1; public GTextField text_rank2; public GTextField text_rank3; - public const string URL = "ui://sddomhj3qgv24f"; + public const string URL = "ui://jwedp6jyqgv24f"; public static com_rank CreateInstance() { - return (com_rank)UIPackage.CreateObject("SaveingPot", "com_rank"); + return (com_rank)UIPackage.CreateObject("tixian", "com_rank"); } public override void ConstructFromXML(XML xml) @@ -28,7 +30,9 @@ namespace FGUI.SaveingPot content1 = GetControllerAt(0); content2 = GetControllerAt(1); content3 = GetControllerAt(2); + lab_title_des = (GTextField)GetChildAt(2); text_ranks = (GTextField)GetChildAt(3); + lab_rank_tips = (GTextField)GetChildAt(4); text_rank1 = (GTextField)GetChildAt(5); text_rank2 = (GTextField)GetChildAt(6); text_rank3 = (GTextField)GetChildAt(7); diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_rank.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_rank.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_rank.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_rank.cs.meta index 7de4e03..e769cbc 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_rank.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_rank.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a86377bc61294574b33ff86fd7a3627 +guid: 81b9d22bb3dd9e74681076fcafbcc10d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_record.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_record.cs similarity index 50% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_record.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_record.cs index 8848e75..895c8eb 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_record.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_record.cs @@ -3,21 +3,20 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { public partial class com_record : GComponent { public Controller cont_show; public GList list_record; - public GTextField money_text; - public GButton closeButton; - public GGroup group_; public GButton btn_help; - public const string URL = "ui://md8tkwlzw3axa"; + public GTextField text_title; + public GComponent closeButton; + public const string URL = "ui://jwedp6jyw3axa"; public static com_record CreateInstance() { - return (com_record)UIPackage.CreateObject("G007_makeup", "com_record"); + return (com_record)UIPackage.CreateObject("tixian", "com_record"); } public override void ConstructFromXML(XML xml) @@ -25,11 +24,10 @@ namespace FGUI.G007_makeup base.ConstructFromXML(xml); cont_show = GetControllerAt(0); - list_record = (GList)GetChildAt(2); - money_text = (GTextField)GetChildAt(5); - closeButton = (GButton)GetChildAt(6); - group_ = (GGroup)GetChildAt(7); - btn_help = (GButton)GetChildAt(8); + list_record = (GList)GetChildAt(1); + btn_help = (GButton)GetChildAt(3); + text_title = (GTextField)GetChildAt(4); + closeButton = (GComponent)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_record.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_record.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_record.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_record.cs.meta index d040421..3c4229e 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_record.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_record.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20e67d2930608484fa6cb64967b7695c +guid: 68381ac04d7947e4f89e579e38a37790 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_regulation.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_regulation.cs similarity index 53% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_regulation.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_regulation.cs index 41630a0..efcdd2d 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_regulation.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_regulation.cs @@ -3,25 +3,23 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { public partial class com_regulation : GComponent { - public GTextField title0; - public GButton closeButton; - public const string URL = "ui://md8tkwlzghqt2"; + public GComponent closeButton; + public const string URL = "ui://jwedp6jyghqt2"; public static com_regulation CreateInstance() { - return (com_regulation)UIPackage.CreateObject("G007_makeup", "com_regulation"); + return (com_regulation)UIPackage.CreateObject("tixian", "com_regulation"); } public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); - title0 = (GTextField)GetChildAt(4); - closeButton = (GButton)GetChildAt(5); + closeButton = (GComponent)GetChildAt(1); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_regulation.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_regulation.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_regulation.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_regulation.cs.meta index 05538ab..d7d026f 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_regulation.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_regulation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f0a333d1642544eea5dfd892430fbed +guid: 562148c6e0d8f3943aa5d3b90b4db820 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs new file mode 100644 index 0000000..d2bf697 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs @@ -0,0 +1,111 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.tixian +{ + public partial class com_saveingpot : GComponent + { + public Controller type; + public Controller cont_confirm; + public GGraph ani_potparent; + public GTextField text_remaintime; + public GProgressBar progress_ch; + public GTextField text_chprogress; + public GTextField text_nowch; + public GTextField text_ad; + public GTextField text_pay; + public GButton btn_ch; + public GTextField text_lose; + public btn_confirm btn_confirm; + public GTextField text_title; + public GTextField text_query; + public GTextField text_payhint; + public btn_top btn_level0; + public btn_top btn_level1; + public btn_top btn_level2; + public GGroup group_; + public GTextField text_title_2; + public GTextField text_smaill_title; + public com_enter com_info; + public com_firstname com_fname; + public com_lastname com_lname; + public com_info com_pay; + public GTextField text_smaill_title_2; + public GTextField text_ch; + public GTextField text_account; + public com_task com_task; + public com_newRecord com_newRecord; + public btn_pay btn_watch; + public GImage card_; + public GTextField lab_mn; + public GList list_kicket; + public GTextField lab_mn2; + public GTextField lab_ticket; + public GTextField lab_code; + public btn_code btn_copy; + public btn_code btn_contact_us; + public GButton btn_back; + public btn_get btn_inline_ok; + public com_broadcast broad; + public GButton btn_close; + public GButton btn_task_watch; + public const string URL = "ui://jwedp6jyupx71p"; + + public static com_saveingpot CreateInstance() + { + return (com_saveingpot)UIPackage.CreateObject("tixian", "com_saveingpot"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + type = GetControllerAt(0); + cont_confirm = GetControllerAt(1); + ani_potparent = (GGraph)GetChildAt(0); + text_remaintime = (GTextField)GetChildAt(3); + progress_ch = (GProgressBar)GetChildAt(4); + text_chprogress = (GTextField)GetChildAt(5); + text_nowch = (GTextField)GetChildAt(6); + text_ad = (GTextField)GetChildAt(8); + text_pay = (GTextField)GetChildAt(9); + btn_ch = (GButton)GetChildAt(10); + text_lose = (GTextField)GetChildAt(11); + btn_confirm = (btn_confirm)GetChildAt(14); + text_title = (GTextField)GetChildAt(15); + text_query = (GTextField)GetChildAt(19); + text_payhint = (GTextField)GetChildAt(20); + btn_level0 = (btn_top)GetChildAt(21); + btn_level1 = (btn_top)GetChildAt(22); + btn_level2 = (btn_top)GetChildAt(23); + group_ = (GGroup)GetChildAt(24); + text_title_2 = (GTextField)GetChildAt(25); + text_smaill_title = (GTextField)GetChildAt(26); + com_info = (com_enter)GetChildAt(27); + com_fname = (com_firstname)GetChildAt(28); + com_lname = (com_lastname)GetChildAt(29); + com_pay = (com_info)GetChildAt(30); + text_smaill_title_2 = (GTextField)GetChildAt(31); + text_ch = (GTextField)GetChildAt(34); + text_account = (GTextField)GetChildAt(35); + com_task = (com_task)GetChildAt(38); + com_newRecord = (com_newRecord)GetChildAt(39); + btn_watch = (btn_pay)GetChildAt(40); + card_ = (GImage)GetChildAt(42); + lab_mn = (GTextField)GetChildAt(45); + list_kicket = (GList)GetChildAt(51); + lab_mn2 = (GTextField)GetChildAt(55); + lab_ticket = (GTextField)GetChildAt(62); + lab_code = (GTextField)GetChildAt(64); + btn_copy = (btn_code)GetChildAt(65); + btn_contact_us = (btn_code)GetChildAt(66); + btn_back = (GButton)GetChildAt(70); + btn_inline_ok = (btn_get)GetChildAt(75); + broad = (com_broadcast)GetChildAt(76); + btn_close = (GButton)GetChildAt(77); + btn_task_watch = (GButton)GetChildAt(78); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_saveingpot.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_saveingpot.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs.meta index 15ce59b..2e3de32 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_saveingpot.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_saveingpot.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2345afaa2ce444d558be6a8459cd972e +guid: 4117f2546a524624c856414adf4248c4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_task.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs similarity index 57% rename from Assets/BingoBrain/FGUI/Package/SaveingPot/com_task.cs rename to Assets/BingoBrain/FGUI/Package/tixian/com_task.cs index 1cfd5b0..b73c3b9 100644 --- a/Assets/BingoBrain/FGUI/Package/SaveingPot/com_task.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs @@ -3,7 +3,7 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.SaveingPot +namespace FGUI.tixian { public partial class com_task : GComponent { @@ -11,12 +11,13 @@ namespace FGUI.SaveingPot public GTextField text_orderid; public GTextField text_task_title; public GTextField text_ads; + public GTextField text_task; public GTextField text_payer; - public const string URL = "ui://sddomhj3es171x"; + public const string URL = "ui://jwedp6jyes171x"; public static com_task CreateInstance() { - return (com_task)UIPackage.CreateObject("SaveingPot", "com_task"); + return (com_task)UIPackage.CreateObject("tixian", "com_task"); } public override void ConstructFromXML(XML xml) @@ -24,10 +25,11 @@ namespace FGUI.SaveingPot base.ConstructFromXML(xml); cont_process = GetControllerAt(0); - text_orderid = (GTextField)GetChildAt(6); - text_task_title = (GTextField)GetChildAt(7); - text_ads = (GTextField)GetChildAt(8); - text_payer = (GTextField)GetChildAt(10); + text_orderid = (GTextField)GetChildAt(4); + text_task_title = (GTextField)GetChildAt(5); + text_ads = (GTextField)GetChildAt(6); + text_task = (GTextField)GetChildAt(7); + text_payer = (GTextField)GetChildAt(16); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_task.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/com_task.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/com_task.cs.meta index 3c3b907..b425d34 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/com_task.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_task.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4bb3c4fc0e14b4a8ab48abd7b23672b6 +guid: c7ab28d3c7a14694c8980b6d0af6fb75 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_ticket_item.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_ticket_item.cs new file mode 100644 index 0000000..0df0b50 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_ticket_item.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.tixian +{ + public partial class com_ticket_item : GComponent + { + public GTextField lab_num; + public btn_kicket btn_claim; + public const string URL = "ui://jwedp6jytivmee"; + + public static com_ticket_item CreateInstance() + { + return (com_ticket_item)UIPackage.CreateObject("tixian", "com_ticket_item"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + lab_num = (GTextField)GetChildAt(4); + btn_claim = (btn_kicket)GetChildAt(5); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_ticket_item.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/com_ticket_item.cs.meta new file mode 100644 index 0000000..8603fc7 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_ticket_item.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: be11baeed97a95d489cc469cd2547000 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/level_btn.cs b/Assets/BingoBrain/FGUI/Package/tixian/level_btn.cs similarity index 57% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/level_btn.cs rename to Assets/BingoBrain/FGUI/Package/tixian/level_btn.cs index 8919719..1eba633 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/level_btn.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/level_btn.cs @@ -3,20 +3,20 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.G007_makeup +namespace FGUI.tixian { public partial class level_btn : GButton { public Controller btn_state; public GTextField text_level0; public GTextField text_level1; + public GTextField text_level2; public GImage img_check; - public GTextField text_level1_2; - public const string URL = "ui://md8tkwlzfzz843"; + public const string URL = "ui://jwedp6jyfzz843"; public static level_btn CreateInstance() { - return (level_btn)UIPackage.CreateObject("G007_makeup", "level_btn"); + return (level_btn)UIPackage.CreateObject("tixian", "level_btn"); } public override void ConstructFromXML(XML xml) @@ -24,10 +24,10 @@ namespace FGUI.G007_makeup base.ConstructFromXML(xml); btn_state = GetControllerAt(0); - text_level0 = (GTextField)GetChildAt(2); - text_level1 = (GTextField)GetChildAt(3); - img_check = (GImage)GetChildAt(4); - text_level1_2 = (GTextField)GetChildAt(6); + text_level0 = (GTextField)GetChildAt(3); + text_level1 = (GTextField)GetChildAt(4); + text_level2 = (GTextField)GetChildAt(5); + img_check = (GImage)GetChildAt(8); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/level_btn.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/level_btn.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/level_btn.cs.meta rename to Assets/BingoBrain/FGUI/Package/tixian/level_btn.cs.meta index 806fa4e..cd1fbac 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/level_btn.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/tixian/level_btn.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3230276d1577a4ab28d20524f0ff4d7e +guid: dc262278844334d4fae7c3d3980ea34d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/G007_makeup/G007_makeupBinder.cs b/Assets/BingoBrain/FGUI/Package/tixian/tixianBinder.cs similarity index 64% rename from Assets/BingoBrain/FGUI/Package/G007_makeup/G007_makeupBinder.cs rename to Assets/BingoBrain/FGUI/Package/tixian/tixianBinder.cs index 7b286ad..69f6f19 100644 --- a/Assets/BingoBrain/FGUI/Package/G007_makeup/G007_makeupBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/tixianBinder.cs @@ -2,30 +2,36 @@ using FairyGUI; -namespace FGUI.G007_makeup +namespace FGUI.tixian { - public class G007_makeupBinder + public class tixianBinder { public static void BindAll() { + UIObjectFactory.SetPackageItemExtension(com_cord_new.URL, typeof(com_cord_new)); + UIObjectFactory.SetPackageItemExtension(btn_get.URL, typeof(btn_get)); UIObjectFactory.SetPackageItemExtension(com_lastname.URL, typeof(com_lastname)); UIObjectFactory.SetPackageItemExtension(com_firstname.URL, typeof(com_firstname)); UIObjectFactory.SetPackageItemExtension(com_enter.URL, typeof(com_enter)); + UIObjectFactory.SetPackageItemExtension(btn_edit.URL, typeof(btn_edit)); UIObjectFactory.SetPackageItemExtension(com_task.URL, typeof(com_task)); UIObjectFactory.SetPackageItemExtension(cash_levelcom.URL, typeof(cash_levelcom)); UIObjectFactory.SetPackageItemExtension(level_btn.URL, typeof(level_btn)); UIObjectFactory.SetPackageItemExtension(com_regulation.URL, typeof(com_regulation)); - UIObjectFactory.SetPackageItemExtension(btn_confirm.URL, typeof(btn_confirm)); - UIObjectFactory.SetPackageItemExtension(com_trans.URL, typeof(com_trans)); + UIObjectFactory.SetPackageItemExtension(com_broadcast.URL, typeof(com_broadcast)); + UIObjectFactory.SetPackageItemExtension(btn_pay.URL, typeof(btn_pay)); UIObjectFactory.SetPackageItemExtension(com_info.URL, typeof(com_info)); + UIObjectFactory.SetPackageItemExtension(btn_confirm.URL, typeof(btn_confirm)); UIObjectFactory.SetPackageItemExtension(com_cord.URL, typeof(com_cord)); UIObjectFactory.SetPackageItemExtension(com_rank.URL, typeof(com_rank)); UIObjectFactory.SetPackageItemExtension(com_newRecord.URL, typeof(com_newRecord)); - UIObjectFactory.SetPackageItemExtension(btn_watch.URL, typeof(btn_watch)); - UIObjectFactory.SetPackageItemExtension(com_step.URL, typeof(com_step)); + UIObjectFactory.SetPackageItemExtension(com_ticket_item.URL, typeof(com_ticket_item)); + UIObjectFactory.SetPackageItemExtension(btn_kicket.URL, typeof(btn_kicket)); + UIObjectFactory.SetPackageItemExtension(btn_code.URL, typeof(btn_code)); + UIObjectFactory.SetPackageItemExtension(com_saveingpot.URL, typeof(com_saveingpot)); + UIObjectFactory.SetPackageItemExtension(btn_top.URL, typeof(btn_top)); UIObjectFactory.SetPackageItemExtension(com_confirm.URL, typeof(com_confirm)); UIObjectFactory.SetPackageItemExtension(com_record.URL, typeof(com_record)); - UIObjectFactory.SetPackageItemExtension(com_cord_new.URL, typeof(com_cord_new)); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/tixian/tixianBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/tixian/tixianBinder.cs.meta new file mode 100644 index 0000000..c9f3d2d --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/tixian/tixianBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 32c0fe4fbcf7fb94db041e31178d6dc4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/Harmony/GameHelper.cs b/Assets/BingoBrain/Harmony/GameHelper.cs index fb32457..a7a2c89 100644 --- a/Assets/BingoBrain/Harmony/GameHelper.cs +++ b/Assets/BingoBrain/Harmony/GameHelper.cs @@ -93,6 +93,7 @@ namespace BingoBrain { //if(Random.Range(0, 100)>ConfigSystem.GetConfig().interstitialtype) return; + if (!IsGiftSwitch()) return; MaxADKit.ShowInterstitial(key, isSuccess => { if (isSuccess) @@ -393,8 +394,8 @@ namespace BingoBrain public static bool IsGiftSwitch() { - // return false; - // return true; + // return false; + return true; //zhushi // Debug.Log(GetLoginModel().is_magic); return GetLoginModel().is_magic; } @@ -1068,7 +1069,7 @@ namespace BingoBrain public static int GetLevel() { - //return 30; + return 30; //zhushi return PlayerPrefs.GetInt("_level", 1); } @@ -1186,16 +1187,16 @@ namespace BingoBrain { var currentRedeemLevel = 1; - for (var i = 0; i < PreferencesMgr.Instance.MakeupTaskHistory.Count; i++) - { - var task = PreferencesMgr.Instance.MakeupTaskHistory[i]; + // for (var i = 0; i < PreferencesMgr.Instance.MakeupTaskHistory.Count; i++) + // { + // var task = PreferencesMgr.Instance.MakeupTaskHistory[i]; - if (task.status == MakeupTaskStatus.Inline) - { - currentRedeemLevel++; + // // if (task.status == MakeupTaskStatus.Inline) + // // { + // // currentRedeemLevel++; - } - } + // // } + // } // Debug.Log($"GetRewardValue=====================currentRedeemLevel {currentRedeemLevel} \n type: {type}"); @@ -1408,23 +1409,23 @@ namespace BingoBrain var avatarId = PreferencesMgr.Instance.PlayerAvatarId; EyesHarmony.SetAvatarToLoader(avatarId, gLoader); } - public static bool needShowLevelstate(int id = -1) - { + // public static bool needShowLevelstate(int id = -1) + // { - var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - Debug.Log(makeupTaskData.tableId); - var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); - Debug.Log(vo); - int lv = vo.id; - int a = PlayerPrefs.GetInt("cash_lv", 0); - if (id != -1) lv = id + 1; - if (a < lv) - { - return true; - } + // var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); + // Debug.Log(makeupTaskData.tableId); + // var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + // Debug.Log(vo); + // int lv = vo.id; + // int a = PlayerPrefs.GetInt("cash_lv", 0); + // if (id != -1) lv = id + 1; + // if (a < lv) + // { + // return true; + // } - return false; - } + // return false; + // } public static bool checkGoldNumber(int target) { return PreferencesMgr.Instance.Currency101 >= target ? true : false; @@ -1467,10 +1468,10 @@ namespace BingoBrain type = type }; - NetworkKit.PostWithHeader("event/adWatchOver", respData, (isSuccess, obj) => - { + // NetworkKit.PostWithHeader("event/adWatchOver", respData, (isSuccess, obj) => + // { - }); + // });zhushi } /// @@ -1631,6 +1632,97 @@ namespace BingoBrain return oldDate > yesterday; } + public static bool isRDExchangeMode() + { + + return SaveData.GetSaveobject().ExchangeModeToggle == 1; + } + public static string getDesByKey(string key) + { + Debug.Log(key); + Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig().dataList)); + if (isRDExchangeMode()) + { + string str = ConfigSystem.GetConfig().dataList.FirstOrDefault(data => data.des_key == key)?.Mode_1 ?? ""; + if (str != "") + { + str = str.Replace("", "") + .Replace("", ""); + } + return str; + } + else + { + return ConfigSystem.GetConfig().dataList.FirstOrDefault(data => data.des_key == key)?.Mode_0 ?? ""; + } + } + public static string getChString(decimal ch) + { + if (GameHelper.isRDExchangeMode()) + { + string str = ""; + return str + $" {ch:N0}"; + } + else + { + return $"${ch:N}"; + } + } + public static string GenerateUniqueKey() + { + const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + + string key; + do + { + StringBuilder sb = new StringBuilder(); + + sb.Append(GenerateRandomString(chars, 4)); + sb.Append("-"); + sb.Append(GenerateRandomString(chars, 6)); + sb.Append("-"); + sb.Append(GenerateRandomString(chars, 4)); + + key = sb.ToString(); + } while (generatedKeys.Contains(key)); // 如果重复就重新生成 + + generatedKeys.Add(key); // 添加到集合中 + return key; + } + static string GenerateRandomString(string charSet, int length) + { + StringBuilder sb = new StringBuilder(); + System.Random random = new System.Random(); + for (int i = 0; i < length; i++) + { + int index = random.Next(charSet.Length); + sb.Append(charSet[index]); + } + return sb.ToString(); + } + private static HashSet generatedKeys = new HashSet(); + public static string getPrice(decimal ch) + { + return $"${ch:N}"; + } + public static string GetPriceInt(decimal ch) + { + return $"${ch:N0}"; + } + public static void CopyText(string text) + { +#if UNITY_EDITOR_WIN || UNITY_EDITOR_OSX || UNITY_STANDALONE_WIN || UNITY_STANDALONE_OSX || UNITY_STANDALONE_LINUX + GUIUtility.systemCopyBuffer = text; +#elif UNITY_ANDROID + // CopyToClipboardAndroid(text); + +#elif UNITY_IOS + BrigdeIOS.copyText(text); +#else + Debug.LogWarning("当前平台不支持复制到剪贴板功能"); +#endif + GameHelper.ShowTips("Copy Succeed"); + } } } diff --git a/Assets/BingoBrain/Manager/FX.cs b/Assets/BingoBrain/Manager/FX.cs index 289e2a9..9700050 100644 --- a/Assets/BingoBrain/Manager/FX.cs +++ b/Assets/BingoBrain/Manager/FX.cs @@ -194,10 +194,10 @@ namespace BingoBrain fx_main_ad, fx_broad, fx_tips, - fx_savepot_icon, - fx_savepot, - fx_three_gift, + fx_three_gift, fx_title_effect, + fx_wheel, + fx_saving, #endregion diff --git a/Assets/BingoBrain/Manager/Hall.cs b/Assets/BingoBrain/Manager/Hall.cs index 7ef226e..f0c8993 100644 --- a/Assets/BingoBrain/Manager/Hall.cs +++ b/Assets/BingoBrain/Manager/Hall.cs @@ -49,12 +49,12 @@ namespace BingoBrain void FocusToGame (object obj = null) { - if(MaxPayManager.isPay) - { - MaxPayManager.isPay = false; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close); - MaxPayManager.Instance.PaySuccess(); - } + // if(MaxPayManager.isPay) + // { + // MaxPayManager.isPay = false; + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close); + // MaxPayManager.Instance.PaySuccess(); + // } var last_time = PlayerPrefs.GetInt("Dayreftimes", 0); DateTime newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); @@ -99,19 +99,19 @@ namespace BingoBrain private void EnterHall(object obj = null) { - if (!GameHelper.IsGiftSwitch()) - { + // if (!GameHelper.IsGiftSwitch()) + // { UICtrlDispatcher.Instance.Dispatch(SkinInfo.PlayBgUI_Close); UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoStartUI_Close); UICtrlDispatcher.Instance.Dispatch(SkinInfo.BottomUI_Open); UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open); UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); - } - else - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepPlayUI_Open); + // } + // else + // { + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepPlayUI_Open); - } + // } GameHelper.PostFunnelLogin("enterHall"); Audio.Instance.StopBGM(); diff --git a/Assets/BingoBrain/Manager/PreferencesMgr.cs b/Assets/BingoBrain/Manager/PreferencesMgr.cs index 3bd780d..eeec13c 100644 --- a/Assets/BingoBrain/Manager/PreferencesMgr.cs +++ b/Assets/BingoBrain/Manager/PreferencesMgr.cs @@ -162,7 +162,7 @@ namespace BingoBrain unsaveCount = 0; timeSave = GameHelper.GetNowTime(); var data = Havva.ToObject>(Havva.ToJson(preferences)); - NetworkDispatcher.Instance.Dispatch(NetworkMsg.SavePlayData, data); + // NetworkDispatcher.Instance.Dispatch(NetworkMsg.SavePlayData, data);zhushi } catch (Exception e) { diff --git a/Assets/BingoBrain/Model/Config/Game/BoardModel.cs b/Assets/BingoBrain/Model/Config/Game/BoardModel.cs index 4a33898..ea9c9e2 100644 --- a/Assets/BingoBrain/Model/Config/Game/BoardModel.cs +++ b/Assets/BingoBrain/Model/Config/Game/BoardModel.cs @@ -24,6 +24,17 @@ namespace BingoBrain public int[] offset; public int num; } + public class ExchangeDesModel : BingoBrainConfigModel + { + + } + + public class ExchangeDescriptors : BingoBrainConfigData + { + public string des_key; + public string Mode_0; + public string Mode_1; + } } diff --git a/Assets/BingoBrain/Model/Config/Game/CommonModel.cs b/Assets/BingoBrain/Model/Config/Game/CommonModel.cs index 60b7b30..4c25847 100644 --- a/Assets/BingoBrain/Model/Config/Game/CommonModel.cs +++ b/Assets/BingoBrain/Model/Config/Game/CommonModel.cs @@ -53,13 +53,13 @@ namespace BingoBrain public int Activetimes; public int rewardrate; public int roomrewardrate; - public int Smallrewardsrate; - public int exchangeCD; - public float afSendLimit; - public float afSendNum; + public int Smallrewardsrate; + public int exchangeCD; + public float afSendLimit; + public float afSendNum; public int rewardinsertion; - + public int propswitch; public int flyswitch; public int RevivalCoins; @@ -68,11 +68,11 @@ namespace BingoBrain public float Passportgift2; public float addspace; public float addspace2; - public int []darkWVRefreshtime; + public int[] darkWVRefreshtime; - public int []darkWVDailyrefreshtimes; + public int[] darkWVDailyrefreshtimes; public int WVswitch; - public int[] WVClickAddTime; + public int[] WVClickAddTime; public int PassTimes; public int FailedGiftProgress; @@ -81,9 +81,18 @@ namespace BingoBrain public int PiggyBankSwitch; public int FailedGiftCD; public int roomrate; - public int[] WVOffset; - public int[] darkWVRefreshtime2; - public float[] WVClickCTAddTime1; + public int[] WVOffset; + public int[] darkWVRefreshtime2; + public float[] WVClickCTAddTime1; public float[] WVClickCTAddTime2; + //tixian + public int WwalaccelerationCD; + public int ExpiryUnlock; + public int BalanceExpired; + public int[] BalanceExchange; + public int[] PotExchange; + public int ExchangeModeToggle; + public int ExchangeProcessMode; + public int CHProcessMode; } } diff --git a/Assets/BingoBrain/Model/Config/Game/CreatAnimalCard.cs b/Assets/BingoBrain/Model/Config/Game/CreatAnimalCard.cs deleted file mode 100644 index 0d38a44..0000000 --- a/Assets/BingoBrain/Model/Config/Game/CreatAnimalCard.cs +++ /dev/null @@ -1,248 +0,0 @@ -using System; -using System.Collections.Generic; -using Spine.Unity; -using UnityEngine; -using BingoBrain; -using BingoBrain; -using BingoBrain.Core; - -public class CreatAnimalCard : MonoBehaviour -{ - private GameObject card_item; - - public static CreatAnimalCard instance; - private List img_list; - - public Camera orthoCamera; // 这个变量应该被设置为您想要调整大小的正交相机 - - - private void Awake() - { - instance = this; - card_item = Resources.Load("card/card_item/card_"); - img_list = new List(); - // img_list = Resources.LoadAll("card/card_sprite").ToList(); - // img_list.Sort((x, y) => String.Compare(x.name, y.name)); - for (int i = 0; i < 16; i++) - { - img_list.Add(Resources.Load("card/card_sprite/" + i)); - - } - orthoCamera = GameObject.Find("GameCamera").GetComponent(); - - float size = (float)Math.Round(28.125f / ((float)Screen.width / Screen.height), 4); - string type = SystemInfo.deviceModel.ToLower().Trim(); - // Debug.Log($"type==========={type}"); - if(type.Substring(0, 3) == "ipa"){//iPad机型 - size = 49.9f; - } - - orthoCamera.orthographicSize = size; - } - - - - // Start is called before the first frame update - - public List> card_item_list = new List>(); - public List> CreatCardNew(int all_card_numbers, int card_type_max, int card_layer, int extra_max, List> map_list, List left_extra_list, - List right_extra_list) - - { - - //all_card_numbers *= 3; - int money_rate = ConfigSystem.GetConfig().rewardrate; - List type_list = new List(); - List this_timetype_list = new List(); - // Debug.Log(card_layer); - card_item_list.Clear(); - // if (card_layer < extra_max) - // { - // card_layer = extra_max; - // } - - for (int i = 0; i < all_card_numbers; i++) - { - int type = 0; - if (GameHelper.IsGiftSwitch() && UnityEngine.Random.Range(0, 100) < money_rate) type = 15; - else type = UnityEngine.Random.Range(0, card_type_max); - // Debug.Log($"type_list.type==========={type}"); - type_list.Add(type); - type_list.Add(type); - type_list.Add(type); - if (!this_timetype_list.Contains(type)) this_timetype_list.Add(type); - } - SaveData.GetSaveobject().this_time_cardtype = this_timetype_list.Count; - - for (int i = 0; i < card_layer; i++) - { - card_item_list.Add(new List()); - } - if (left_extra_list.Count > 0 || right_extra_list.Count > 0) - { - for (int i = 0; i < left_extra_list.Count; i++) - { - - Card_item _tempObject = new() - { - pos_x = left_extra_list[i].x, - pos_y = left_extra_list[i].y, - _layer = i - }; - card_item_list[i].Add(_tempObject); - - } - for (int i = 0; i < right_extra_list.Count; i++) - { - Card_item _tempObject1 = new() - { - pos_x = right_extra_list[i].x, - pos_y = right_extra_list[i].y, - _layer = i - }; - card_item_list[i].Add(_tempObject1); - } - } - - var nums = 0; - for (int i = 0; i < map_list.Count; i++) - { - nums += map_list[i].Count; - } - - for (int i = 0; i < nums; i++) - { - Card_item _tempObject = new(); - - int layer = getMaplayer(map_list);//确定层数 - int pos = UnityEngine.Random.Range(0, map_list[layer].Count); - _tempObject.pos_x = map_list[layer][pos].x; - _tempObject.pos_y = map_list[layer][pos].y; - _tempObject._layer = layer; - - card_item_list[layer].Add(_tempObject); - map_list[layer].RemoveAt(pos); - - } - for (int i = 0; i < card_item_list.Count; i++) - { - card_item_list[i].Sort((x, y) => y.pos_y.CompareTo(x.pos_y)); - } - - int index = 0; - for (int i = 0; i < card_item_list.Count; i++) - { - float z_offset = 0;//用来微调每层之间的z值，让下层盖住上层 - float last_posy = 0; - for (int j = 0; j < card_item_list[i].Count; j++) - { - if (last_posy != card_item_list[i][j].pos_y) - { - z_offset += 0.05f; - last_posy = card_item_list[i][j].pos_y; - } - GameObject temp = Instantiate(card_item, new Vector3(card_item_list[i][j].pos_x, card_item_list[i][j].pos_y, 400 - card_item_list[i][j]._layer - z_offset), Quaternion.identity, gameObject.transform); - // Debug.Log($"type_list.Count==========={type_list.Count}"); - index = UnityEngine.Random.Range(0, type_list.Count); - temp.GetComponent().sprite = img_list[type_list[index]]; - // Debug.Log(temp.GetComponent().sprite.bounds.size.x); - // Debug.Log(temp.GetComponent().sprite.bounds.size.y); - card_item_list[i][j].sheep_card = temp; - card_item_list[i][j].card_type = type_list[index]; - temp.gameObject.name = i + "-" + j; - type_list.RemoveAt(index); - } - } - return card_item_list; - - - } - public void creatSaveCard(List> card_item_list) - { - this.card_item_list = card_item_list; - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - GameObject temp; - // if (card_item_list[i][j].is_out) - // { - // temp = Instantiate(card_item, new Vector3(card_item_list[i][j].pos_x, card_item_list[i][j].pos_y, 400 - card_item_list[i][j].out_layer), Quaternion.identity, gameObject.transform); - // } - // else - temp = Instantiate(card_item, new Vector3(card_item_list[i][j].pos_x, card_item_list[i][j].pos_y, 400 - card_item_list[i][j]._layer), Quaternion.identity, gameObject.transform); - temp.GetComponent().sprite = img_list[card_item_list[i][j].card_type]; - card_item_list[i][j].sheep_card = temp; - if (card_item_list[i][j].in_slot || card_item_list[i][j].is_out) temp.transform.localScale = new Vector3(SheepPlayUI.card_slot_scale, SheepPlayUI.card_slot_scale, 1); - temp.gameObject.name = i + "-" + j; - } - } - - } - private GameObject Popup; -#if UNITY_EDITOR || UNITY_IOS - void Update() - { - - if (Input.GetMouseButtonDown(0)) - { - - if (Popup == null) Popup = GameObject.Find("Popup"); - if (Popup.transform.childCount != 0) return; - - Ray ray = orthoCamera.ScreenPointToRay(Input.mousePosition); - RaycastHit hit; - int layerMask = 1 << 6; // 只与第8层的碰撞器碰撞 - // 如果射线与layerMask指定层的碰撞器发生碰撞 - if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask)) - { - Debug.Log("Hit " + hit.collider.gameObject.name); - - GameDispatcher.Instance.Dispatch(GameMsg.card_click, hit.collider.gameObject.name); - // 在此处添加点击物体后的逻辑 - } - else - { - Debug.Log("No hit"); - } - } - } -#endif - private GameObject disappear01; - private GameObject disappear02; - public void creatSpine(int type, Vector3 vec3) - { - if (disappear01 == null) disappear01 = Resources.Load("card/bg_img/fx_disaappear_1"); - if (disappear02 == null) disappear02 = Resources.Load("card/bg_img/fx_disaappear_2"); - if (type == 1) - { - SkeletonAnimation temp = Instantiate(disappear01, new Vector3(vec3.x, vec3.y, 110), Quaternion.identity, gameObject.transform).GetComponent(); - temp.AnimationState.SetAnimation(0, "disappear01", true); - temp.AnimationState.Complete += (trackEntry) => - { - Destroy(temp.gameObject); - }; - } - if (type == 2) - { - SkeletonAnimation temp = Instantiate(disappear02, new Vector3(vec3.x, vec3.y, 110), Quaternion.identity, gameObject.transform).GetComponent(); - temp.AnimationState.SetAnimation(0, "disappear02", true); - temp.AnimationState.Complete += (trackEntry) => - { - Destroy(temp.gameObject); - }; - } - // temp.GetComponent().sprite = img_list[card_item_list[i][j].card_type]; - - } - - int getMaplayer(List> map_list) - { - int layer = UnityEngine.Random.Range(0, map_list.Count);//确定层数 - if (map_list[layer].Count == 0) - { - layer = getMaplayer(map_list); - } - return layer; - } -} diff --git a/Assets/BingoBrain/Model/Config/Game/CreatAnimalCard.cs.meta b/Assets/BingoBrain/Model/Config/Game/CreatAnimalCard.cs.meta deleted file mode 100644 index 76d5b9b..0000000 --- a/Assets/BingoBrain/Model/Config/Game/CreatAnimalCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: afff9374e713d4f3fb16d174ad8becac -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/Model/Game/CardBoardEntity.cs b/Assets/BingoBrain/Model/Game/CardBoardEntity.cs index f6f915e..9eb1573 100644 --- a/Assets/BingoBrain/Model/Game/CardBoardEntity.cs +++ b/Assets/BingoBrain/Model/Game/CardBoardEntity.cs @@ -180,7 +180,7 @@ namespace BingoBrain if (gameObjTransform != null) { gameObjTransform.localPosition = originPos + new Vector3(index / BingoCell.bingoCount * offset, - index % BingoCell.bingoCount * -offset); + index % BingoCell.bingoCount * -(offset + 0.02f)); } else { @@ -465,10 +465,10 @@ namespace BingoBrain public int IsBingo(List selectList) { foreach (var kv in from kv in BingoCell.bingoDic - where !bingoedList.Contains(kv.Key) - let isAllMatch = kv.Value.All(selectList.Contains) - where isAllMatch - select kv) + where !bingoedList.Contains(kv.Key) + let isAllMatch = kv.Value.All(selectList.Contains) + where isAllMatch + select kv) { return kv.Key; } diff --git a/Assets/BingoBrain/Model/Game/CardEntity.cs b/Assets/BingoBrain/Model/Game/CardEntity.cs index 240659c..7f25aca 100644 --- a/Assets/BingoBrain/Model/Game/CardEntity.cs +++ b/Assets/BingoBrain/Model/Game/CardEntity.cs @@ -6,7 +6,7 @@ using TMPro; using UnityEngine; using UnityEngine.EventSystems; using Spine; - +using UnityEngine.UI; namespace BingoBrain { public class CardEntity @@ -14,7 +14,7 @@ namespace BingoBrain public CardData data = new CardData(); public GameCell Game = new GameCell(); private TextMeshPro text; - private TextMeshPro alphaNum; + private SpriteRenderer alphaNum; private GameObject selectStar; private GameObject coin; @@ -34,24 +34,24 @@ namespace BingoBrain selectStar = Game.transform.Find("selectStar").gameObject; reward = Game.transform.Find("reward"); coin = Game.transform.Find("coin").gameObject; - alphaNum = text.transform.GetChild(0).GetComponent(); + alphaNum = text.transform.GetChild(0).GetComponent(); Game.transform.localScale = Vector3.one * 1.04f; TriggerBingo.Get(Game.gameObject).onClick = OnClick; - alphaNum.alpha = 0; + alphaNum.color = new Color(1f, 1f, 1f, 0f); action?.Invoke(); }); } else { - alphaNum.alpha = 0; + alphaNum.color = new Color(1f, 1f, 1f, 0f); action?.Invoke(); } } public void SetByData() { - alphaNum.text = text.text = GameHelper.GetNum(data.num); - + // alphaNum.text = text.text = GameHelper.GetNum(data.num); + text.text = GameHelper.GetNum(data.num); if (data.cardBoard.data.selectList.Contains(data.index)) { data.isSelect = true; @@ -96,7 +96,7 @@ namespace BingoBrain alphaTween?.Pause(); delayedCall?.Kill(); delayedCall = null; - alphaNum.alpha = 0; + alphaNum.color = new Color(1f, 1f, 1f, 0f); data.cardBoard.isFinish = false; data.cardBoard.isBingoing = false; data.isSelect = false; @@ -164,7 +164,7 @@ namespace BingoBrain } alphaTween?.Pause(); - alphaNum.alpha = 0; + alphaNum.color = new Color(1f, 1f, 1f, 0f); var effect = Battle.Instance.ShungTik.Get("Effect.spark.fx_number_enter", "fx_number_enter"); effect.transform.SetParent(Game.transform, false); DOVirtual.DelayedCall(1, () => { ReleaseEffect(effect); }).SetAutoKill(); @@ -212,7 +212,7 @@ namespace BingoBrain case CardPropType.cashx3: rewardSingleData.id = 102; rewardData.AddReward(rewardSingleData); - if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.StarRewardUI_Open,true); + if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.StarRewardUI_Open, true); else GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); break; case CardPropType.fanpai: diff --git a/Assets/BingoBrain/Model/Game/Preferences_Logic.cs b/Assets/BingoBrain/Model/Game/Preferences_Logic.cs index bd74423..3cb3ddf 100644 --- a/Assets/BingoBrain/Model/Game/Preferences_Logic.cs +++ b/Assets/BingoBrain/Model/Game/Preferences_Logic.cs @@ -283,8 +283,8 @@ namespace BingoBrain public int h5StayTime; public decimal makeupTaskH5Time; - public List makeupTaskHistory; - public List coinMakeupTaskHistory; + public List makeupTaskHistory; + public List coinMakeupTaskHistory; public decimal coinMakeupTaskH5Time; } } \ No newline at end of file diff --git a/Assets/BingoBrain/Model/Info/BingoInfot.cs b/Assets/BingoBrain/Model/Info/BingoInfot.cs index 690d408..d01f9f8 100644 --- a/Assets/BingoBrain/Model/Info/BingoInfot.cs +++ b/Assets/BingoBrain/Model/Info/BingoInfot.cs @@ -65,10 +65,12 @@ namespace BingoBrain.HotFix public static uint H5ViewClickBtn = ++Cursor_BASE; public static uint showBroadCast = ++Cursor_BASE; public static uint hideBroadCast = ++Cursor_BASE; - public static uint resurgence = ++Cursor_BASE; + public static uint resurgence = ++Cursor_BASE; public static uint resurgence_close = ++Cursor_BASE; public static uint RefreshSaveingPot = ++Cursor_BASE; public static uint updateRecordList = ++Cursor_BASE; + public static uint Network_reconnection = ++Cursor_BASE; + public static uint MakeUpConfirmUIClosed = ++Cursor_BASE; } } \ No newline at end of file diff --git a/Assets/BingoBrain/Model/Info/SkinInfot.cs b/Assets/BingoBrain/Model/Info/SkinInfot.cs index 67e8b87..64e681a 100644 --- a/Assets/BingoBrain/Model/Info/SkinInfot.cs +++ b/Assets/BingoBrain/Model/Info/SkinInfot.cs @@ -127,6 +127,10 @@ namespace BingoBrain public static uint SettingUI_Close = ++cursor_OpenClose; public static uint RegulationUI_Open = ++cursor_OpenClose; public static uint RegulationUI_Close = ++cursor_OpenClose; + public static uint SaveingPotUI_Open = ++cursor_OpenClose; + public static uint SaveingPotUI_Close = ++cursor_OpenClose; + public static uint RecordViewUI_Open = ++cursor_OpenClose; + public static uint RecordViewUI_Close = ++cursor_OpenClose; } public static partial class UICtrlMsg { diff --git a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs index 232b2a2..715a84b 100644 --- a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs @@ -59,11 +59,10 @@ namespace BingoBrain public const string OpenGameCtrl = "OpenGameCtrl"; public const string TipsViewCtrl = "TipsViewCtrl"; public const string PayloadingCtrl = "PayloadingCtrl"; - public const string ResurgenceCtrl = "ResurgenceCtrl"; - public const string SaveingPotCtrl = "SaveingPotCtrl"; - public const string RecordViewCtrl = "RecordViewCtrl"; - public const string ThreeDaysGiftCtrl = "ThreeDaysGiftCtrl"; - public const string RewardMulNewCtrl = "RewardMulNewCtrl"; - + public const string ResurgenceCtrl = "ResurgenceCtrl"; + public const string SaveingPotCtrl = "SaveingPotCtrl"; + public const string RecordViewCtrl = "RecordViewCtrl"; + public const string ThreeDaysGiftCtrl = "ThreeDaysGiftCtrl"; + public const string RewardMulNewCtrl = "RewardMulNewCtrl"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModelConst.cs b/Assets/BingoBrain/ModuleBoard/ModelConst.cs index 91c14b6..0cc579a 100644 --- a/Assets/BingoBrain/ModuleBoard/ModelConst.cs +++ b/Assets/BingoBrain/ModuleBoard/ModelConst.cs @@ -31,26 +31,26 @@ namespace BingoBrain public const string JTodModel = "JTodModel"; public const string BasptModel = "BasptModel"; public const string BingoToyModel = "BingoToyModel"; - public const string H5Model = "H5Model"; - public const string StarRewardModel = "StarRewardModel"; - public const string MakeupConfirmModel = "MakeupConfirmModel"; - public const string NetLoadingModel = "NetLoadingModel"; - public const string MakeupStepModel = " MakeupStepModel"; - public const string MakeupRecordModel = "MakeupRecordModel"; - public const string FirstRewardModel = "FirstRewardModel"; - public const string FaqUIModel = "FaqUIModel"; - public const string BroadcastModel = "BroadcastModel"; - public const string MenuModel = "MenuModel"; - public const string SettingModel = "SettingModel"; + public const string H5Model = "H5Model"; + public const string StarRewardModel = "StarRewardModel"; + public const string MakeupConfirmModel = "MakeupConfirmModel"; + public const string NetLoadingModel = "NetLoadingModel"; + public const string MakeupStepModel = " MakeupStepModel"; + public const string MakeupRecordModel = "MakeupRecordModel"; + public const string FirstRewardModel = "FirstRewardModel"; + public const string FaqUIModel = "FaqUIModel"; + public const string BroadcastModel = "BroadcastModel"; + public const string MenuModel = "MenuModel"; + public const string SettingModel = "SettingModel"; public const string SheepPlayModel = "SheepPlayModel"; - public const string RegulationModel = "RegulationModel"; + public const string RegulationModel = "RegulationModel"; public const string LevelSuccessModel = "LevelSuccessModel"; public const string TipsViewModel = "TipsViewModel"; public const string PayloadingModel = "PayloadingModel"; - public const string ResurgenceModel = "ResurgenceModel"; - public const string SaveingPotModel = "SaveingPotModel"; - public const string RecordViewModel = "RecordViewModel"; - public const string ThreeDaysGiftModel = "ThreeDaysGiftModel"; - public const string RewardMulNewModel = "RewardMulNewModel"; - } + public const string ResurgenceModel = "ResurgenceModel"; + public const string SaveingPotModel = "SaveingPotModel"; + public const string RecordViewModel = "RecordViewModel"; + public const string ThreeDaysGiftModel = "ThreeDaysGiftModel"; + public const string RewardMulNewModel = "RewardMulNewModel"; + } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs index 30b3151..3056fc4 100644 --- a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs +++ b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs @@ -36,28 +36,17 @@ namespace BingoBrain moduleBoardk.AddModel(ModelConst.JTodModel, new JTodModel()); moduleBoardk.AddModel(ModelConst.BasptModel, new BasptModel()); moduleBoardk.AddModel(ModelConst.BingoToyModel, new BingoToyModel()); - moduleBoardk.AddModel(ModelConst.H5Model, new H5Model()); moduleBoardk.AddModel(ModelConst.StarRewardModel, new StarRewardModel()); - moduleBoardk.AddModel(ModelConst.MakeupConfirmModel, new MakeupConfirmModel()); moduleBoardk.AddModel(ModelConst.NetLoadingModel, new NetLoadingModel()); - moduleBoardk.AddModel(ModelConst.MakeupStepModel, new MakeupStepModel()); - moduleBoardk.AddModel(ModelConst.MakeupRecordModel, new MakeupRecordModel()); - moduleBoardk.AddModel(ModelConst.FirstRewardModel, new FirstRewardModel()); + moduleBoardk.AddModel(ModelConst.FaqUIModel, new FaqUIModel()); moduleBoardk.AddModel(ModelConst.BroadcastModel, new BroadcastModel()); - moduleBoardk.AddModel(ModelConst.SheepPlayModel, new SheepPlayModel()); - moduleBoardk.AddModel(ModelConst.MenuModel, new MenuModel()); - moduleBoardk.AddModel(ModelConst.SettingModel, new SettingModel()); - moduleBoardk.AddModel(ModelConst.RegulationModel, new RegulationModel()); - moduleBoardk.AddModel(ModelConst.LevelSuccessModel, new LevelSuccessModel()); - moduleBoardk.AddModel(ModelConst.TipsViewModel, new TipsViewModel()); - moduleBoardk.AddModel(ModelConst.PayloadingModel, new PayloadingModel()); - moduleBoardk.AddModel(ModelConst.ResurgenceModel, new ResurgenceModel()); - moduleBoardk.AddModel(ModelConst.SaveingPotModel, new SaveingPotModel()); - moduleBoardk.AddModel(ModelConst.RecordViewModel, new RecordViewModel()); - moduleBoardk.AddModel(ModelConst.ThreeDaysGiftModel, new ThreeDaysGiftModel()); - moduleBoardk.AddModel(ModelConst.RewardMulNewModel, new RewardMulNewModel()); - } + + moduleBoardk.AddModel(ModelConst.MakeupConfirmModel, new MakeupConfirmModel()); + moduleBoardk.AddModel(ModelConst.SaveingPotModel, new SaveingPotModel()); + moduleBoardk.AddModel(ModelConst.RecordViewModel, new RecordViewModel()); + moduleBoardk.AddModel(ModelConst.FirstRewardModel, new FirstRewardModel()); + } public static void AutoRegisterUIType() { @@ -91,38 +80,16 @@ namespace BingoBrain moduleBoardk.AddUIType(UIConst.JTodUI, typeof(JTodUI)); moduleBoardk.AddUIType(UIConst.BasptUI, typeof(BasptUI)); moduleBoardk.AddUIType(UIConst.BingoToyUI, typeof(BingoToyUI)); - moduleBoardk.AddUIType(UIConst.H5UI, typeof(H5UI)); moduleBoardk.AddUIType(UIConst.StarRewardUI, typeof(StarRewardUI)); - moduleBoardk.AddUIType(UIConst.MakeupConfirmUI, typeof(MakeupConfirmUI)); moduleBoardk.AddUIType(UIConst.NetLoadingUI, typeof(NetLoadingUI)); - moduleBoardk.AddUIType(UIConst.MakeupStepUI, typeof(MakeupStepUI)); - moduleBoardk.AddUIType(UIConst.MakeupRecordUI, typeof(MakeupRecordUI)); - moduleBoardk.AddUIType(UIConst.FirstRewardUI, typeof(FirstRewardUI)); + moduleBoardk.AddUIType(UIConst.FaqUIUI, typeof(FaqUIUI)); moduleBoardk.AddUIType(UIConst.BroadcastUI, typeof(BroadcastUI)); - moduleBoardk.AddUIType(UIConst.SheepPlayUI, typeof(SheepPlayUI)); - moduleBoardk.AddUIType(UIConst.MenuUI, typeof(MenuUI)); - moduleBoardk.AddUIType(UIConst.SettingUI, typeof(SettingUI)); - moduleBoardk.AddUIType(UIConst.NewTaskUI, typeof(NewTaskUI)); - moduleBoardk.AddUIType(UIConst.GetTaskRewardUI, typeof(GetTaskRewardUI)); - moduleBoardk.AddUIType(UIConst.BuyslotUI, typeof(BuyslotUI)); - moduleBoardk.AddUIType(UIConst.RemakeUI, typeof(RemakeUI)); - moduleBoardk.AddUIType(UIConst.SheepwindowUI, typeof(SheepwindowUI)); - moduleBoardk.AddUIType(UIConst.PackrewardUI, typeof(PackrewardUI)); - moduleBoardk.AddUIType(UIConst.RegulationUI, typeof(RegulationUI)); - moduleBoardk.AddUIType(UIConst.LevelSuccessUI, typeof(LevelSuccessUI)); - moduleBoardk.AddUIType(UIConst.OpenGameUI, typeof(OpenGameUI)); - moduleBoardk.AddUIType(UIConst.RewardboxUI, typeof(RewardboxUI)); - moduleBoardk.AddUIType(UIConst.PassunlockUI, typeof(PassunlockUI)); - moduleBoardk.AddUIType(UIConst.AdcomingUI, typeof(AdcomingUI)); - moduleBoardk.AddUIType(UIConst.TipsViewUI, typeof(TipsViewUI)); - moduleBoardk.AddUIType(UIConst.PayloadingUI, typeof(PayloadingUI)); - moduleBoardk.AddUIType(UIConst.ResurgenceUI, typeof(ResurgenceUI)); - moduleBoardk.AddUIType(UIConst.SaveingPotUI, typeof(SaveingPotUI)); - moduleBoardk.AddUIType(UIConst.RecordViewUI, typeof(RecordViewUI)); - moduleBoardk.AddUIType(UIConst.ThreeDaysGiftUI, typeof(ThreeDaysGiftUI)); - moduleBoardk.AddUIType(UIConst.RewardMulNewUI, typeof(RewardMulNewUI)); - } + moduleBoardk.AddUIType(UIConst.MakeupConfirmUI, typeof(MakeupConfirmUI)); + moduleBoardk.AddUIType(UIConst.SaveingPotUI, typeof(SaveingPotUI)); + moduleBoardk.AddUIType(UIConst.RecordViewUI, typeof(RecordViewUI)); + moduleBoardk.AddUIType(UIConst.FirstRewardUI, typeof(FirstRewardUI)); + } public static void AutoRegisterCtrl() { @@ -157,35 +124,16 @@ namespace BingoBrain moduleBoardk.AddCtrl(CtrlConst.BasptCtrl, new BasptCtrl()); moduleBoardk.AddCtrl(CtrlConst.BingoToyCtrl, new BingoToyCtrl()); moduleBoardk.AddCtrl(CtrlConst.PrenterCtrl, new PrenterCtrl()); - moduleBoardk.AddCtrl(CtrlConst.H5Ctrl, new H5Ctrl()); moduleBoardk.AddCtrl(CtrlConst.StarRewardCtrl, new StarRewardCtrl()); - moduleBoardk.AddCtrl(CtrlConst.MakeupConfirmCtrl, new MakeupConfirmCtrl()); moduleBoardk.AddCtrl(CtrlConst.NetLoadingCtrl, new NetLoadingCtrl()); - moduleBoardk.AddCtrl(CtrlConst.MakeupStepCtrl, new MakeupStepCtrl()); - moduleBoardk.AddCtrl(CtrlConst.MakeupRecordCtrl, new MakeupRecordCtrl()); - moduleBoardk.AddCtrl(CtrlConst.FirstRewardCtrl, new FirstRewardCtrl()); + moduleBoardk.AddCtrl(CtrlConst.FaqUICtrl, new FaqUICtrl()); moduleBoardk.AddCtrl(CtrlConst.BroadcastCtrl, new BroadcastCtrl()); - moduleBoardk.AddCtrl(CtrlConst.SheepPlayCtrl, new SheepPlayCtrl()); - moduleBoardk.AddCtrl(CtrlConst.MenuCtrl, new MenuCtrl()); - moduleBoardk.AddCtrl(CtrlConst.SettingCtrl, new SettingCtrl()); - moduleBoardk.AddCtrl(CtrlConst.NewTaskCtrl, new NewTaskCtrl()); - moduleBoardk.AddCtrl(CtrlConst.GetTaskRewardCtrl, new GetTaskRewardCtrl()); - moduleBoardk.AddCtrl(CtrlConst.BuyslotCtrl, new BuyslotCtrl()); - moduleBoardk.AddCtrl(CtrlConst.RemakeCtrl, new RemakeCtrl()); - moduleBoardk.AddCtrl(CtrlConst.SheepwindowCtrl, new SheepwindowCtrl()); - moduleBoardk.AddCtrl(CtrlConst.PackrewardCtrl, new PackrewardCtrl()); - moduleBoardk.AddCtrl(CtrlConst.RegulationCtrl, new RegulationCtrl()); - moduleBoardk.AddCtrl(CtrlConst.LevelSuccessCtrl, new LevelSuccessCtrl()); - moduleBoardk.AddCtrl(CtrlConst.OpenGameCtrl, new OpenGameCtrl()); - moduleBoardk.AddCtrl(CtrlConst.TipsViewCtrl, new TipsViewCtrl()); - moduleBoardk.AddCtrl(CtrlConst.PayloadingCtrl, new PayloadingCtrl()); - moduleBoardk.AddCtrl(CtrlConst.ResurgenceCtrl, new ResurgenceCtrl()); - moduleBoardk.AddCtrl(CtrlConst.SaveingPotCtrl, new SaveingPotCtrl()); - moduleBoardk.AddCtrl(CtrlConst.RecordViewCtrl, new RecordViewCtrl()); - moduleBoardk.AddCtrl(CtrlConst.ThreeDaysGiftCtrl, new ThreeDaysGiftCtrl()); - moduleBoardk.AddCtrl(CtrlConst.RewardMulNewCtrl, new RewardMulNewCtrl()); - } + moduleBoardk.AddCtrl(CtrlConst.MakeupConfirmCtrl, new MakeupConfirmCtrl()); + moduleBoardk.AddCtrl(CtrlConst.SaveingPotCtrl, new SaveingPotCtrl()); + moduleBoardk.AddCtrl(CtrlConst.RecordViewCtrl, new RecordViewCtrl()); + moduleBoardk.AddCtrl(CtrlConst.FirstRewardCtrl, new FirstRewardCtrl()); + } public static void AutoRegisterUICtrl() { @@ -219,38 +167,16 @@ namespace BingoBrain moduleBoardk.AddUICtrl(UICtrlConst.JTodUICtrl, new JTodUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.BasptUICtrl, new BasptUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.BingoToyUICtrl, new BingoToyUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.H5UICtrl, new H5UICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.StarRewardUICtrl, new StarRewardUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.MakeupConfirmUICtrl, new MakeupConfirmUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.NetLoadingUICtrl, new NetLoadingUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.MakeupStepUICtrl, new MakeupStepUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.MakeupRecordUICtrl, new MakeupRecordUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.FirstRewardUICtrl, new FirstRewardUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.FaqUIUICtrl, new FaqUIUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.BroadcastUICtrl, new BroadcastUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.SheepPlayUICtrl, new SheepPlayUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.MenuUICtrl, new MenuUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.SettingUICtrl, new SettingUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.BuygoldUICtrl, new BuygoldUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.RegulationUICtrl, new RegulationUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.LevelSuccessUICtrl, new LevelSuccessUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.OpenGameUICtrl, new OpenGameUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.PackrewardUICtrl, new PackrewardUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.SheepwindowUICtrl, new SheepwindowUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.RemakeUICtrl, new RemakeUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.BuyslotUICtrl, new BuyslotUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.GetTaskRewardUICtrl, new GetTaskRewardUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.NewTaskUICtrl, new NewTaskUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.RewardboxUICtrl, new RewardboxUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.PassunlockUICtrl, new PassunlockUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.AdcomingUICtrl, new AdcomingUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.TipsViewUICtrl, new TipsViewUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.PayloadingUICtrl, new PayloadingUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.ResurgenceUICtrl, new ResurgenceUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.SaveingPotUICtrl, new SaveingPotUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.RecordViewUICtrl, new RecordViewUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.ThreeDaysGiftUICtrl, new ThreeDaysGiftUICtrl()); - moduleBoardk.AddUICtrl(UICtrlConst.RewardMulNewUICtrl, new RewardMulNewUICtrl()); - } + + + moduleBoardk.AddUICtrl(UICtrlConst.MakeupConfirmUICtrl, new MakeupConfirmUICtrl()); + moduleBoardk.AddUICtrl(UICtrlConst.SaveingPotUICtrl, new SaveingPotUICtrl()); + moduleBoardk.AddUICtrl(UICtrlConst.RecordViewUICtrl, new RecordViewUICtrl()); + moduleBoardk.AddUICtrl(UICtrlConst.FirstRewardUICtrl, new FirstRewardUICtrl()); + } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UIConst.cs b/Assets/BingoBrain/ModuleBoard/UIConst.cs index b57023d..9cf8828 100644 --- a/Assets/BingoBrain/ModuleBoard/UIConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UIConst.cs @@ -31,16 +31,16 @@ namespace BingoBrain public const string JTodUI = "JTodUI"; public const string BasptUI = "BasptUI"; public const string BingoToyUI = "BingoToyUI"; - public const string H5UI = "H5UI"; - public const string StarRewardUI = "StarRewardUI"; - public const string MakeupConfirmUI = "MakeupConfirmUI"; - public const string NetLoadingUI = "NetLoadingUI"; - public const string MakeupStepUI = " MakeupStepUI"; - public const string MakeupRecordUI = "MakeupRecordUI"; - public const string FirstRewardUI = "FirstRewardUI"; - public const string FaqUIUI = "FaqUIUI"; - public const string BroadcastUI = "BroadcastUI"; - public const string ADTaskUI = "ADTaskUI"; + public const string H5UI = "H5UI"; + public const string StarRewardUI = "StarRewardUI"; + public const string MakeupConfirmUI = "MakeupConfirmUI"; + public const string NetLoadingUI = "NetLoadingUI"; + public const string MakeupStepUI = " MakeupStepUI"; + public const string MakeupRecordUI = "MakeupRecordUI"; + public const string FirstRewardUI = "FirstRewardUI"; + public const string FaqUIUI = "FaqUIUI"; + public const string BroadcastUI = "BroadcastUI"; + public const string ADTaskUI = "ADTaskUI"; public const string BackgroundUI = "BackgroundUI"; public const string CurrencyUI = "CurrencyUI"; public const string FXWndUI = "FXWndUI"; @@ -73,34 +73,34 @@ namespace BingoBrain public const string SCTipsUI = "SCTipsUI"; public const string SignInUI = "SignInUI"; public const string TodoUI = "TodoUI"; - public const string MakeupRecord1UI = "MakeupRecord1UI"; - public const string RegulationUI = "RegulationUI"; + public const string MakeupRecord1UI = "MakeupRecord1UI"; + public const string RegulationUI = "RegulationUI"; - public const string PixPayUI = "PixPayUI"; + public const string PixPayUI = "PixPayUI"; - public const string ComFaqUI = "ComFaqUI"; - public const string SheepPlayUI = "SheepPlayUI"; - public const string BuyslotUI = "BuyslotUI"; - public const string RemakeUI = "RemakeUI"; - public const string SheepwindowUI = "SheepwindowUI"; - public const string LevelSuccessUI = "LevelSuccessUI"; - public const string CoinWnd_newUI = "CoinWnd_newUI"; - public const string RewardboxUI = "RewardboxUI"; - public const string NewTaskUI = "NewTaskUI"; - public const string GetTaskRewardUI = "GetTaskRewardUI"; - public const string BuygoldUI = "BuygoldUI"; - public const string OpenGameUI = "OpenGameUI"; - public const string AdcomingUI = "AdcomingUI"; - public const string PackrewardUI = "PackrewardUI"; - public const string PayloadingUI = "PayloadingUI"; - public const string PassunlockUI = "PassunlockUI"; + public const string ComFaqUI = "ComFaqUI"; + public const string SheepPlayUI = "SheepPlayUI"; + public const string BuyslotUI = "BuyslotUI"; + public const string RemakeUI = "RemakeUI"; + public const string SheepwindowUI = "SheepwindowUI"; + public const string LevelSuccessUI = "LevelSuccessUI"; + public const string CoinWnd_newUI = "CoinWnd_newUI"; + public const string RewardboxUI = "RewardboxUI"; + public const string NewTaskUI = "NewTaskUI"; + public const string GetTaskRewardUI = "GetTaskRewardUI"; + public const string BuygoldUI = "BuygoldUI"; + public const string OpenGameUI = "OpenGameUI"; + public const string AdcomingUI = "AdcomingUI"; + public const string PackrewardUI = "PackrewardUI"; + public const string PayloadingUI = "PayloadingUI"; + public const string PassunlockUI = "PassunlockUI"; - public const string SettingUI = "SettingUI"; + public const string SettingUI = "SettingUI"; public const string TipsViewUI = "TipsViewUI"; - public const string ResurgenceUI = "ResurgenceUI"; - public const string SaveingPotUI = "SaveingPotUI"; - public const string RecordViewUI = "RecordViewUI"; - public const string ThreeDaysGiftUI = "ThreeDaysGiftUI"; - public const string RewardMulNewUI = "RewardMulNewUI"; - } + public const string ResurgenceUI = "ResurgenceUI"; + public const string SaveingPotUI = "SaveingPotUI"; + public const string RecordViewUI = "RecordViewUI"; + public const string ThreeDaysGiftUI = "ThreeDaysGiftUI"; + public const string RewardMulNewUI = "RewardMulNewUI"; + } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs index 4c86485..30fc1d2 100644 --- a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs @@ -33,7 +33,6 @@ namespace BingoBrain public const string BingoToyUICtrl = "BingoToyUICtrl"; public const string H5UICtrl = "H5UICtrl"; public const string StarRewardUICtrl = "StarRewardUICtrl"; - public const string MakeupConfirmUICtrl = "MakeupConfirmUICtrl"; public const string NetLoadingUICtrl = "NetLoadingUICtrl"; public const string MakeupStepUICtrl = " MakeupStepUICtrl"; public const string MakeupRecordUICtrl = "MakeupRecordUICtrl"; @@ -60,10 +59,11 @@ namespace BingoBrain public const string AdcomingUICtrl = "AdcomingUICtrl"; public const string TipsViewUICtrl = "TipsViewUICtrl"; public const string PayloadingUICtrl = "BingoBoardUICtrl"; - public const string ResurgenceUICtrl = "ResurgenceUICtrl"; - public const string SaveingPotUICtrl = "SaveingPotUICtrl"; - public const string RecordViewUICtrl = "RecordViewUICtrl"; - public const string ThreeDaysGiftUICtrl = "ThreeDaysGiftUICtrl"; - public const string RewardMulNewUICtrl = "RewardMulNewUICtrl"; + public const string ResurgenceUICtrl = "ResurgenceUICtrl"; + public const string SaveingPotUICtrl = "SaveingPotUICtrl"; + public const string RecordViewUICtrl = "RecordViewUICtrl"; + public const string ThreeDaysGiftUICtrl = "ThreeDaysGiftUICtrl"; + public const string RewardMulNewUICtrl = "RewardMulNewUICtrl"; + public const string MakeupConfirmUICtrl = "MakeupConfirmUICtrl"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Adcoming.meta b/Assets/BingoBrain/ModuleUI/Adcoming.meta deleted file mode 100644 index 0b799ac..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3fb40ee181b6943beb2c958735eab6bd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingCtrl.cs b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingCtrl.cs deleted file mode 100644 index 2a9a3d0..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class AdcomingCtrl : BaseCtrl - { - public static AdcomingCtrl Instance { get; private set; } - - private AdcomingModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.AdcomingModel) as AdcomingModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingCtrl.cs.meta deleted file mode 100644 index bb03133..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c8bd042de9ef64e59b65fefb9788f71d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingModel.cs b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingModel.cs deleted file mode 100644 index 175e07e..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class AdcomingModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingModel.cs.meta b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingModel.cs.meta deleted file mode 100644 index eb4538d..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 29789969ee11944f8be5196fc0b81532 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUI.cs b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUI.cs deleted file mode 100644 index 5173a6e..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUI.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G008_reward_animal; -using DG.Tweening; - -namespace BingoBrain -{ - public class AdcomingUI : BaseUI - { - private AdcomingUICtrl ctrl; - private AdcomingModel model; - private FGUI.G008_reward_animal.com_adcoming ui; - - public AdcomingUI(AdcomingUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.AdcomingUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G008_reward_animal"; - uiInfo.assetName = "com_adcoming"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.AdcomingModel) as AdcomingModel; - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G008_reward_animal.com_adcoming; - } - - 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() - { - GameDispatcher.Instance.AddListener(GameMsg.pack_close, playAni); - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.pack_close, playAni); - } - #endregion - private int time = 5; - - //初始化页面逻辑 - private void InitView() - { - ui.time_text.text = time.ToString(); - - tweer = DOVirtual.Float(time, 0, time, value => { ui.time_text.text = ((int)value).ToString(); }); - tweer.onComplete += () => - { - CtrlCloseUI(); - GameHelper.ShowInterstitial("interstitial_gameend"); - }; - ui.btn_removead.SetClick(() => - { - PackRewardData param = new PackRewardData(); - param.isAutoPop = false; - param.isNeedScroll = true; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param); - tweer.Pause(); - }); - - } - private Tween tweer; - void playAni(object a) - { - tweer.Play(); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUI.cs.meta b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUI.cs.meta deleted file mode 100644 index 519c7f7..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dfe9a378b6c07410b91e71ce80c75a05 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUICtrl.cs b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUICtrl.cs deleted file mode 100644 index 686ba35..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class AdcomingUICtrl : BaseUICtrl - { - private AdcomingUI ui; - private AdcomingModel model; - - private uint openUIMsg = UICtrlMsg.AdcomingUI_Open; - private uint closeUIMsg = UICtrlMsg.AdcomingUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.AdcomingModel) as AdcomingModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new AdcomingUI(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/Adcoming/AdcomingUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUICtrl.cs.meta deleted file mode 100644 index c98e0e5..0000000 --- a/Assets/BingoBrain/ModuleUI/Adcoming/AdcomingUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dbf393f35eff5477da2f9c69a02c3822 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs index bcccea9..9c04e84 100644 --- a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs @@ -166,7 +166,7 @@ namespace BingoBrain GameHelper.GetVideo("reward_extraFlip", isSuccess => { - // if (isSuccess) + if (isSuccess) { var adwardModel = GameHelper.GetConfig(); MaxClickNum = Mathf.Clamp(MaxClickNum + adwardModel.GetData("reward_extraFlip").rewardAmount, diff --git a/Assets/BingoBrain/ModuleUI/BingoEnd/BingoEndUI.cs b/Assets/BingoBrain/ModuleUI/BingoEnd/BingoEndUI.cs index 37bd5c0..90089f8 100644 --- a/Assets/BingoBrain/ModuleUI/BingoEnd/BingoEndUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoEnd/BingoEndUI.cs @@ -50,20 +50,20 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { - FX.Instance.GetFx(Fx_Type.spine_reward, sk => - { - var skeletal = sk; - var goWrapper = new GoWrapper(skeletal.gameObject); - ui.com_endPop.gp_fx.SetNativeObject(goWrapper); - skeletal.transform.localScale = Vector3.one * 110; - skeletal.state.SetAnimation(0, "animation", true); - closeCb += () => - { - goWrapper.wrapTarget = null; - ui.com_endPop.gp_fx.SetNativeObject(null); - FX.Instance.RecFx(Fx_Type.spine_reward, skeletal); - }; - }); + // FX.Instance.GetFx(Fx_Type.spine_reward, sk => + // { + // var skeletal = sk; + // var goWrapper = new GoWrapper(skeletal.gameObject); + // ui.com_endPop.gp_fx.SetNativeObject(goWrapper); + // skeletal.transform.localScale = Vector3.one * 110; + // skeletal.state.SetAnimation(0, "animation", true); + // closeCb += () => + // { + // goWrapper.wrapTarget = null; + // ui.com_endPop.gp_fx.SetNativeObject(null); + // FX.Instance.RecFx(Fx_Type.spine_reward, skeletal); + // }; + // }); } protected override void OnOpen(object args) diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index 6e7cce8..45902cb 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -67,15 +67,15 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { InitView(); - if (!GameHelper.IsGiftSwitch() && (ConfigSystem.GetConfig().WVswitch == 1)) - { - ui.btn_h5.visible = true; - ui.btn_h5.GetChild("number_text").visible=false; - } - ui.btn_h5.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); - }); + // if (!GameHelper.IsGiftSwitch() && (ConfigSystem.GetConfig().WVswitch == 1)) + // { + // ui.btn_h5.visible = true; + // ui.btn_h5.GetChild("number_text").visible=false; + // } + // ui.btn_h5.SetClick(() => + // { + // UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); + // }); } @@ -109,7 +109,8 @@ namespace BingoBrain { ui.gift.selectedIndex = 1; (ui.btn_ballon as btn_balloon).gift.selectedIndex = 1; - }; + } + ; #if !UNITY_EDITOR ui.btn_admin.visible=false; #endif @@ -132,7 +133,7 @@ namespace BingoBrain OnCardNumChange(null); ui.com_cardnum.cont_state.selectedIndex = model.CardBoardCountIndex; ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex; - + ui.type.selectedIndex = model.CardBoardCountIndex; ui.btn_ballon.visible = !IsBallonCD; ui.btn_ballon.SetClick(OnClickBalloon); ui.btn_ballon.sortingOrder = 100; @@ -152,16 +153,16 @@ namespace BingoBrain SetMakeup(); ui.btn_admin.SetClick(() => { - MakeupTaskData makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - makeupTaskData.videoCount = 999999; - PreferencesMgr.Instance.MakeupTaskH5Time = 99999; - PreferencesMgr.Instance.Currency102 = 99999; - PreferencesMgr.Instance.Currency101 = 99999999; - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); + // MakeupTaskData makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); + // makeupTaskData.videoCount = 999999; + // PreferencesMgr.Instance.MakeupTaskH5Time = 99999; + // PreferencesMgr.Instance.Currency102 = 99999; + // PreferencesMgr.Instance.Currency101 = 99999999; + // GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); - makeupTaskData.videoCount = 99999; - PreferencesMgr.Instance.CoinMakeupTaskH5Time = 99999; + // makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); + // makeupTaskData.videoCount = 99999; + // PreferencesMgr.Instance.CoinMakeupTaskH5Time = 99999; }); ui.btn_set.SetClick(() => @@ -172,7 +173,22 @@ namespace BingoBrain { UICtrlDispatcher.Instance.Dispatch(SkinInfo.FaqUIUI_Open); }); - + ui.btn_cashout.SetClick(() => + { + var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); + var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + //DataMgr.Ticket.Value=99999; + //makeupTaskData.videoCount = 50; + if (vo == null) + { + return; + } + UICtrlDispatcher.Instance.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); + }); + ui.btn_saveingpot.SetClick(() => + { + UICtrlDispatcher.Instance.Dispatch(SkinInfo.SaveingPotUI_Open); + }); } private void UpdateNextCardBoardTime() @@ -304,13 +320,15 @@ namespace BingoBrain model.CardBoardCountIndex--; ui.com_cardnum.cont_state.selectedIndex = model.CardBoardCountIndex; ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex; - var animName = model.CardBoardCountIndex switch - { - 0 => "2_1", - 1 => "4_2", - _ => "" - }; - NAAVsa.PlayAnim(cardSpine, animName); + Debug.Log(model.CardBoardCountIndex); + ui.type.selectedIndex = model.CardBoardCountIndex; + // var animName = model.CardBoardCountIndex switch + // { + // 0 => "2_1", + // 1 => "4_2", + // _ => "" + // }; + // NAAVsa.PlayAnim(cardSpine, animName); } private void OnBtnAddClick() @@ -318,15 +336,15 @@ namespace BingoBrain model.CardBoardCountIndex++; ui.com_cardnum.cont_state.selectedIndex = model.CardBoardCountIndex; ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex; + ui.type.selectedIndex = model.CardBoardCountIndex; + // var animName = model.CardBoardCountIndex switch + // { + // 1 => "1_2", + // 2 => "2_4", + // _ => "" + // }; - var animName = model.CardBoardCountIndex switch - { - 1 => "1_2", - 2 => "2_4", - _ => "" - }; - - NAAVsa.PlayAnim(cardSpine, animName); + // NAAVsa.PlayAnim(cardSpine, animName); } private void OnCardNumChange(EventContext context) @@ -363,26 +381,26 @@ namespace BingoBrain { return; } - if (GameHelper.IsGiftSwitch()) - { - FX.Instance.SetFx(ui.gp_fx, Fx_Type.spine_choice_card_b, sk => - { - cardSpine = sk; + // if (GameHelper.IsGiftSwitch()) + // { + // FX.Instance.SetFx(ui.gp_fx, Fx_Type.spine_choice_card_b, sk => + // { + // cardSpine = sk; - NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); - OnChangeCardFinish(null); - }, CloseCb); - } - else - { - FX.Instance.SetFx(ui.gp_fx, Fx_Type.spine_choice_card, sk => - { - cardSpine = sk; + // NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); + // OnChangeCardFinish(null); + // }, CloseCb); + // } + // else + // { + // FX.Instance.SetFx(ui.gp_fx, Fx_Type.spine_choice_card, sk => + // { + // cardSpine = sk; - NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); - OnChangeCardFinish(null); - }, CloseCb); - } + // NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); + // OnChangeCardFinish(null); + // }, CloseCb); + // } } @@ -444,7 +462,7 @@ namespace BingoBrain } void SetMakeup(object a = null) { - if(!GameHelper.IsGiftSwitch()) return; + return; // var com_box = ui.com_box; // com_box.cont_white.selectedIndex = // GameHelper.IsGiftSwitch() ? com_box._White_none : com_box._White_white; @@ -469,19 +487,19 @@ namespace BingoBrain { - var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count); - Debug.Log(JsonConvert.SerializeObject(makeupTaskData)); - Debug.Log(ConfigSystem.GetConfig().GetCount()); - Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig())); + // var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); + // Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count); + // Debug.Log(JsonConvert.SerializeObject(makeupTaskData)); + // Debug.Log(ConfigSystem.GetConfig().GetCount()); + // Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig())); makeup vo = null; - foreach (makeup item in ConfigSystem.GetConfig().dataList) - { - Debug.Log(JsonConvert.SerializeObject(item)); - if (item.id == makeupTaskData.tableId) vo = item; - } + // foreach (makeup item in ConfigSystem.GetConfig().dataList) + // { + // Debug.Log(JsonConvert.SerializeObject(item)); + // if (item.id == makeupTaskData.tableId) vo = item; + // } // Debug.Log(ConfigSystem.GetConfig().GetData(0)); // Debug.Log(ConfigSystem.GetConfig().GetData(1)); // Debug.Log(ConfigSystem.GetConfig().GetData(2)); @@ -501,60 +519,60 @@ namespace BingoBrain // pbTxt.text = // $"{GameHelper.Get101Str((decimal)(vo.item_need - leftCash))}/{GameHelper.Get101Str((decimal)com_box.pb_num.max)}"; - ui.makeup.btn_cash.SetClick(() => - { - Debug.Log("999999999999999"); - // if (GameHelper.CanGuide() && !GuideCtrl.Instance.IsFinishGuide(1)) - // { - // GuideCtrl.Instance.Dispatch("ClickButton"); - // ui.com_box.finger_place.visible = false; - // } + // ui.makeup.btn_cash.SetClick(() => + // { + // Debug.Log("999999999999999"); + // // if (GameHelper.CanGuide() && !GuideCtrl.Instance.IsFinishGuide(1)) + // // { + // // GuideCtrl.Instance.Dispatch("ClickButton"); + // // ui.com_box.finger_place.visible = false; + // // } - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - }); + // uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); + // }); } { - if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0) - { + // if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0) + // { - BingoDataSystem.CheckCoinMakeupTaskData(); - //PreferencesMgr.Instance.MakeupTaskHistory.Add(new MakeupTaskData()); - //Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count); - } + // BingoDataSystem.CheckCoinMakeupTaskData(); + // //PreferencesMgr.Instance.MakeupTaskHistory.Add(new MakeupTaskData()); + // //Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count); + // } - var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); - var vo = ConfigSystem.GetConfig().dataList - .FirstOrDefault(cardNew => cardNew.id == makeupTaskData.tableId); - Debug.Log(JsonConvert.SerializeObject(vo)); - DOVirtual.Float(0, PreferencesMgr.Instance.Currency101, 1, - value => { ui.makeup.gold_text.text = ((int)value).ToString(); }); - ui.makeup.gold_progress_text.text = PreferencesMgr.Instance.Currency101 + "/" + vo.item_need; - ui.makeup.gold_progress.value = ((float)PreferencesMgr.Instance.Currency101 * 100) / vo.item_need; - Debug.Log(((float)PreferencesMgr.Instance.Currency101) / vo.item_need); - ui.makeup.coin_cash.text = "$" + vo.redeem_num; - ui.makeup.btn_goldout.SetClick(() => - { - Debug.Log(PreferencesMgr.Instance.Currency101); - Debug.Log(vo.item_need); - if (makeupTaskData.status == MakeupTaskStatus.None) - { - if (PreferencesMgr.Instance.Currency101 >= vo.item_need) - { - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - } - else - { - GameHelper.ShowTips("Not enough", true); - } - } - else - { - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - } - }); + // var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); + // var vo = ConfigSystem.GetConfig().dataList + // .FirstOrDefault(cardNew => cardNew.id == makeupTaskData.tableId); + // Debug.Log(JsonConvert.SerializeObject(vo)); + // DOVirtual.Float(0, PreferencesMgr.Instance.Currency101, 1, + // value => { ui.makeup.gold_text.text = ((int)value).ToString(); }); + // ui.makeup.gold_progress_text.text = PreferencesMgr.Instance.Currency101 + "/" + vo.item_need; + // ui.makeup.gold_progress.value = ((float)PreferencesMgr.Instance.Currency101 * 100) / vo.item_need; + // Debug.Log(((float)PreferencesMgr.Instance.Currency101) / vo.item_need); + // ui.makeup.coin_cash.text = "$" + vo.redeem_num; + // ui.makeup.btn_goldout.SetClick(() => + // { + // Debug.Log(PreferencesMgr.Instance.Currency101); + // Debug.Log(vo.item_need); + // if (makeupTaskData.status == MakeupTaskStatus.None) + // { + // if (PreferencesMgr.Instance.Currency101 >= vo.item_need) + // { + // uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); + // } + // else + // { + // GameHelper.ShowTips("Not enough", true); + // } + // } + // else + // { + // uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); + // } + // }); } - (ui.btn_ballon as btn_balloon).cash_text.text = GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102).ToString("0.00"); + (ui.btn_ballon as btn_balloon).cash_text.text = GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102).ToString("0.00"); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs b/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs index fc4591e..b56b586 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHalld/BingoHalldUI.cs @@ -71,13 +71,13 @@ namespace BingoBrain protected override void AddListener() { //Hall.Instance.AddChangeGiftSwitch(InitView); - //GameDispatcher.Instance.AddListener(BingoInfo.MainTab, OnGameTab); + GameDispatcher.Instance.AddListener(BingoInfo.MainTab, OnGameTab); } protected override void RemoveListener() { //Hall.Instance.RemoveChangeGiftSwitch(InitView); - // GameDispatcher.Instance.RemoveListener(BingoInfo.MainTab, OnGameTab); + GameDispatcher.Instance.RemoveListener(BingoInfo.MainTab, OnGameTab); } #endregion @@ -91,13 +91,13 @@ namespace BingoBrain ui.com_di.btn_main.SetClickDownEffect(0.8f, 1); ui.com_di.btn_tab_redem.SetClickDownEffect(0.8f, 1); ui.com_di.btn_hall.SetClickDownEffect(0.8f, 1); - ui.com_di.btn_h5.SetClickDownEffect(0.8f, 1); - - ui.com_di.btn_h5.SetClick(OnClickMallTab); + ui.com_di.btn_shop.SetClickDownEffect(0.8f, 1); + ui.com_di.btn_fight.SetClickDownEffect(0.8f, 1); + ui.com_di.btn_shop.SetClick(OnClickMallTab); ui.com_di.btn_main.SetClick(OnClickMainTab); ui.com_di.btn_tab_redem.SetClick(OnClickRedeemTab); ui.com_di.btn_hall.SetClick(OnClickHall); - + ui.com_di.btn_fight.SetClick(OnClickfight); if (GameHelper.IsGiftSwitch() && Random.Range(0, 100) < ConfigSystem.GetConfig().loginhallrate && (PlayerPrefs.GetInt("first_", 0) == 1)) { OnClickHall(); @@ -130,6 +130,11 @@ namespace BingoBrain { OnGameTab(3); + } + public void OnClickfight() + { + OnGameTab(4); + } public void OnGameTab(object obj) { @@ -144,9 +149,9 @@ namespace BingoBrain private void OnChangeTab(int tabIndex) { ui.com_di.btn_main.cont_select.selectedIndex = tabIndex == 0 ? btn_main.Select_select : btn_main.Select_none; - ui.com_di.btn_h5.cont_select.selectedIndex = tabIndex == 1 ? btn_h5.Select_select : btn_h5.Select_none; + ui.com_di.btn_shop.cont_select.selectedIndex = tabIndex == 1 ? btn_h5.Select_select : btn_h5.Select_none; ui.com_di.btn_tab_redem.cont_select.selectedIndex = tabIndex == 2 ? btn_todo.Select_select : btn_todo.Select_none; - ui.com_di.btn_hall.cont_select.selectedIndex = tabIndex == 3 ? btn_todo.Select_select : btn_todo.Select_none; + ui.com_di.btn_fight.cont_select.selectedIndex = tabIndex == 4 ? btn_todo.Select_select : btn_todo.Select_none; } private void OnClickTab(int tabIndex) @@ -155,6 +160,7 @@ namespace BingoBrain UICtrlDispatcher.Instance.Dispatch(tabIndex == 0 ? SkinInfo.BingoHallUI_Open : SkinInfo.BingoHallUI_Close); UICtrlDispatcher.Instance.Dispatch(tabIndex == 2 ? SkinInfo.BasptUI_Open : SkinInfo.BasptUI_Close); UICtrlDispatcher.Instance.Dispatch(tabIndex == 3 ? SkinInfo.H5UI_Open : SkinInfo.H5UI_Close); + ui.show_fight.selectedIndex = tabIndex == 4 ? 1 :0; UICtrlDispatcher.Instance.Dispatch(SkinInfo.SmailUI_Open); UICtrlDispatcher.Instance.Dispatch(SkinInfo.BottomUI_Open); Battle.Instance.SetBg(true); diff --git a/Assets/BingoBrain/ModuleUI/BingoStart/BingoStartUI.cs b/Assets/BingoBrain/ModuleUI/BingoStart/BingoStartUI.cs index 0e2413e..0996976 100644 --- a/Assets/BingoBrain/ModuleUI/BingoStart/BingoStartUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoStart/BingoStartUI.cs @@ -134,7 +134,7 @@ namespace BingoBrain Set102(); if (GameHelper.IsGiftSwitch()) { - (ui.btn_cash as com_102).gift.selectedIndex = 1; + (ui.btn_cash as btn_102).gift.selectedIndex = 1; (ui.btn_ballon as btn_balloon).gift.selectedIndex = 1; } @@ -387,7 +387,7 @@ namespace BingoBrain item.scale = Vector2.one; item.alpha = 1; // item.position = new Vector2(5, -140); - item.displayObject.gameObject.transform.localPosition = new Vector3(5, -140); + item.displayObject.gameObject.transform.localPosition = new Vector3(1100, -42); var localPos = GameHelper.FguiToUnityLocalPot(showComNumPot[4]); item.displayObject.gameObject.transform.DOLocalMoveX(localPos.x, aniTime).SetEase(Ease.Linear); diff --git a/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs b/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs index cc0b580..6944c4c 100644 --- a/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs @@ -4,6 +4,8 @@ using DG.Tweening; using BingoBrain.Core; using FGUI.JWheel; using System.Collections.Generic; +using Spine.Unity; +using Newtonsoft.Json; namespace BingoBrain { @@ -18,6 +20,7 @@ namespace BingoBrain private bool isClickSpin; private Action CloseCb; private ParticleSystem fx_zhuangpan_enter; + private SkeletonAnimation wheel_ani; public BingoToyUI(BingoToyUICtrl ctrl) : base(ctrl) { @@ -57,13 +60,18 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { Audio.Instance.PlayDynamicEffect("pop_open"); - FX.Instance.SetFx(ui.gp_Fx, Fx_Type.fx_zhuangpan_enter, ps => - { - fx_zhuangpan_enter = ps; - fx_zhuangpan_enter.gameObject.SetActive(false); - }, CloseCb); - FX.Instance.SetFx(ui.com_wheels.gp_Select, Fx_Type.fx_zhuanpan_Select, - ps => { ps.transform.localPosition = new Vector3(0, 195, 0); }, CloseCb); + // FX.Instance.SetFx(ui.gp_Fx, Fx_Type.fx_zhuangpan_enter, ps => + // { + // fx_zhuangpan_enter = ps; + // fx_zhuangpan_enter.gameObject.SetActive(false); + // }, CloseCb); + FX.Instance.SetFx(ui.gp_Fx, Fx_Type.fx_wheel, + ps => + { + // ps.transform.localPosition = new Vector3(0, 195, 0); + wheel_ani = ps; + NAAVsa.PlayAnim(wheel_ani, "daiji", true); + }, CloseCb); ui.com_wheels.gp_Select.visible = false; @@ -115,21 +123,21 @@ namespace BingoBrain // PreferencesMgr.Instance.VidelWheelLst.Count < turntableModel.GetCount()) // { Debug.Log("????????????????ttttttttttttttttt"); - PreferencesMgr.Instance.FerrWheelLst.Clear(); - PreferencesMgr.Instance.VidelWheelLst.Clear(); - var list = turntableModel.GetDataList(); - foreach (var item in list) - { - PreferencesMgr.Instance.FerrWheelLst.Add( - item.quantityA[GameHelper.GetDynamicIndex(item.wheel_itemA)]); - PreferencesMgr.Instance.VidelWheelLst.Add( - item.quantityB[GameHelper.GetDynamicIndex(item.wheel_itemB)]); - } + PreferencesMgr.Instance.FerrWheelLst.Clear(); + PreferencesMgr.Instance.VidelWheelLst.Clear(); + var list = turntableModel.GetDataList(); + foreach (var item in list) + { + PreferencesMgr.Instance.FerrWheelLst.Add( + item.quantityA[GameHelper.GetDynamicIndex(item.wheel_itemA)]); + PreferencesMgr.Instance.VidelWheelLst.Add( + item.quantityB[GameHelper.GetDynamicIndex(item.wheel_itemB)]); + } - PreferencesMgr.Instance.SaveFerrWheelLst(); - PreferencesMgr.Instance.SaveVidelWheelLst(); - PreferencesMgr.Instance.WheelVersion = GameHelper.GetDynamicVersion(); - // } + PreferencesMgr.Instance.SaveFerrWheelLst(); + PreferencesMgr.Instance.SaveVidelWheelLst(); + PreferencesMgr.Instance.WheelVersion = GameHelper.GetDynamicVersion(); + // } } protected override void OnOpen(object args) @@ -144,10 +152,11 @@ namespace BingoBrain private void RefreshUI(object o = null) { var turntableModel = GameHelper.GetConfig(); + for (var i = 0; i < com_RewardLst.Count; i++) { var rewards = com_RewardLst[i]; - if (GameHelper.IsGiftSwitch()) rewards.gift.selectedIndex = 1; + if (GameHelper.IsGiftSwitch()) rewards.gift.selectedIndex = 1; var turntable = turntableModel.GetData(i + 1); int id; string val; @@ -161,6 +170,10 @@ namespace BingoBrain else { id = turntable.wheel_itemB; + if(id == 101) + { + PreferencesMgr.Instance.VidelWheelLst[i]=MathF.Ceiling(PreferencesMgr.Instance.VidelWheelLst[i]); + } val = id == 102 ? GameHelper.Get102Str((decimal)PreferencesMgr.Instance.VidelWheelLst[i]) : PreferencesMgr.Instance.VidelWheelLst[i].ToString(); @@ -213,7 +226,6 @@ namespace BingoBrain ui.btn_spin.grayed = true; ui.com_Spinn.touchable = false; ui.com_Spinn.cont_spin.selectedIndex = com_spin.Spin_grey; - ui.closeButton.touchable = false; ui.com_wheels.rotation = 0; var index = PreferencesMgr.Instance.IsOnceWheel ? GlobalHarmony.RandomWeight(freeWeight) @@ -222,9 +234,9 @@ namespace BingoBrain var turntableModel = GameHelper.GetConfig(); var vo = turntableModel.GetData(index + 1); - var angle = UnityEngine.Random.Range(3600 - (vo.Seq - 1) * 45 - 10, 3600 - (vo.Seq - 1) * 45 + 10) + - 22.5f; - + var angle = UnityEngine.Random.Range(3600 - (vo.Seq - 1) * 45, 3600 - (vo.Seq - 1) * 45) + ; + NAAVsa.PlayAnim(wheel_ani, "zhuandong", true); Audio.Instance.PlayDynamicEffect("wheel_spin"); ui.fx_zhen.Play(); DOTween.To(() => ui.com_wheels.rotation, (e) => ui.com_wheels.rotation = e, angle, model.animationTime) @@ -237,10 +249,10 @@ namespace BingoBrain private void OpenReceivePlane(Turntable vo) { ui.fx_zhen.Stop(); - ui.img_zhen.rotation = 0; + // ui.img_zhen.rotation = 0; ui.com_wheels.gp_Select.visible = true; ui.com_wheels.gp_Select.rotation = (vo.Seq - 2) * 45 + 22.5f; - + NAAVsa.PlayAnim(wheel_ani, "zhongjiang", true); DOVirtual.DelayedCall(1.5f, () => { ui.com_wheels.gp_Select.visible = false; @@ -252,12 +264,13 @@ namespace BingoBrain ui.btn_spin.grayed = false; ui.closeButton.grayed = false; ui.com_Spinn.cont_spin.selectedIndex = com_spin.Spin_none; + NAAVsa.PlayAnim(wheel_ani, "daiji", true); if (PreferencesMgr.Instance.IsOnceWheel) { - ui.closeButton.touchable = false; - ui.btn_spin.touchable = false; + // ui.closeButton.touchable = false; + // ui.btn_spin.touchable = false; ui.com_Spinn.touchable = false; - ui.btn_spin.grayed = true; + // ui.btn_spin.grayed = true; GameHelper.GetRewardExtra(vo.wheel_itemA, (decimal)PreferencesMgr.Instance.FerrWheelLst[vo.Seq - 1], vo.cont_index, isCompleted => @@ -285,6 +298,7 @@ namespace BingoBrain ui.btn_spin.grayed = false; Audio.Instance.PlayDynamicEffect("wheel_show"); })); + }); } else diff --git a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs index 41c85e6..f8e90aa 100644 --- a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs +++ b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs @@ -9,6 +9,7 @@ using Spine.Unity; using BingoBrain.Core; using FGUI.ACommon; using FairyGUI; +using BingoBrain.HotFix; namespace BingoBrain { @@ -28,7 +29,7 @@ namespace BingoBrain { uiInfo.packageName = "ACommon"; uiInfo.assetName = "com_broadcast1"; - uiInfo.layerType = UILayerType.Popup; + uiInfo.layerType = UILayerType.Normal; uiInfo.isNeedOpenAnim = false; uiInfo.isNeedCloseAnim = false; uiInfo.isNeedUIMask = false; @@ -76,8 +77,8 @@ namespace BingoBrain // ConfigSystem.GetConfig().dataList[0] config_name_list = exBrPoolModel.config_name_list; config_money_list = exBrPoolModel.config_money_list; - GameDispatcher.Instance.AddListener(GameMsg.hideBroadCast, hideEvent); - GameDispatcher.Instance.AddListener(GameMsg.showBroadCast, showEvent); + // GameDispatcher.Instance.AddListener(GameMsg.hideBroadCast, hideEvent); + // GameDispatcher.Instance.AddListener(GameMsg.showBroadCast, showEvent); // UICtrlDispatcher.Instance.AddListener(UICtrlMsg.MainUI_Open, Settop); // UICtrlDispatcher.Instance.AddListener(UICtrlMsg.RainPlayUI_Open, Setbuttom); } @@ -137,7 +138,7 @@ namespace BingoBrain private void OpenRecord() { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RecordViewUI_Open); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.RecordViewUI_Open); } private void hideEvent(object sender = null) { @@ -214,7 +215,7 @@ namespace BingoBrain ui.t1.Play(); }); string str = name + "-" + config_money_list[money_index] + "-" + DateTimeBoardk.Instance.GetCurrDateTime(); - GameDispatcher.Instance.Dispatch(GameMsg.updateRecordList, str); + GameDispatcher.Instance.Dispatch(BingoInfo.updateRecordList, str); } diff --git a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUICtrl.cs b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUICtrl.cs index 651aec6..86d3784 100644 --- a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUICtrl.cs +++ b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUICtrl.cs @@ -11,8 +11,8 @@ namespace BingoBrain private BroadcastUI ui; private BroadcastModel model; - private uint openUIMsg = UICtrlMsg.BroadcastUI_Open; - private uint closeUIMsg = UICtrlMsg.BroadcastUI_Close; + private uint openUIMsg = SkinInfo.BroadcastUI_Open; + private uint closeUIMsg = SkinInfo.BroadcastUI_Close; #region 生命周期 protected override void OnInit() diff --git a/Assets/BingoBrain/ModuleUI/Buygold.meta b/Assets/BingoBrain/ModuleUI/Buygold.meta deleted file mode 100644 index 73a6b1b..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b5ee8e7c4872b428b8efc7420ec10edc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldCtrl.cs b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldCtrl.cs deleted file mode 100644 index a23b276..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class BuygoldCtrl : BaseCtrl - { - public static BuygoldCtrl Instance { get; private set; } - - private BuygoldModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.BuygoldModel) as BuygoldModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldCtrl.cs.meta deleted file mode 100644 index 1cd436b..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2342594a3679d4cc3871150e477d7ffb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldModel.cs b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldModel.cs deleted file mode 100644 index d690fc5..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class BuygoldModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldModel.cs.meta b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldModel.cs.meta deleted file mode 100644 index c49595c..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 14fccb4c1b1fb4e7188a1c7a070629dc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUI.cs b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUI.cs deleted file mode 100644 index e84fb16..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUI.cs +++ /dev/null @@ -1,394 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G012_openReward_animal; -using FGUI.G003_play_animal; -using System; -using DG.Tweening; -using Newtonsoft.Json; -using BingoBrain.HotFix; -using DontConfuse; - -namespace BingoBrain -{ - public class BuygoldUI : BaseUI - { - private BuygoldUICtrl ctrl; - private BuygoldModel model; - private FGUI.G012_openReward_animal.com_buygold ui; - - - public BuygoldUI(BuygoldUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.BuygoldUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G012_openReward_animal"; - uiInfo.assetName = "com_buygold"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.BuygoldModel) as BuygoldModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - Hall.Instance.UpdateSecondEvent -= initList; - Hall.Instance.UpdateSecondEvent -= upWatchAdsBtn; - WebviewManager.Instance.SetDarkThough(true); - - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G012_openReward_animal.com_buygold; - } - - protected override void OnOpenBefore(object args) - { - - - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.top_gold.y += Screen.safeArea.y - 15; - } - - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.gold_show, 1); - - WebviewManager.Instance.SetDarkThough(false); - - ui.top_gold.GetChild("number_text").text = GameHelper.Get101Str(GameHelper.GetGoldNumber()); - ui.pay_type.selectedIndex = !GameHelper.IsAdModelOfPay() ? 1 : 0; - - InitView(); - - - Hall.Instance.UpdateSecondEvent += initList; - Hall.Instance.UpdateSecondEvent += upWatchAdsBtn; - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - } - #endregion - - void GetAward(decimal gold, int index) - { - var item = ui.list.GetChildAt(index); - var start = GameHelper.GetUICenterPosition(item); - var end = GameHelper.GetUICenterPosition(ui.top_gold.GetChild("number_text")); - - var rewardData = new RewardData(); - var rewardSingleData = new Goda(101, gold, RewardOrigin.BuyGold) - { - startPosition = start, - endPosition = end - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted((isScu) => - { - DOVirtual.DelayedCall(0.5f, () => - { - var startNum = PreferencesMgr.Instance.Currency101 - gold; - DOVirtual.Float((float)startNum, (float)GameHelper.GetGoldNumber(), 1f, - value => { ui.top_gold.GetChild("number_text").text = GameHelper.Get101Str((decimal)value); }); - }); - }); - - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - } - - void pay_success(object str) - { - string type = (string)str; - string purch_number = ""; - - if (type.StartsWith("buy_gold")) - { - int startIndex = "buy_gold".Length; - string suffix = type[startIndex..]; // 截取 "gold" 后的所有字符 - int suffix_num = int.Parse(suffix); - - SaveData.GetSaveobject()._goldtime[suffix_num] = (int)GameHelper.GetNowTime(); - SaveData.saveDataFunc(); - GetAward(list[suffix_num].Actual_coins, suffix_num); - purch_number = list[suffix_num].Payment_amount.ToString(); - } - - // if (purch_number != "") - // { - // GameHelper.SendRevenueToAF(purch_number); - // } - SetTextString(); - } - - //初始化页面逻辑 - private void InitView() - { - - ui.top_gold.touchable = false; - ui.btn_close.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Close); }); - - initList(); - upWatchAdsBtn(); - - - ui.btn_watch.SetClick(() => - { - - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.gold_click_ad, 1); - - GameHelper.ShowVideoAd("BuyGold", (issuccess) => - { - if (issuccess) - { - var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); - SaveData.GetSaveobject().look_ad_time = ad_times + GameHelper.GetCommonModel().exchangeCD; - initList(); - } - }); - }); - } - private List list = ConfigSystem.GetConfig().dataList; - - void initList() - { - ui.list.itemRenderer = setRemaintime; - ui.list.numItems = list.Count; - - SetTextString(); - - - } - - public void upWatchAdsBtn() - { - var lastTimes = SaveData.GetSaveobject().look_ad_time; - ui.btn_watch.img_saveingpot.visible = false; - if (GameHelper.GetNowTime() < lastTimes) - { - ui.btn_watch.enabled = false; - ui.btn_watch.can_buy.selectedIndex = 1; - ui.btn_watch.btn_text.text = GameHelper.TimeFormat(lastTimes - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - } - else - { - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) ui.btn_watch.img_saveingpot.visible = true; - ui.btn_watch.enabled = true; - ui.btn_watch.can_buy.selectedIndex = 0; - } - - } - - public void SetTextString() - { - var myAds = SaveData.GetSaveobject().look_ad_numbers; - ui.text_have.text = "Owner ADs: " + SaveData.GetSaveobject().look_ad_numbers; - } - - void setRemaintime(int index, GObject obj) - { - buygold_item item = (buygold_item)obj; - - int time = 0; - time = SaveData.GetSaveobject()._goldtime[index]; - - item.coin_text.text = GameHelper.Get101Str(list[index].Actual_coins); - item.index.selectedIndex = index > 4 ? 4 : index; - item.btn_buy.img_saveingpot.visible = false; - item.off_text.text = list[index].Discount_rate + "%"; - item.discount.visible = !GameHelper.IsAdModelOfPay() && list[index].Discount_rate > 0; - item.btn_buy.img_saveingpot.visible = false; - if (time + list[index].receive_CD < GameHelper.GetNowTime()) - { - if (index == 0) - { - item.btn_buy.btn_text.text = "Free"; - item.discount.visible = false; - item.btn_buy.y = 331; - - item.need_text.visible = true; - - } - else - { - if (!GameHelper.IsAdModelOfPay()) - { - decimal price = (decimal)list[index].Payment_amount2; - item.btn_buy.btn_text.text = GameHelper.Get102Str(price); - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) item.btn_buy.img_saveingpot.visible = true; - item.need_text.visible = false; - item.btn_buy.y = 364; - } - else - { - item.btn_buy.btn_text.text = "Exchange"; - double gold_price1 = list[index].Payment_amount; - int needAds = (int)Math.Ceiling(gold_price1); - item.need_text.SetVar("num", needAds.ToString()).FlushVars(); - } - } - - item.btn_buy.can_buy.selectedIndex = 0; - item.btn_buy.SetClick(() => - { - if (index == 0) - { - SaveData.GetSaveobject()._goldtime[0] = (int)GameHelper.GetNowTime(); - SaveData.saveDataFunc(); - GetAward(list[index].Actual_coins, 0); - - InitView(); - } - else - { - redeem_Gold(index); - } - }); - - } - else - { - item.btn_buy.can_buy.selectedIndex = 1; - if (!GameHelper.IsAdModelOfPay()) - { - item.need_text.visible = false; - item.btn_buy.y = 364; - } - else - { - double gold_price1 = list[index].Payment_amount; - int needAds = (int)Math.Ceiling(gold_price1); - item.need_text.SetVar("num", needAds.ToString()).FlushVars(); - } - item.btn_buy.btn_text.text = GameHelper.TimeFormat(time + list[index].receive_CD - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - item.btn_buy.SetClick(() => - { - - }); - } - - - } - - private void redeem_Gold(int index) - { - string _type = "buy_gold" + index.ToString(); - if (GameHelper.IsAdModelOfPay()) - { - if (SaveData.GetSaveobject().look_ad_numbers >= list[index].Payment_amount) - { - ApplePayClass test = new() - { - sku = _type, - }; - SaveData.GetSaveobject().look_ad_numbers -= (int)list[index].Payment_amount; - PurchasingManager.Instance.Purchase(PurchasingManager.pack_reward, test); - string eventName = $"gold_success_{index}"; - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, eventName, 1); - } - else - { - GameHelper.ShowTips("Your AD count is insufficient!"); - } - } - else - { - decimal price = (decimal)list[index].Payment_amount2; - MaxPayClass maxPayData = new() - { - amount = (int)Math.Round(price * 100), - sku = _type, - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - } - } - } - public static partial class GameMsg - { - private static uint Cursor_BASE = 55555; - public static readonly uint OpenGame = ++Cursor_BASE; - public static readonly uint Update111Completed = ++Cursor_BASE; - public static readonly uint BackMainScene = ++Cursor_BASE; - public static readonly uint Update101Completed = ++Cursor_BASE; - public static readonly uint Update102Completed = ++Cursor_BASE; - public static uint Slot_refresh = ++Cursor_BASE; - public static uint Remake_state = ++Cursor_BASE; - public static readonly uint MakeupSuccess = ++Cursor_BASE; - - public static uint Ad_success = ++Cursor_BASE; - public static uint UpdateHotFixMax = ++Cursor_BASE; - public static uint UpdateHotFixProgress = ++Cursor_BASE; - public static readonly uint RefreshTodoUI = ++Cursor_BASE; - public static readonly uint RefreshMakeupData = ++Cursor_BASE; - public static uint Gold_refresh = ++Cursor_BASE; - public static uint Sheep_item_refresh = ++Cursor_BASE; - public static uint card_click = ++Cursor_BASE; - - public static uint RefreshADTask = ++Cursor_BASE; - - public static readonly uint ProcessReward = ++Cursor_BASE; - - public static readonly uint Update101 = ++Cursor_BASE; - public static readonly uint Update102 = ++Cursor_BASE; - public static readonly uint MakeUpConfirmUIClosed = ++Cursor_BASE; - - public static readonly uint Update111 = ++Cursor_BASE; - public static uint reset_game = ++Cursor_BASE; - public static uint GetTaskReward = ++Cursor_BASE; - public static uint pack_close = ++Cursor_BASE; - public static uint RefreshRedDot = ++Cursor_BASE; - public static uint resetH5progress = ++Cursor_BASE; - public static uint RefreshGame = ++Cursor_BASE; - public static uint apple_pay_success = ++Cursor_BASE; - public static readonly uint H5ViewClickBtn = ++Cursor_BASE; - public static uint hideBroadCast = ++Cursor_BASE; - public static uint showBroadCast = ++Cursor_BASE; - public static uint backHall = ++Cursor_BASE; - public static uint sendLog = ++Cursor_BASE; - public static uint checkGameState = ++Cursor_BASE; - public static uint Network_reconnection = ++Cursor_BASE; - public static uint resurgence = ++Cursor_BASE; - public static uint resurgence_close = ++Cursor_BASE; - public static uint RefreshSaveingPot = ++Cursor_BASE; - public static uint updateRecordList = ++Cursor_BASE; - public static uint rewardMul_close = ++Cursor_BASE; - public static uint ThreeDaysGiftUIClose = ++Cursor_BASE; - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUI.cs.meta b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUI.cs.meta deleted file mode 100644 index aa4fd27..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7de4ee29003a34adbb4ff4e0c97ed52c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUICtrl.cs b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUICtrl.cs deleted file mode 100644 index 78be2d0..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class BuygoldUICtrl : BaseUICtrl - { - private BuygoldUI ui; - private BuygoldModel model; - - private uint openUIMsg = UICtrlMsg.BuygoldUI_Open; - private uint closeUIMsg = UICtrlMsg.BuygoldUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.BuygoldModel) as BuygoldModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new BuygoldUI(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/Buygold/BuygoldUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUICtrl.cs.meta deleted file mode 100644 index 38e4882..0000000 --- a/Assets/BingoBrain/ModuleUI/Buygold/BuygoldUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bfad94d0fa70d40bd8308f8fb11b9520 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buyslot.meta b/Assets/BingoBrain/ModuleUI/Buyslot.meta deleted file mode 100644 index 23f3a9f..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f00fc915c8def4400a78c058b49d0ede -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotCtrl.cs b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotCtrl.cs deleted file mode 100644 index 54c7e3a..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class BuyslotCtrl : BaseCtrl - { - public static BuyslotCtrl Instance { get; private set; } - - private BuyslotModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.BuyslotModel) as BuyslotModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotCtrl.cs.meta deleted file mode 100644 index 6fc7959..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b6058e09514454ec394a1478f2775964 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotModel.cs b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotModel.cs deleted file mode 100644 index ffb8423..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class BuyslotModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotModel.cs.meta b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotModel.cs.meta deleted file mode 100644 index 8a180bb..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1b0a4fbab97e64d5b982896192bb6483 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUI.cs b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUI.cs deleted file mode 100644 index 2954a70..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUI.cs +++ /dev/null @@ -1,182 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G006_menu_animal; -using FGUI.Common_animal; -using System; - -namespace BingoBrain -{ - public class BuyslotUI : BaseUI - { - private BuyslotUICtrl ctrl; - private BuyslotModel model; - private FGUI.G006_menu_animal.com_buyslot ui; - - public BuyslotUI(BuyslotUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.BuyslotUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G006_menu_animal"; - uiInfo.assetName = "com_buyslot"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.BuyslotModel) as BuyslotModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G006_menu_animal.com_buyslot; - } - - protected override void OnOpenBefore(object args) - { - InitView(); - GameHelper.showGameUI = false; - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event,BuriedPointEvent.buy_one_show,1); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - Hall.Instance.UpdateSecondEvent += InitView; - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - Hall.Instance.UpdateSecondEvent -= InitView; - } - #endregion - void pay_success(object str) - { - string type = (string)str; - - if (type == PurchasingManager.buy_one) - { - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Close); - // SaveData.GetSaveobject().have_slot = true; - // SaveData.saveDataFunc(); - // GameDispatcher.Instance.Dispatch(GameMsg.Slot_refresh); - CtrlCloseUI(); - } - - - } - //初始化页面逻辑 - private void InitView() - { - ui.btn_close.SetClick(CtrlCloseUI); - - if (!GameHelper.IsAdModelOfPay()){ - ui.pay_type.selectedIndex = 1; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true; - - decimal price = (decimal)GameHelper.GetCommonModel().addspace2; - ui.btn_max_pay.title = GameHelper.Get102Str(price); - ui.btn_max_pay.SetClick(() => { - MaxPayClass maxPayData = new() - { - amount = (int)Math.Round(price * 100), - sku = MaxPayManager.buy_one, - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - - - return; - } - ui.pay_type.selectedIndex = 0; - - ui.text_have.text = "Owner ADs:" + SaveData.GetSaveobject().look_ad_numbers; - ui.need_text.text = "need " + ConfigSystem.GetConfig().addspace + " ADs"; - - - btn_green btn_buy = ui.btn_buy as btn_green; - btn_buy.img_saveingpot.visible = false; - if (SaveData.GetSaveobject().look_ad_numbers >= ConfigSystem.GetConfig().addspace) - { - btn_buy.state.selectedIndex = 1; - btn_buy.cooldown.selectedIndex = 0; - ui.btn_buy.SetClick(() => - { - ApplePayClass test = new ApplePayClass() - { - - sku = PurchasingManager.buy_one, - - }; - SaveData.GetSaveobject().look_ad_numbers -= (int)ConfigSystem.GetConfig().addspace; - PurchasingManager.Instance.Purchase(PurchasingManager.buy_one, test); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.buy_one_success, 1); - }); - } - else if (SaveData.GetSaveobject().look_ad_time > GameHelper.GetNowTime()) - { - btn_buy.state.selectedIndex = 0; - btn_buy.cooldown.selectedIndex = 1; - btn_buy.text = GameHelper.TimeFormat(SaveData.GetSaveobject().look_ad_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - btn_buy.SetClick(() => - { - - - }); - } - else - { - btn_buy.state.selectedIndex = 0; - btn_buy.cooldown.selectedIndex = 0; - btn_buy.text = "Watch AD"; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_buy.img_saveingpot.visible = true; - btn_buy.SetClick(() => - { - GameHelper.ShowVideoAd("Pass", (issuccess) => - { - if (issuccess) - { - SaveData.GetSaveobject().look_ad_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().exchangeCD; - InitView(); - - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.buy_one_click, 1); - }); - } - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUI.cs.meta b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUI.cs.meta deleted file mode 100644 index 03fe78f..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 40b42d370a2c34db89da3decb4b3ba0d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUICtrl.cs b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUICtrl.cs deleted file mode 100644 index d7b0d0f..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class BuyslotUICtrl : BaseUICtrl - { - private BuyslotUI ui; - private BuyslotModel model; - - private uint openUIMsg = UICtrlMsg.BuyslotUI_Open; - private uint closeUIMsg = UICtrlMsg.BuyslotUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.BuyslotModel) as BuyslotModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new BuyslotUI(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/Buyslot/BuyslotUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUICtrl.cs.meta deleted file mode 100644 index 2049372..0000000 --- a/Assets/BingoBrain/ModuleUI/Buyslot/BuyslotUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4c4feca1f3dc94e0291dbe534b773067 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs b/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs index 186b4b1..19fb29b 100644 --- a/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs +++ b/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs @@ -97,16 +97,16 @@ namespace BingoBrain openDebug(); }); - ui.btn_debug.SetClick(() => - { - OnclickDebug(); - }); + // ui.btn_debug.SetClick(() => + // { + // OnclickDebug(); + // }); #if BingoBrainRelease - ui.btn_debug.visible = false; + ui.btn_showmax.visible = false; #endif } int debugTimes = 0; - private void OnclickDebug() + private void OnclickDebug() { debugTimes++; GameHelper.ShowTips($"时间已设置为{debugTimes}天后。"); @@ -140,31 +140,31 @@ namespace BingoBrain public void OnClickBtn() { - WebviewManager.Instance.SetFullScreen(); - int flyswitch = ConfigSystem.GetConfig().flyswitch; - int propswitch = ConfigSystem.GetConfig().propswitch; + // WebviewManager.Instance.SetFullScreen(); + // int flyswitch = ConfigSystem.GetConfig().flyswitch; + // int propswitch = ConfigSystem.GetConfig().propswitch; - float top_offset = 170;//fgui中的顶部信息的高度 - float buttom_offset = 178; - if (Screen.safeArea.y != 0) - {//刘海屏 - top_offset += Screen.safeArea.y; - } - int offset_y = ConfigSystem.GetConfig().WVOffset[0]; - int offset_y1 = ConfigSystem.GetConfig().WVOffset[1]; - WebviewManager.Instance.SetPadding(0, top_offset / GRoot.inst.height, 0, buttom_offset / GRoot.inst.height); - WebviewManager.Instance.SetOffset(offset_y, offset_y1); + // float top_offset = 170;//fgui中的顶部信息的高度 + // float buttom_offset = 178; + // if (Screen.safeArea.y != 0) + // {//刘海屏 + // top_offset += Screen.safeArea.y; + // } + // int offset_y = ConfigSystem.GetConfig().WVOffset[0]; + // int offset_y1 = ConfigSystem.GetConfig().WVOffset[1]; + // WebviewManager.Instance.SetPadding(0, top_offset / GRoot.inst.height, 0, buttom_offset / GRoot.inst.height); + // WebviewManager.Instance.SetOffset(offset_y, offset_y1); - WebviewManager.Instance.RefreshUrl(); - Debug.Log($"flyswitch==1 ------ {flyswitch == 1}"); - Debug.Log($"propswitch==1 ------ {propswitch == 1}"); - WebviewManager.Instance.setFlyBtnTag(flyswitch == 1); - WebviewManager.Instance.setRewardBtnTag(propswitch == 1); - WebviewManager.Instance.SetDarkThough(true); - WebviewManager.Instance.ShowH5View(false); - WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig().propCoord[0], ConfigSystem.GetConfig().propCoord[1], 60, 60); + // WebviewManager.Instance.RefreshUrl(); + // Debug.Log($"flyswitch==1 ------ {flyswitch == 1}"); + // Debug.Log($"propswitch==1 ------ {propswitch == 1}"); + // WebviewManager.Instance.setFlyBtnTag(flyswitch == 1); + // WebviewManager.Instance.setRewardBtnTag(propswitch == 1); + // WebviewManager.Instance.SetDarkThough(true); + // WebviewManager.Instance.ShowH5View(false); + // WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig().propCoord[0], ConfigSystem.GetConfig().propCoord[1], 60, 60); if (GameHelper.IsGiftSwitch()) { diff --git a/Assets/BingoBrain/ModuleUI/FirstReward.meta b/Assets/BingoBrain/ModuleUI/FirstReward.meta index 8f93f5a..1a62cfa 100644 --- a/Assets/BingoBrain/ModuleUI/FirstReward.meta +++ b/Assets/BingoBrain/ModuleUI/FirstReward.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 882ce7fb853864db48dbcf8295c8db5d +guid: 6c37b4a6ff2cd8c4d9080f93cc28d487 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardCtrl.cs.meta index b31ed88..6d381cf 100644 --- a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardCtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardCtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: deab0d46957ab4447a1e1c7c46daf30d +guid: 8615ba59806612d4cb7bf7ab4038d2bd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardModel.cs.meta b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardModel.cs.meta index 48698b5..eba618d 100644 --- a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardModel.cs.meta +++ b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardModel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f930d045eaac0425d97a5da4e1360234 +guid: 9c4ebb22d4276a64e838859ec9e5a127 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs index fc277ce..e057d5d 100644 --- a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs +++ b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs @@ -5,7 +5,6 @@ using DG.Tweening; using FGUI.ACommon; using Spine.Unity; using UnityEngine; -using FGUI.Common_animal; namespace BingoBrain { @@ -15,7 +14,7 @@ namespace BingoBrain private FirstRewardModel model; private FGUI.JMain.com_firstreward ui; private Action closeCallback; - + private bool is_get; public FirstRewardUI(FirstRewardUICtrl ctrl) : base(ctrl) { uiName = UIConst.FirstRewardUI; @@ -49,11 +48,16 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { + if (Screen.safeArea.y != 0) + {//刘海屏 + ui.end_point.y += 68; + } InitView(); } protected override void OnOpen(object args) { + //open_sign = (System.Action)args; } protected override void OnHide() @@ -75,83 +79,84 @@ namespace BingoBrain } #endregion - + SkeletonAnimation sk; //初始化页面逻辑 private void InitView() { - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.end_point.y += Screen.safeArea.y; + //ui.money.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}"; - } - ui.text_num.text = "$" + ConfigSystem.GetConfig().InitialNum; - // (ui.btn_get as btn_tabblue).cont_button.selectedIndex = 1; - FX.Instance.SetFx(ui.spine_parent, Fx_Type.fx_first_reward, sk => - { - SkeletonAnimation cardSpine = sk; - NAAVsa.PlayAnim(cardSpine, "newbie_reward_an01", false); + ui.text_num.text = GameHelper.Get102Str(ConfigSystem.GetConfig().InitialNum); + FX.Instance.SetFx(ui.spine_parent, Fx_Type.fx_first_reward, ps => + { + // ps.transform.localPosition = new Vector3(0, 195, 0); + sk = ps; + // NAAVsa.PlayAnim(ske_pot, "edie", true); + }, closeCallback); - NAAVsa.AddCompleteEvent(cardSpine, (sk) => - { - NAAVsa.PlayAnim(cardSpine, "newbie_reward_an02", true); - ui.btn_getreward.SetClick(() => - { - NAAVsa.PlayAnim(cardSpine, "newbie_reward_an03", false); - ui.btn_getreward.visible = false; - NAAVsa.AddCompleteEvent(cardSpine, (sk) => - { - ui.state.selectedIndex = 1; - }); - }); - }); - // OnChangeCardFinish(null); - }, closeCallback); + // sk = FXManager.Instance.SetFx(ui.spine_parent, Fx_Type.fx_first_reward, ref closeCallback); + sk.state.SetAnimation(0, "newbie_reward_an01", false); + + sk.state.Complete += a => + { + sk.state.SetAnimation(0, "newbie_reward_an02", true); + ui.btn_getreward.SetClick(() => + { + ui.btn_getreward.visible = false; + sk.state.SetAnimation(0, "newbie_reward_an03", false); + sk.state.Complete += a => + { + ui.state.selectedIndex = 1; + }; + }); + + }; ui.btn_get.SetClick(GetReward); - ui.btn_close.SetClick(GetReward); - - // sk.state.SetAnimation(0, "newbie_reward_an01", false); - // sk.state.Complete += (a) => - // { - // sk.state.SetAnimation(0, "newbie_reward_an02", true); - // ui.btn_getreward.SetClick(() => - // { - // ui.btn_getreward.visible = false; - // sk.state.SetAnimation(0, "newbie_reward_an03", false); - // sk.state.Complete += (a) => - // { - // ui.state.selectedIndex = com_firstreward.State_page; - // }; - // }); - - // }; - // ui.btn_get.SetClick(GetReward); - // ui.btn_close.SetClick(GetReward); - // ui.money.GetChild("number_text").text = GameHelper.Get101Str(PreferencesMgr.Instance.Currency101); + // ui.btn_close.SetClick(GetReward); } private void GetReward() { - var startPot = GameHelper.GetUICenterPosition(ui.text_num); - var endPos = GameHelper.GetUICenterPosition(ui.end_point); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(102, ConfigSystem.GetConfig().InitialNum, RewardOrigin.Play) - { - startPosition = startPot, - endPosition = endPos, + if (is_get) return; + is_get = true; - }; - rewardData.AddReward(rewardSingleData); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.FirstRewardUI_Close); - PlayerPrefs.SetInt("first_", 1); - DOVirtual.DelayedCall(1, () => + + var start = GameHelper.GetUICenterPosition(ui.img_gold); + var end = GameHelper.GetUICenterPosition(ui.end_point); + + int awardNum = ConfigSystem.GetConfig().InitialNum; + + var rewardData = new RewardData(); + + var rewardSingleData = new Goda(102, awardNum, RewardOrigin.AdTask) { - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); + startPosition = start, + endPosition = new Vector2(end.x - 110, end.y - 110) + }; + + rewardData.AddReward(rewardSingleData); + rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; + rewardData.AddCompleted(success => + { + if (success) + { + GameHelper.AddGoldNumber(50); + + //var startNum = DataMgr.Coin.Value - awardNum; + // DOVirtual.Float((float)startNum, (float)DataMgr.Coin.Value, 1, + // value => { ui.money.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); }); + // SaveData.GetSaveobject().IsGetFirstReward = true; + // SaveData.saveDataFunc(); + PlayerPrefs.SetInt("first_", 1); + DOVirtual.DelayedCall(1f, () => + { + UICtrlDispatcher.Instance.Dispatch(SkinInfo.FirstRewardUI_Close); + GameDispatcher.Instance.Dispatch(BingoInfo.Update101); + }); + } }); + GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); + } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs.meta b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs.meta index 2cb3bd7..866b764 100644 --- a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs.meta +++ b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e157137ac05b8462ba39a193b838620f +guid: 9db36bb6630d76146971b4d8d36a0024 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUICtrl.cs.meta index fbe5d7f..f6fae96 100644 --- a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUICtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUICtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d41a4a0acf914deeaa724f94c2247c0 +guid: 21efe86f0ac02734e96c5d7aec67f1e2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward.meta b/Assets/BingoBrain/ModuleUI/GetTaskReward.meta deleted file mode 100644 index 07c24cb..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cb91424f051ac4ab7aac89a4d0f29008 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardCtrl.cs b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardCtrl.cs deleted file mode 100644 index 62387c6..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class GetTaskRewardCtrl : BaseCtrl - { - public static GetTaskRewardCtrl Instance { get; private set; } - - private GetTaskRewardModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.GetTaskRewardModel) as GetTaskRewardModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardCtrl.cs.meta deleted file mode 100644 index b865a5f..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 87ee97ded9a294cd39e08c80f08dd72d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardModel.cs b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardModel.cs deleted file mode 100644 index 764f529..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class GetTaskRewardModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardModel.cs.meta b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardModel.cs.meta deleted file mode 100644 index 3fada8b..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4ecff54cb7d2546328d5e92f9f89abad -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUI.cs b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUI.cs deleted file mode 100644 index 2690a14..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUI.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G009_video_animal; -using DG.Tweening; -using Spine.Unity; -using System; - -namespace BingoBrain -{ - public class GetTaskRewardUI : BaseUI - { - private GetTaskRewardUICtrl ctrl; - private GetTaskRewardModel model; - private FGUI.G009_video_animal.com_gettaskreward ui; - - public GetTaskRewardUI(GetTaskRewardUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.GetTaskRewardUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G009_video_animal"; - uiInfo.assetName = "com_gettaskreward"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.GetTaskRewardModel) as GetTaskRewardModel; - } - - protected override void OnClose() - { - closeCallback?.Invoke(); - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G009_video_animal.com_gettaskreward; - } - private Action closeCallback; - protected override void OnOpenBefore(object args) - { - // var sk = FX.Instance.SetFx(baseUI.GetChild("bg_parent") as GGraph, Fx_Type.fx_win, ref closeCallback); - // sk.state.SetAnimation(0, "out", true); - InitView(); - Debug.Log(args); - - int number = (int)args; - ui.money_text.text = number.ToString(); - ui.btn_claim.SetClick(() => - { - GameDispatcher.Instance.Dispatch(GameMsg.GetTaskReward, false); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GetTaskRewardUI_Close); - GameHelper.addInterAdnumber(); - }); - ui.btn_adclaim.SetClick(() => - { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - GameDispatcher.Instance.Dispatch(GameMsg.GetTaskReward, true); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GetTaskRewardUI_Close); - } - }); - - }); - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_adclaim.GetChild("img_saveingpot") as GImage).visible = true; - } - - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUI.cs.meta b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUI.cs.meta deleted file mode 100644 index 95ed3ca..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 68d77870ef81f4afaabf33d1c0470495 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUICtrl.cs b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUICtrl.cs deleted file mode 100644 index d8c3557..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class GetTaskRewardUICtrl : BaseUICtrl - { - private GetTaskRewardUI ui; - private GetTaskRewardModel model; - - private uint openUIMsg = UICtrlMsg.GetTaskRewardUI_Open; - private uint closeUIMsg = UICtrlMsg.GetTaskRewardUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.GetTaskRewardModel) as GetTaskRewardModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new GetTaskRewardUI(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/GetTaskReward/GetTaskRewardUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUICtrl.cs.meta deleted file mode 100644 index 00b20f4..0000000 --- a/Assets/BingoBrain/ModuleUI/GetTaskReward/GetTaskRewardUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 89cba9dc9d404422291d75698d7fcb60 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/H5.meta b/Assets/BingoBrain/ModuleUI/H5.meta deleted file mode 100644 index f8f86f5..0000000 --- a/Assets/BingoBrain/ModuleUI/H5.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 038523bf2241745d39d0b5bcb5a8af4d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/H5/H5Ctrl.cs b/Assets/BingoBrain/ModuleUI/H5/H5Ctrl.cs deleted file mode 100644 index 1f4adfc..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5Ctrl.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class H5Ctrl : BaseCtrl - { - public static H5Ctrl Instance { get; private set; } - - private H5Model model; - - #region 生命周期 - - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/H5/H5Ctrl.cs.meta b/Assets/BingoBrain/ModuleUI/H5/H5Ctrl.cs.meta deleted file mode 100644 index d501e10..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5Ctrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0f9608616c65b4096920d24e596a07ea -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/H5/H5Model.cs b/Assets/BingoBrain/ModuleUI/H5/H5Model.cs deleted file mode 100644 index 197ab83..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5Model.cs +++ /dev/null @@ -1,24 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class H5Model : BaseModel - { - public decimal show101; - #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/H5/H5Model.cs.meta b/Assets/BingoBrain/ModuleUI/H5/H5Model.cs.meta deleted file mode 100644 index 118a9e1..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5Model.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c2242e23fbfc9437daacf20e82d1e594 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/H5/H5UI.cs b/Assets/BingoBrain/ModuleUI/H5/H5UI.cs deleted file mode 100644 index b45ab2d..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5UI.cs +++ /dev/null @@ -1,508 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using BingoBrain.Core; -using BingoBrain.HotFix; -using DG.Tweening; -using DontConfuse; -using FGUI.ACommon; -using UnityEngine; - -namespace BingoBrain -{ - public class H5UI : BaseUI - { - private H5UICtrl ctrl; - private H5Model model; - private FGUI.G004_webview.com_webview ui; - - public H5UI(H5UICtrl ctrl) : base(ctrl) - { - uiName = UIConst.H5UI; - this.ctrl = ctrl; - } - bool isScrolling; - - - private bool isTimeOut = false; - - - private decimal scrollOutTime; - - - private bool isLoadFinish; - - - private bool isCurrentTaskFinish; - - - private bool isCurrentTimeTask; - - - private bool isAddFinger; - - private long openTime; - - private int iconClickCount; - - private int flyClickCount; - - private int flyNeedClickCount = 0; - - private int currentTabIndex; - - private decimal makeupTaskH5NeedTime; - - - private Tween bubbleMoveTween; - - private List movePointList = new List(); - //private CountDownKit countDownKit; - private int sendH5point = 0; - private SaveingPotClass makeupTaskData_saveing; - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G004_webview"; - uiInfo.assetName = "com_webview"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = false; - uiInfo.isTickUpdate = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.H5Model) as H5Model; - } - - protected override void OnClose() - { - - //WebThroughUtil.WebThroughDisable(H5WebThroughType.OnlineH5, ui.btn_icon); - //Hall.Instance.SetInH5(false); - // StopFly(); - // countDownKit?.OnDestroy(); - - OnStatisticH5Time(); - - - WebviewManager.Instance.setInH5View(false); - WebviewManager.Instance.ShowH5View(false); - - // if (GameHelper.is_first_login) - // { - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open); - // GameHelper.is_first_login = false; - // } - } - private void OnStatisticH5Time() - { - var time = GameHelper.GetNowTime() - openTime; - PreferencesMgr.Instance.H5StayTime += (int)time; - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G004_webview.com_webview; - } - - protected override void OnOpenBefore(object args) - { - ui.btn_close.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Close); }); - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.gruop_.y += Screen.safeArea.y; - } - makeupTaskData_saveing = SaveData.GetSaveobject().saveingpot_history[SaveData.GetSaveobject().saveingpot_history.Count - 1]; - WebviewManager.Instance.setInH5View(true); - WebviewManager.Instance.ShowH5View(true); - InitData(); - InitView(); - if (!GameHelper.IsGiftSwitch()) - { - ui.com_top.visible = ui.btn_out.visible = false; - } - } - - protected override void OnOpen(object args) - { - openTime = GameHelper.GetNowTime(); - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - //UICtrlDispatcher.Instance.AddListener(SkinInfo.MakeupConfirmUI_Close, SetMakeup); - GameDispatcher.Instance.AddListener(BingoInfo.RefreshMakeupData, SetMakeup); - GameDispatcher.Instance.AddListener(BingoInfo.resetH5progress, resetTime); - } - protected override void RemoveListener() - { - //UICtrlDispatcher.Instance.RemoveListener(UICtrlMsg.MakeupConfirmUI_Close, SetMakeup); - GameDispatcher.Instance.RemoveListener(BingoInfo.RefreshMakeupData, SetMakeup); - GameDispatcher.Instance.RemoveListener(BingoInfo.resetH5progress, resetTime); - } - #endregion - void resetTime(object a = null) - { - iconTime = 0; - } - decimal iconTime = 0; - private decimal updateTime; - public override void OnUpdate() - { - if (iconTime < ConfigSystem.GetConfig().ThroughRewardCD) - { - iconTime += (decimal)Time.deltaTime; - UpdateIcon(); - } - CheckShowFly(); - - updateTime += (decimal)Time.deltaTime; - - // if (makeupTaskH5NeedTime > 0 && PreferencesMgr.Instance.MakeupTaskH5Time < makeupTaskH5NeedTime) - // { - if (updateTime >= 1) - { -#if UNITY_EDITOR - updateTime = 600; -#endif - if (PreferencesMgr.Instance.MakeupTaskH5Time > 60 && - ((PreferencesMgr.Instance.MakeupTaskH5Time % 60) < 1)) - { - // NetworkKit.BuriedPoint(BuriedPointEvent.h5_event, BuriedPointEvent.h5_event_time, 60); - } - - if (sendH5point == 1) - { - PlayerPrefs.SetInt("sendH5point", 0); - sendH5point = 0; - } - PreferencesMgr.Instance.MakeupTaskH5Time += updateTime; - PreferencesMgr.Instance.CoinMakeupTaskH5Time += updateTime; - - if (makeupTaskData_saveing.status == SaveingPotTaskStatus.None) - { - if (PreferencesMgr.Instance.ExchangeAccount != null) - { - makeupTaskData_saveing.H5Time += (float)updateTime; - } - - } - updateTime = 0; - - } - // } - // else if (makeupTaskH5NeedTime > 0 && PreferencesMgr.Instance.MakeupTaskH5Time >= makeupTaskH5NeedTime) - // { - // if (sendH5point == 0) - // { - // NetworkKit.BuriedPoint(BuriedPointEvent.h5_event, BuriedPointEvent.h5_event_numbers, 1); - // sendH5point = 1; - // PlayerPrefs.SetInt("sendH5point", 1); - // } - // } - - - } - //初始化页面逻辑 - private void InitData() - { - - // model.show101 = PreferencesMgr.Instance.Currency101; - flyNeedClickCount = UnityEngine.Random.Range(ConfigSystem.GetConfig().flyAdTime[0], - ConfigSystem.GetConfig().flyAdTime[1] + 1); - //flyNeedClickCount = 5; - - // if (PreferencesMgr.Instance.MakeupTaskHistory.Count > 0) - // { - // var taskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - // if (taskData != null) - // { - // Makeup makeupVo = null; - // foreach (var makeup in ConfigSystem.GetConfig().dataList) - // { - // if (makeup.id == taskData.tableId) - // { - // makeupVo = makeup; - // break; - // } - // } - - // makeupTaskH5NeedTime = makeupVo.task_need; - // } - // } - - sendH5point = PlayerPrefs.GetInt("sendH5point", 0); - - -#if UNITY_EDITOR - isLoadFinish = true; -#endif - } - private void InitView() - { - - - - - - // InitIcon(); - // CheckShowFly(); - // ui.com_fly.SetClick(OnClickFlyCash); - // #endif - // SetMakeup(); - - - //OnClickIcon(); - SetMakeup(); - WebviewManager.Instance.ShowFlyBtn(true); - UpdateIcon(); - OnClickIcon(); - } - - private void UpdateIcon() - { - float amount = (float)iconTime / ConfigSystem.GetConfig().ThroughRewardCD; - - - WebviewManager.Instance.SetIconProgress(amount); - // if (iconTime >= ConfigSystem.GetConfig().ThroughRewardCD) - // { - // if (!ui.btn_icon.fx_ready.playing) - // { - // ui.btn_icon.fx_ready.Play(); - // } - - // ui.btn_icon.cont_state.selectedIndex = btn_icon.State_ready; - // } - // else - // { - // ui.btn_icon.fx_ready.Stop(); - // } - } - private void OnClickIcon() - { - - - //WebThroughUtil.WebThroughClick(H5WebThroughType.OnlineH5, ui.btn_icon); - - if (iconTime < ConfigSystem.GetConfig().ThroughRewardCD) - { - return; - } - - - // WebviewManager.Instance.ShowH5View(false); - - - - var rewardData = new RewardData(); - - var rewardType = 102; - float[] cash_array = GameHelper.GetRewardValue(2); - // decimal rewardValue = CardEntity.GetSumToType(CardPropType.cash); - - var rewardSingleData = new Goda(rewardType, (decimal)cash_array[0], RewardOrigin.H5Icon) - { - startPosition = GameHelper.GetUICenterPosition(ui), - endPosition = GameHelper.GetUICenterPosition(ui.com_top.text_num) - }; - rewardData.AddReward(rewardSingleData); - rewardData.AddCompleted(isSuccess => - { - //ui.btn_icon.cont_state.selectedIndex = btn_icon.State_none; - iconTime = 0; - SetMakeup(); - }); - rewardData.condition = RewardCondition.AD; - rewardData.displayType = - RewardDisplayType.Dialog | RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.annular_get_number, 1); - } - private void CheckShowFly() - { - var nowTime = GameHelper.GetNowTime(); - var leftTime = (int)(PreferencesMgr.Instance.AdCashFlyShowTime - nowTime); - - ui.com_fly.visible = false; - ui.com_fly.visible = leftTime <= 0; - if (leftTime > 0) - { - WebviewManager.Instance.ShowFlyBtn(false); - isFlyShow = false; - } - else - { - //StartFly(); - if (!isFlyShow) WebviewManager.Instance.ShowFlyBtn(true); - isFlyShow = true; - - } - } - private bool isFlyShow = false; - private void StartFly() - { - - - var bubbleGo = ui.com_fly.displayObject.gameObject; - bubbleMoveTween = bubbleGo.transform - .DOLocalPath(movePointList.ToArray(), 10) - .SetEase(Ease.Linear) - .OnComplete(StartFly) - .SetAutoKill(true); - } - - - - - - - - private void OnClickFlyCash() - { - PreferencesMgr.Instance.AdCashFlyShowTime = - GameHelper.GetNowTime() + ConfigSystem.GetConfig().flyCD; - var rewardData = new RewardData(); - - var singleValue = - (decimal)Math.Round( - UnityEngine.Random.Range(ConfigSystem.GetConfig().flyReward[0], - ConfigSystem.GetConfig().flyReward[1]), 2); - decimal rewardValue; - - - if (flyClickCount >= flyNeedClickCount) - { - flyClickCount = -1; - //var rate = GameHelper.GetVideoRate(); - rewardValue = singleValue; - GameHelper.ShowVideoAd("reward_fly", isCompleted => - { - if (isCompleted) - { - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - } - }); - } - else - { - rewardValue = singleValue; - } - var rewardSingleData = new Goda(102, rewardValue, RewardOrigin.Play) - { - startPosition = GameHelper.GetUICenterPosition(ui.com_fly), - endPosition = GameHelper.GetUICenterPosition(ui.com_top.text_num) - }; - - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted(isSuccess => - { - if (isSuccess) - { - flyClickCount++; - } - - SetMakeup(); - }); - //PreferencesMgr.Instance.Currency102 += rewardValue; - - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - CheckShowFly(); - } - - - - public void Set101(decimal cash = -1) - { - // if (cash < 0) - // { - // cash = PreferencesMgr.Instance.Currency102; - // } - - // ui.com_top.text_num.text = "$"+ PreferencesMgr.Instance.Currency102; - } - - public void OnLoadFinish() - { - isLoadFinish = true; - } - - public void OnLoadH5Progress(int progress) - { - } - - private void SetMakeup(object a = null) - { - var com_box = ui.com_top; - - com_box.text_num.text = "$" + PreferencesMgr.Instance.Currency102; -Debug.Log("-----------------------"+PreferencesMgr.Instance.Currency102); - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 0.5f, - value => { com_box.text_num.text = "$" + value.ToString("0.00"); }); - - - if (PreferencesMgr.Instance.MakeupTaskHistory.Count == 0) - { - return; - } - - var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - makeup vo = null; - - foreach (makeup item in ConfigSystem.GetConfig().dataList) - { - - if (item.id == makeupTaskData.tableId) vo = item; - } - var leftCash = (double)Math.Max(vo.item_need - PreferencesMgr.Instance.Currency102, 0); - com_box.text_more.SetVar("money", "$" + leftCash).FlushVars(); - com_box.pb_num.max = vo.item_need; - com_box.pb_num.TweenValue(vo.item_need - leftCash, 0.1f); - - float b = ((float)PreferencesMgr.Instance.Currency102) / vo.item_need; - - ui.btn_out.SetClick(() => - { - WebviewManager.Instance.ShowH5View(false); - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - // MainTabUI.getIns().OnGameTab(0); - }); - - } - - public void ClickBtn(string name) - { - // // Debug.Log("[UNITY] Click btn: " + name); - // FGUIHelper.PlayClickSound(); - if (name == "flyBtn") - { - OnClickFlyCash(); - NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.collect_fly_number, 1); - //NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior,BuriedPointEvent.collect_fly_people,1); - } - else if (name == "rewardBtn") - { - OnClickIcon(); - - } - } - - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/H5/H5UI.cs.meta b/Assets/BingoBrain/ModuleUI/H5/H5UI.cs.meta deleted file mode 100644 index 51827a5..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5UI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 499f47a2060dd4d19acc3e32bc4c693e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/H5/H5UICtrl.cs b/Assets/BingoBrain/ModuleUI/H5/H5UICtrl.cs deleted file mode 100644 index a5a6c89..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5UICtrl.cs +++ /dev/null @@ -1,99 +0,0 @@ - -using BingoBrain.Core; -using BingoBrain.HotFix; -using UnityEngine; - -namespace BingoBrain -{ - public class H5UICtrl : BaseUICtrl - { - private H5UI ui; - private H5Model model; - - private uint openUIMsg = SkinInfo.H5UI_Open; - private uint closeUIMsg = SkinInfo.H5UI_Close; - - #region 生命周期 - - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new H5UI(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); - uiCtrlDispatcher.AddListener(SkinInfo.MainTabUI_Display, OnMainTabUI_Display); - gameDispatcher.AddListener(BingoInfo.H5ViewClickBtn, OnH5ClickBtn); - - } - - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - uiCtrlDispatcher.RemoveListener(SkinInfo.MainTabUI_Display, OnMainTabUI_Display); - gameDispatcher.RemoveListener(BingoInfo.H5ViewClickBtn, OnH5ClickBtn); - } - - #endregion - void OnH5ClickBtn(object arg) - { - Debug.Log("feixingqidianjiiiiiiiiiiiiiiiii0"); - ui?.ClickBtn((string)arg); - } - - private void OnMainTabUI_Display(object obj) - { - if (obj != null) - { - var isShow = (bool)obj; - if (isShow) - { - ui?.Display(); - } - else - { - ui?.Hide(); - } - } - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/H5/H5UICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/H5/H5UICtrl.cs.meta deleted file mode 100644 index 13c0d45..0000000 --- a/Assets/BingoBrain/ModuleUI/H5/H5UICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 36ad7c57a1662439d94041f3e576ea21 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/JMall/JMallUI.cs b/Assets/BingoBrain/ModuleUI/JMall/JMallUI.cs index b770370..71d212e 100644 --- a/Assets/BingoBrain/ModuleUI/JMall/JMallUI.cs +++ b/Assets/BingoBrain/ModuleUI/JMall/JMallUI.cs @@ -71,8 +71,10 @@ namespace BingoBrain private void SetRedeemCard(com_mall_carditem item, int count, int consume, Action action = null) { item.text_count.SetVar("count", count.ToString()).FlushVars(); - item.text_number.text = consume.ToString(); - item.btn_redeem.SetClick(() => + + item.btn_redeem_coin.title = consume.ToString(); + item.btn_redeem_coin.type.selectedIndex = 1; + item.btn_redeem_coin.SetClick(() => { TuSystem.Consume(102, consume, isSuccess => { diff --git a/Assets/BingoBrain/ModuleUI/JTerm/JTermUI.cs b/Assets/BingoBrain/ModuleUI/JTerm/JTermUI.cs index 46714a8..b69c115 100644 --- a/Assets/BingoBrain/ModuleUI/JTerm/JTermUI.cs +++ b/Assets/BingoBrain/ModuleUI/JTerm/JTermUI.cs @@ -82,7 +82,7 @@ namespace BingoBrain { var aRichTextField = new GTextField(); aRichTextField.SetSize(GRoot.inst.width, 100); - aRichTextField.color = new Color32(81, 81, 81,1); + aRichTextField.color = new Color32(19,136,198,1); aRichTextField.textFormat.size = 38; diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess.meta b/Assets/BingoBrain/ModuleUI/LevelSuccess.meta deleted file mode 100644 index 58849c4..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 08c524904680c4f658fd1487b482dbc3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessCtrl.cs b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessCtrl.cs deleted file mode 100644 index e9adf3a..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class LevelSuccessCtrl : BaseCtrl - { - public static LevelSuccessCtrl Instance { get; private set; } - - private LevelSuccessModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.LevelSuccessModel) as LevelSuccessModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessCtrl.cs.meta deleted file mode 100644 index 594536c..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bf30effd1c1cf4ee7965a785597ebb5a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessModel.cs b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessModel.cs deleted file mode 100644 index 171d4d2..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class LevelSuccessModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessModel.cs.meta b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessModel.cs.meta deleted file mode 100644 index 06380ce..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a82cc7895b244916bf94ffb2678b292 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUI.cs b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUI.cs deleted file mode 100644 index 59a950d..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUI.cs +++ /dev/null @@ -1,647 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G008_reward_animal; -using DG.Tweening; -using FGUI.Common_animal; -using Newtonsoft.Json; -using System.Linq; - -using FGUI.G003_play_animal; -using System; -using Spine.Unity; -using BingoBrain.HotFix; -using DontConfuse; - -namespace BingoBrain -{ - public class LevelSuccessUI : BaseUI - { - private LevelSuccessUICtrl ctrl; - private LevelSuccessModel model; - private FGUI.G008_reward_animal.com_lvsuccess ui; - private bool is_success; - private bool is_level_success; - private bool is_h5_reward; - public static bool aftershow_success = false;//用于在倒数第二个奖励是钞票是关卡结束奖励弹不出来 - private SuccessData success_data; - - public LevelSuccessUI(LevelSuccessUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.LevelSuccessUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G008_reward_animal"; - uiInfo.assetName = "com_lvsuccess"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.LevelSuccessModel) as LevelSuccessModel; - } - - protected override void OnClose() - { - GameHelper.SetCloseResult(false); - - closeCallback?.Invoke(); - //if (is_level_success && !GameHelper.is_first_login) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, is_success); - if (is_h5_reward) - { - WebviewManager.Instance.ShowH5View(true); - GameDispatcher.Instance.Dispatch(BingoInfo.resetH5progress); - } - // if (UI.Instance.IsExistUI(UIConst.H5UI)) - // { - // WebviewManager.Instance.SetDarkThough(true); - - // } - WebviewManager.Instance.SetDarkThough(true); - if (aftershow_success) - { - GameDispatcher.Instance.Dispatch(GameMsg.checkGameState); - aftershow_success = false; - } - } - private Action closeCallback; - protected override void OnBind() - { - ui = baseUI as FGUI.G008_reward_animal.com_lvsuccess; - } - - protected override void OnOpenBefore(object arg) - { - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_adclaim.GetChild("img_saveingpot") as GImage).visible = true; - if (UI.Instance.IsExistUI(UIConst.H5UI)) - { - WebviewManager.Instance.SetDarkThough(false); - WebviewManager.Instance.ShowH5View(false); - } - - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.gold.y += Screen.safeArea.y; - ui.top_money.y += Screen.safeArea.y; - ui.tips_bg.y += Screen.safeArea.y; - ui.tips_text.y += Screen.safeArea.y; - } - - SuccessData args = arg as SuccessData; - success_data = args; - - is_level_success = args.IsLevelSuccess; - is_h5_reward = args.IsH5Reward; - - if (GameHelper.IsGiftSwitch()) - { - ui.switchgift.selectedIndex = 1; - } - else - { - ui.switchgift.selectedIndex = 0; - } - - if (is_level_success && !is_h5_reward) { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Open); - - GameHelper.PlayGameTimeEvent(1, () => { - GameHelper.RequestGameConfig(); - }); - } else { - GameHelper.SetCloseResult(true); - } - - - Debug.Log(args); - is_success = args.IsWin; - if (is_success) - { - if (Audio.Instance.IsOpenEffect) - { - Audio.Instance.PlayDynamicEffect("Victoriously"); - } - - } - - if (is_success) ui.state.selectedIndex = 0; - else ui.state.selectedIndex = 1; - ui.level_text.text = "Level " + GameHelper.GetLevel(); - (ui.btn_adclaim as btn_tabad).color.selectedIndex = 1; - ui.btn_restart.SetClick(() => - { - if (!GameHelper.GetCloseResult()) return; - - GameHelper.addInterAdnumber(); - if (!is_success) - { - GameHelper.SetLevelstate(3); - GameDispatcher.Instance.Dispatch(GameMsg.sendLog, false); - } - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, is_success); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - - }); - ui.top_money.GetChild("number_text").text = "$" + PreferencesMgr.Instance.Currency102; - float cash_number = args.cash_number; - int rate = 1; - if (is_success) - { - rate = args.rate; - ui.btn_adclaim.GetChild("title").text = "Claim X" + rate; - // var sk = FX.Instance.SetFx(baseUI.GetChild("bg_parent") as GGraph, Fx_Type.fx_win, ref closeCallback); - // sk.state.SetAnimation(0, "out", true); - } - else - { - ui.bg_parent.y += 200; - // var sk = FX.Instance.SetFx(ui.bg_parent, Fx_Type.fx_lose, ref closeCallback); - // sk.state.SetAnimation(0, "animation", true); - } - - - InitView(); - - if (GameHelper.IsGiftSwitch()) - { - if (is_success) ui.money_text.text = "$" + cash_number.ToString("0.00"); - else - { - ui.money_text.text = "$" + PreferencesMgr.Instance.Currency102; - ui.top_money.visible = false; - } - - ui.btn_adclaim.SetClick(() => - { - if (!GameHelper.GetCloseResult()) return; - - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - - { - ui.btn_claim.SetClick(() => { }); - ui.btn_adclaim.SetClick(() => { }); - ui.top_money.GetChild("btn_cashout").SetClick(() => { }); - ui.com_cash.btn_cash.SetClick(() => { }); - var start = GameHelper.GetUICenterPosition(ui.btn_adclaim); - var end = GameHelper.GetUICenterPosition(ui.top_money.GetChild("number_text")); - - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(102, (decimal)cash_number * rate, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - - rewardData.AddReward(rewardSingleData); - rewardData.AddCompleted(success => - { - if (success) - { - // RefreshGold((decimal)awardNum); - - DOVirtual.DelayedCall(0.3f, () => - { - CtrlCloseUI(); - if (is_level_success) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); - }); - } - }); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - DOVirtual.DelayedCall(1, () => - { - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1f, - value => { (ui.top_money.GetChild("number_text") as GTextField).text = "$" + value.ToString("0.00"); }); - }); - - DOVirtual.DelayedCall(2f, () => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - }); - GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - } - }); - }); - ui.btn_claim.SetClick(() => - { - if (!GameHelper.GetCloseResult()) return; - - ui.btn_claim.SetClick(() => { }); - ui.btn_adclaim.SetClick(() => { }); - ui.top_money.GetChild("btn_cashout").SetClick(() => { }); - ui.com_cash.btn_cash.SetClick(() => { }); - var start = GameHelper.GetUICenterPosition(ui.btn_claim); - var end = GameHelper.GetUICenterPosition(ui.top_money.GetChild("number_text")); - - - // reward_data temp = new reward_data() { start = start, end = end, change = cash_number, type = 111 }; - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); - // GameHelper.addMoney(cash_number); - - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(102, (decimal)cash_number, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - rewardData.AddCompleted(success => - { - if (success) - { - // RefreshGold((decimal)awardNum); - - DOVirtual.DelayedCall(0.3f, () => - { - CtrlCloseUI(); - if (is_level_success) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); - }); - } - }); - DOVirtual.DelayedCall(1, () => - { - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1f, - value => { (ui.top_money.GetChild("number_text") as GTextField).text = "$" + value.ToString("0.00"); }); - }); - - DOVirtual.DelayedCall(2f, () => - { - GameHelper.addInterAdnumber(); - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - - }); - GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - - }); - - //int name_index = UnityEngine.Random.Range(0, ConfigSystem.GetConfig().config_name_list.Count); - var name_index = UnityEngine.Random.Range(0, exBrPoolModel.config_name_list.Count); - var money_index = UnityEngine.Random.Range(0, exBrPoolModel.config_money_list.Count); - - System.DateTime oldtime = System.DateTime.Now.AddSeconds(-UnityEngine.Random.Range(1 * 3600, 2 * 3600)); - - ui.com_cash.broad.cast_text.text = string.Format("Congratulations, [color=#e3a13a]{0}[/color] withdrew [color=#83c93c]{1} [/color]dollars", exBrPoolModel.config_name_list[name_index], - exBrPoolModel.config_money_list[money_index]); - - var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); - - ui.com_cash.btn_cash.SetClick(() => - { - if (!GameHelper.GetCloseResult()) return; - - ui.btn_claim.SetClick(() => { }); - ui.btn_adclaim.SetClick(() => { }); - ui.top_money.GetChild("btn_cashout").SetClick(() => { }); - ui.com_cash.btn_cash.SetClick(() => { }); - if (is_success) - { - var start = GameHelper.GetUICenterPosition(ui.btn_claim); - var end = GameHelper.GetUICenterPosition(ui.top_money.GetChild("number_text")); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(102, (decimal)cash_number, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - rewardData.AddCompleted(success => - { - if (success) - { - // RefreshGold((decimal)awardNum); - - DOVirtual.DelayedCall(0.3f, () => - { - CtrlCloseUI(); - if (is_level_success) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); - }); - } - }); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - DOVirtual.DelayedCall(1, () => - { - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1f, - value => { (ui.top_money.GetChild("number_text") as GTextField).text = "$" + value.ToString("0.00"); }); - }); - - DOVirtual.DelayedCall(1.0f, () => - { - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - GameHelper.addInterAdnumber(); - - }); - GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - } - else - { - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - GameHelper.addInterAdnumber(); - } - if (is_level_success && !is_success) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); - - }); - - ui.top_money.GetChild("btn_cashout").SetClick(() => - { - if (!GameHelper.GetCloseResult()) return; - - ui.btn_claim.SetClick(() => { }); - ui.btn_adclaim.SetClick(() => { }); - ui.top_money.GetChild("btn_cashout").SetClick(() => { }); - ui.com_cash.btn_cash.SetClick(() => { }); - if (is_success) - { - var start = GameHelper.GetUICenterPosition(ui.btn_claim); - var end = GameHelper.GetUICenterPosition(ui.top_money.GetChild("number_text")); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(102, (decimal)cash_number, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - rewardData.AddCompleted(success => - { - - if (success) - { - // RefreshGold((decimal)awardNum); - - DOVirtual.DelayedCall(0.3f, () => - { - CtrlCloseUI(); - Debug.Log("66666666666666666666662"); if (is_level_success) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); - }); - } - }); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - DOVirtual.DelayedCall(1, () => - { - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1f, - value => { (ui.top_money.GetChild("number_text") as GTextField).text = "$" + value.ToString("0.00"); }); - }); - - DOVirtual.DelayedCall(1.0f, () => - { - - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - GameHelper.addInterAdnumber(); - - }); - GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - } - else - { - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - GameHelper.addInterAdnumber(); - } - if (is_level_success && !is_success) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); - - }); - - Debug.Log(JsonConvert.SerializeObject(vo)); - if (GameHelper.GetLevel() <= vo.levels_need) - { - ui.com_cash.cash_text.text = "Withdrawals can be made through level " + vo.levels_need; - ui.com_cash.progress.width = 676f * (GameHelper.GetLevel() - 1) / vo.levels_need; - ui.com_cash.progress_text.text = (GameHelper.GetLevel() - 1) + "/" + vo.levels_need; - } - else if ((float)PreferencesMgr.Instance.Currency102 < vo.item_need) - { - ui.com_cash.cash_text.text = "Collect " + vo.item_need + " to cash out"; - if ((float)PreferencesMgr.Instance.Currency102 > vo.item_need) - { - ui.com_cash.progress.width = 676; - ui.com_cash.progress_text.text = "$" + vo.item_need + "/" + "$" + vo.item_need; - } - else - { - ui.com_cash.progress.width = 676 * ((float)PreferencesMgr.Instance.Currency102 / vo.item_need); - ui.com_cash.progress_text.text = "$" + PreferencesMgr.Instance.Currency102 + "/" + "$" + vo.item_need; - } - - Debug.Log((float)PreferencesMgr.Instance.Currency102); - } - else if ((float)PreferencesMgr.Instance.MakeupTaskH5Time < vo.task_need) - { - ui.com_cash.cash_text.text = "Cumulataive " + (vo.task_need / 60) + @" minutes in ""Hall"" to cash out"; - if ((float)PreferencesMgr.Instance.MakeupTaskH5Time > vo.task_need) - { - ui.com_cash.progress.width = 676; - ui.com_cash.progress_text.text = (vo.task_need / 60) + "/" + (vo.task_need / 60); - } - else - { - ui.com_cash.progress.width = 676 * ((float)PreferencesMgr.Instance.MakeupTaskH5Time / vo.task_need); - ui.com_cash.progress_text.text = Math.Round(((float)(PreferencesMgr.Instance.MakeupTaskH5Time / 60)), 2) + "/" + (vo.task_need / 60); - } - - } - else if (makeupTaskData.videoCount < vo.ad_need) - { - - ui.com_cash.cash_text.text = "Watch " + vo.ad_need + " Reward Ads to cash out"; - if (makeupTaskData.videoCount > vo.ad_need) - { - ui.com_cash.progress.width = 676; - ui.com_cash.progress_text.text = vo.ad_need + "/" + vo.ad_need; - } - else - { - ui.com_cash.progress.width = 676 * ((float)makeupTaskData.videoCount / vo.ad_need); - ui.com_cash.progress_text.text = makeupTaskData.videoCount + "/" + vo.ad_need; - } - } - else - { - ui.com_cash.cash_text.text = "Watch " + vo.ad_need + " Reward Ads to cash out"; - if (makeupTaskData.videoCount > vo.ad_need) - { - ui.com_cash.progress.width = 676; - ui.com_cash.progress_text.text = vo.ad_need + "/" + vo.ad_need; - } - else - { - ui.com_cash.progress.width = 676 * ((float)makeupTaskData.videoCount / vo.ad_need); - ui.com_cash.progress_text.text = makeupTaskData.videoCount + "/" + vo.ad_need; - } - - } - } - else - { - // ui.money_text.text = "20"; - // ui.gold.GetChild("number_text").text = GameHelper.GetGoldNumber().ToString(); - // ui.btn_adclaim.GetChild("title").text = "Claim X2"; - // ui.btn_adclaim.SetClick(() => - // { - // GameHelper.ShowVideoAd("reward_lobby", isSuccess => - // { - // if (isSuccess) - - // { - // ui.btn_claim.SetClick(() => { }); - // ui.btn_adclaim.SetClick(() => { }); - // var start = GameHelper.GetUICenterPosition(ui.btn_adclaim); - // var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - - // reward_data temp = new reward_data() { start = start, end = end, change = 40, type = 101 }; - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); - // GameHelper.addGoldNumber(40); - // DOVirtual.DelayedCall(1, () => - // { - // DOVirtual.Float(0, GameHelper.getGoldNumber(), 1, - // value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - // } - // ); - - // DOVirtual.DelayedCall(2f, () => - // { - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - // }); - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - // } - // }); - // }); - // ui.btn_claim.SetClick(() => - // { - // ui.btn_claim.SetClick(() => { }); - // ui.btn_adclaim.SetClick(() => { }); - // var start = GameHelper.GetUICenterPosition(ui.btn_claim); - // var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - // // var reward = GameHelper.GetQuizRewardValue(); - // // var rewardData = new RewardData(); - // // var rewardSingleData = new RewardSingleData(111, (decimal)reward, RewardOrigin.GameWin) - // // { - // // startPosition = start, - // // endPosition = end - // // }; - // // rewardData.AddReward(rewardSingleData); - - // // //rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - // // rewardData.displayType = RewardDisplayType.RewardFly ; - // //GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - // reward_data temp = new reward_data() { start = start, end = end, change = 20, type = 101 }; - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); - // GameHelper.addGoldNumber(20); - // DOVirtual.DelayedCall(1, () => - // { - // DOVirtual.Float(0, GameHelper.getGoldNumber(), 1, - // value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - // } - // ); - - // DOVirtual.DelayedCall(2f, () => - // { - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); - // }); - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - // }); - - - - - } - - - - } - private int time_count = 0; - - void timeEvent() - { - time_count++; - - if (time_count > 3) - { - time_count = 0; - ui.com_cash.broad.t0.Play(() => - { - var name_index = UnityEngine.Random.Range(0, exBrPoolModel.config_name_list.Count); - var money_index = UnityEngine.Random.Range(0, exBrPoolModel.config_money_list.Count); - - - - - System.DateTime oldtime = System.DateTime.Now.AddSeconds(-UnityEngine.Random.Range(1 * 3600, 2 * 3600)); - ui.com_cash.broad.cast_text.text = string.Format("Congratulations, [color=#e3a13a]{0}[/color] withdrew [color=#83c93c]{1} [/color]dollars ", exBrPoolModel.config_name_list[name_index], - exBrPoolModel.config_money_list[money_index]); - //, oldtime.Hour + ":" + (oldtime.Minute > 10 ? oldtime.Minute : "0" + oldtime.Minute) - ui.com_cash.broad.t1.Play(); - }); - - - } - - } - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - Hall.Instance.UpdateSecondEvent += timeEvent; - } - protected override void RemoveListener() - { - Hall.Instance.UpdateSecondEvent -= timeEvent; - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUI.cs.meta b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUI.cs.meta deleted file mode 100644 index b101e51..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fd55f74e693624c269d3d70e211b2e6a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUICtrl.cs b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUICtrl.cs deleted file mode 100644 index 28647c4..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class LevelSuccessUICtrl : BaseUICtrl - { - private LevelSuccessUI ui; - private LevelSuccessModel model; - - private uint openUIMsg = UICtrlMsg.LevelSuccessUI_Open; - private uint closeUIMsg = UICtrlMsg.LevelSuccessUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.LevelSuccessModel) as LevelSuccessModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new LevelSuccessUI(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/LevelSuccess/LevelSuccessUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUICtrl.cs.meta deleted file mode 100644 index ed34f11..0000000 --- a/Assets/BingoBrain/ModuleUI/LevelSuccess/LevelSuccessUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8e11350d8494e4786a5913ed38689cbc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm.meta b/Assets/BingoBrain/ModuleUI/MakeupConfirm.meta index e1e6729..693ee00 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm.meta +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7df703f2b68e14715b2d8258520ff908 +guid: c88dc545c836423438690ea89702f985 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmCtrl.cs.meta index 5fdcdbc..561a2c9 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmCtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmCtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 638ec0e8082454320b04693cd0b44117 +guid: 992ca3a050715ff49b56b6eab3472028 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmModel.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmModel.cs.meta index b88230f..2438d23 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmModel.cs.meta +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmModel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6495cd610cfb48a2acc72f826d7f84c +guid: 950aecd0ab2e25940a45cfc16de3c1ce MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs index e2e2da7..0a3b621 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; +using BingoBrain; using BingoBrain.Core; using BingoBrain.HotFix; -using DontConfuse; using FairyGUI; using FGUI.ACommon; -using FGUI.G007_makeup; -using FGUI.JMain; +using FGUI.Common_01; +using FGUI.tixian; using Newtonsoft.Json; using UnityEngine; @@ -17,10 +17,10 @@ namespace BingoBrain { private MakeupConfirmUICtrl ctrl; private MakeupConfirmModel model; - private FGUI.G007_makeup.com_confirm ui; + private FGUI.tixian.com_confirm ui; + private MakeupTaskData makeupTaskData; public int ad_cool_down = 120; private long userUid; - private MakeupTaskData makeupTaskData; public MakeupConfirmUI(MakeupConfirmUICtrl ctrl) : base(ctrl) { uiName = UIConst.MakeupConfirmUI; @@ -29,7 +29,7 @@ namespace BingoBrain protected override void SetUIInfo(UIInfo uiInfo) { - uiInfo.packageName = "G007_makeup"; + uiInfo.packageName = "tixian"; uiInfo.assetName = "com_confirm"; uiInfo.layerType = UILayerType.Popup; uiInfo.isNeedOpenAnim = false; @@ -37,23 +37,35 @@ namespace BingoBrain uiInfo.isNeedUIMask = true; } - #region 生命周期 + protected override void OnInit() { - + //model = ModuleManager.Instance.GetModel(ModelConst.MakeupConfirmModel) as MakeupConfirmModel; } protected override void OnClose() { Hall.Instance.UpdateSecondEvent -= updateSpeedCD; + Hall.Instance.UpdateSecondEvent -= Update; + Hall.Instance.UpdateSecondEvent -= upTaskWatchAdsBtn; + Hall.Instance.UpdateSecondEvent -= upLvWatchAdsBtn; GameHelper.showGameUI = true; - WebviewManager.Instance.SetDarkThough(true); - if (UI.Instance.IsExistUI(UIConst.H5UI)) + // WebviewManager.ShezhiACT(true); + + + + if (UnityEngine.Random.Range(0, 100) < 50) { - WebviewManager.Instance.ShowH5View(true); + if (UnityEngine.Random.Range(0, 50) < 25) + { + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FAQUI_Open); + } + else + { + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RecordViewUI_Open); + } } - gameDispatcher.Dispatch(GameMsg.MakeUpConfirmUIClosed); } protected override void OnBind() @@ -63,36 +75,44 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { - GameHelper.showGameUI = false; - userUid = GameHelper.GetLoginModel().uid; - ad_cool_down = ConfigSystem.GetConfig().WithdrawalaccelerationCD; - - WebviewManager.Instance.SetDarkThough(false); - if (false) - { - + if (Screen.safeArea.y != 0) + {//刘海屏 + ui.group_.y += Screen.safeArea.y; } - else ui.lang.selectedIndex = 1; + userUid = GameHelper.GetLoginModel().uid; + ad_cool_down = ConfigSystem.GetConfig().WwalaccelerationCD; + PreferencesMgr.Instance.MakeupTaskH5Time = 999999999; + + + + // WebviewManager.ShezhiACT(false); makeupTaskData = args as MakeupTaskData; - cash_index = makeupTaskData.tableId - 1; - ui.btn_pay1.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PixPayUI_Open, 1); - }); - ui.com_task.btn_pay2.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PixPayUI_Open, 2); - }); + ch_index = makeupTaskData.tableId - 1; + // PreferencesMgr.Instance.Currency102 = 999999999; //zhushi + // makeupTaskData.LvVideoCount = 999;//zhushi + // makeupTaskData.videoCount = 999;//zhushi + + if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) + { + ui.btn_watch.GetChild("img_saveingpot").visible = true; + } ui.btn_watch.SetClick(WatchBtnClick); + ui.btn_task_watch.SetClick(taskWatchBtnClick); + ui.btn_watchad.SetClick(LvWatchBtnClick); + + // AdRdManager.Instance.SetWatchAd(AdRdManager.MakeupAd, ui.btn_task_watch as btn_watchAd, () =>{}); + // AdRdManager.Instance.SetWatchAd(AdRdManager.MakeupLVAd, ui.btn_watchad as btn_watchAd, () =>{}); + // AdRdManager.Instance.Start(); Hall.Instance.UpdateSecondEvent += updateSpeedCD; - updateSpeedCD(); + Hall.Instance.UpdateSecondEvent += Update; + Hall.Instance.UpdateSecondEvent += upTaskWatchAdsBtn; + ui.text_chdate3.text = GameHelper.getDesByKey("makeup_11"); InitView(); initButtom(); - GameHelper.SetSelfAvatar(ui.com_pay.btn_menu.GetChild("head_loader") as GLoader); } protected override void OnOpen(object args) @@ -107,20 +127,49 @@ namespace BingoBrain { } - #endregion - #region 消息 + + protected override void AddListener() { - // GameDispatcher.Instance.AddListener(GameMsg.PaySuccess, InitView); + } protected override void RemoveListener() { } - #endregion + private void Update() + { + if (ui.cont_state.selectedIndex == 5) + { + Debug.Log("???????kkkkkkkkk"); + ui.text_leveltime.text = GameHelper.TimeFormat((int)makeupTaskData.ch_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + if ((GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().ExchangeProcessMode == 1) || (!GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().CHProcessMode == 1)) + { + ui.text_leveltime.visible = ui.text_cashneedlv.visible = false; + ui.level_state.selectedIndex = 0; + } + else + { + if (makeupTaskData.ch_time > GameHelper.GetNowTime()) + { + ui.level_state.selectedIndex = 0; + } + else + { + if (ConfigSystem.GetConfig().ExpiryUnlock == 0) + { + makeupTaskData.ch_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig().BalanceExpired * 3600; + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + } + else ui.level_state.selectedIndex = 1; + } + } + + } + } private void InitView(object a = null) { @@ -128,65 +177,249 @@ namespace BingoBrain { return; } + if (PreferencesMgr.Instance.MakeupTaskHistory.Count > 1) + { + ui.group_.visible = true; + } + else + { + if (PreferencesMgr.Instance.MakeupTaskHistory[0].status >= MakeupTaskStatus.Level) ui.group_.visible = true; + } + initTop(); ui.btn_close.SetClick(CtrlCloseUI); - if (GameHelper.needShowLevelstate(now_selectindex)) + + if ((GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().ExchangeProcessMode == 1) || (!GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().CHProcessMode == 1)) { - ui.cont_state.selectedIndex = 5; - Debug.Log(makeupTaskData.tableId); - var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); - Debug.Log(vo.id); - - ui.text_cashneedlv.text = string.Format(ui.text_cashneedlv.text, vo.levels_need); - ui.text_nowcash.text = "$" + PreferencesMgr.Instance.Currency102; - ui.text_cash_title.text = "Level " + vo.levels_need; - if (GameHelper.GetLevel() <= vo.levels_need) + if (makeupTaskData.status == MakeupTaskStatus.Level) { - ui.btn_check_level.grayed = true; - ui.btn_check_level.SetClick(() => + Debug.Log("00000000000000000003"); + ui.cont_state.selectedIndex = 5; + Update(); + var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + + string str = string.Format(GameHelper.getDesByKey("makeup_6"), vo.levels_need); + ui.text_chneedlv.text = str; + ui.lab_lv_need_des.SetVar("num", ConfigSystem.GetConfig().ExpiryUnlock.ToString()).FlushVars(); + Debug.Log(ConfigSystem.GetConfig().ExpiryUnlock); + str = string.Format("Owner ADs: {0}/{1}", makeupTaskData.LvVideoCount, ConfigSystem.GetConfig().ExpiryUnlock); + ui.lab_ads.text = str; + ui.text_nowch.text = GameHelper.Get102Str(PreferencesMgr.Instance.Currency102); + ui.text_ch_title.text = "Level " + vo.levels_need; + if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) { - GameHelper.ShowTips("withdrawal level not reached."); - }); - } - else - { - ui.btn_check_level.SetClick(() => + (ui.btn_watchad.GetChild("img_saveingpot") as GImage).visible = true; + } + if (GameHelper.GetLevel() <= vo.levels_need) { - PlayerPrefs.SetInt("cash_lv", vo.id); - InitView(); - }); - } - return; + ui.btn_check_level.title = "Go"; + // if (UIManager.Instance.IsExistUI(UIConst.RainPlayUI)) + // { + // ui.btn_check_level.SetClick(() => + // { + // CtrlCloseUI(); + // }); + // } + // else + // { + // ui.btn_check_level.SetClick(() => + // { + // GameDispatcher.Instance.Dispatch(BingoInfo.OpenGame); + // CtrlCloseUI(); + // }); + // } - } - - if (makeupTaskData.status == MakeupTaskStatus.None) - { - if (PreferencesMgr.Instance.ExchangeAccount == null) - { - OnEnter(); + } + else + { + ui.btn_check_level.title = GameHelper.getDesByKey("ch_out_2"); + ui.btn_check_level.SetClick(() => + { + // PlayerPrefs.SetInt("ch_lv", vo.id); + makeupTaskData.SetStatus(MakeupTaskStatus.None); + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + InitView(); + }); + } } - else + else if (makeupTaskData.status == MakeupTaskStatus.None) { + Debug.Log("0000000000000000000"); OnConfirm(); } + else if (string.IsNullOrEmpty(makeupTaskData.ExchangeAccount) && !GameHelper.isRDExchangeMode()) + { + Debug.Log("00000000000000000001"); + OnEnter(); + } + else if (makeupTaskData.status == MakeupTaskStatus.Task) + { + Debug.Log("00000000000000000002"); + OnTask(); + } + + else if (makeupTaskData.status == MakeupTaskStatus.Inline) + { + OnInline(); + } + else if (makeupTaskData.status == MakeupTaskStatus.editAccount) + { + Debug.Log("00000000000000000004"); + OnEnter(); + } + else if (makeupTaskData.status == MakeupTaskStatus.ticket) + { + onTicket(); + } + else if (makeupTaskData.status == MakeupTaskStatus.code) + { + onCode(); + } + } - else if (makeupTaskData.status == MakeupTaskStatus.Task) + else { - OnTask(); - } - else if (makeupTaskData.status == MakeupTaskStatus.Inline) - { - OnInline(); + if (makeupTaskData.status == MakeupTaskStatus.None) + { + Debug.Log("0000000000000000000"); + OnConfirm(); + } + else if (string.IsNullOrEmpty(makeupTaskData.ExchangeAccount) && !GameHelper.isRDExchangeMode()) + { + Debug.Log("00000000000000000001"); + OnEnter(); + } + else if (makeupTaskData.status == MakeupTaskStatus.Task) + { + Debug.Log("00000000000000000002"); + OnTask(); + } + else if (makeupTaskData.status == MakeupTaskStatus.Level) + { + Debug.Log("00000000000000000003"); + ui.cont_state.selectedIndex = 5; + Update(); + var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + + string str = string.Format(GameHelper.getDesByKey("makeup_6"), vo.levels_need); + ui.text_chneedlv.text = str; + ui.lab_lv_need_des.SetVar("num", ConfigSystem.GetConfig().ExpiryUnlock.ToString()).FlushVars(); + Debug.Log(ConfigSystem.GetConfig().ExpiryUnlock); + str = string.Format("Owner ADs: {0}/{1}", makeupTaskData.LvVideoCount, ConfigSystem.GetConfig().ExpiryUnlock); + ui.lab_ads.text = str; + ui.text_nowch.text = GameHelper.Get102Str(PreferencesMgr.Instance.Currency102); + ui.text_ch_title.text = "Level " + vo.levels_need; + if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) + { + (ui.btn_watchad.GetChild("img_saveingpot") as GImage).visible = true; + } + + if (GameHelper.GetLevel() <= vo.levels_need) + { + ui.btn_check_level.title = "Go"; + // if (UIManager.Instance.IsExistUI(UIConst.RainPlayUI)) + // { + // ui.btn_check_level.SetClick(() => + // { + // CtrlCloseUI(); + // }); + // } + // else + // { + // ui.btn_check_level.SetClick(() => + // { + // GameDispatcher.Instance.Dispatch(BingoInfo.OpenGame); + // CtrlCloseUI(); + // }); + // } + + } + else + { + ui.btn_check_level.title = GameHelper.getDesByKey("ch_out_2"); + ui.btn_check_level.SetClick(() => + { + // PlayerPrefs.SetInt("ch_lv", vo.id); + SaveData.GetSaveobject().chout_lv = vo.id; + SaveData.saveDataFunc(); + GameHelper.ShowLoading(1, 2, () => + { + TuSystem.Consume(vo.item, vo.item_need, isSuccess => + { + makeupTaskData.SetStatus(MakeupTaskStatus.Inline); + makeupTaskData.inlineInitNum = + UnityEngine.Random.Range(ConfigSystem.GetConfig().inlineInitNum[0], + ConfigSystem.GetConfig().inlineInitNum[1]); + makeupTaskData.inlineNum = UnityEngine.Random.Range( + ConfigSystem.GetConfig().inlineInitNum[0], + makeupTaskData.inlineInitNum); + makeupTaskData.order_time = GameHelper.GetNowTime(); + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + GameDispatcher.Instance.Dispatch(BingoInfo.Update102); + //OnInline(); + // Debug.Log(JsonConvert.SerializeObject(vo)); + // if (vo.id == 1) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 1); + + // } + // else if (vo.id == 2) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 2); + // } + // else if (vo.id == 3) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 3); + // } + if (vo.id != 3) + { + ch_index++; + } + InitView(); + if (vo.id == 3) + { + // PlayerPrefs.SetInt("ch_lv", 2); + SaveData.GetSaveobject().chout_lv = 2; + SaveData.saveDataFunc(); + makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); + } + + }); + }); + InitView(); + }); + } + } + else if (makeupTaskData.status == MakeupTaskStatus.Inline) + { + OnInline(); + } + else if (makeupTaskData.status == MakeupTaskStatus.editAccount) + { + Debug.Log("00000000000000000004"); + OnEnter(); + } + else if (makeupTaskData.status == MakeupTaskStatus.ticket) + { + onTicket(); + } + else if (makeupTaskData.status == MakeupTaskStatus.code) + { + onCode(); + } + } + upTaskWatchAdsBtn(); + updateSpeedCD(); + Update(); } private int now_selectindex = 0; - private int cash_index = 0; + private int ch_index = 0; void initTop() { - Debug.Log(JsonConvert.SerializeObject(PreferencesMgr.Instance.MakeupTaskHistory)); - List btn_list = new List() { ui.com_cashlevel.btn_0, ui.com_cashlevel.btn_1, ui.com_cashlevel.btn_2 }; + // Debug.Log(JsonConvert.SerializeObject(DataMgr.MakeupTaskHistory.Value)); + List btn_list = new List() { ui.com_chlevel.btn_0, ui.com_chlevel.btn_1, ui.com_chlevel.btn_2 }; List makeup_list = ConfigSystem.GetConfig().dataList; now_selectindex = makeupTaskData.tableId - 1; @@ -194,19 +427,26 @@ namespace BingoBrain { btn_list[i].text_level0.text = "Level " + makeup_list[i].levels_need; btn_list[i].text_level1.text = "Level " + makeup_list[i].levels_need; - if (i < cash_index) + btn_list[i].text_level2.text = "Level " + makeup_list[i].levels_need; + if (i < ch_index) { btn_list[i].img_check.visible = true; + // btn_list[i].text_level0.y = 4; + // btn_list[i].text_level1.y = 4; + } else { btn_list[i].img_check.visible = false; + // btn_list[i].text_level0.y = 38; + // btn_list[i].text_level1.y = 38; } + if (i == now_selectindex) { btn_list[i].btn_state.selectedIndex = 1; } - else if (i > cash_index) + else if (i > ch_index) { btn_list[i].btn_state.selectedIndex = 2; int _temp_index = i; @@ -246,51 +486,41 @@ namespace BingoBrain { SaveData.GetSaveobject().login_day = day; SaveData.GetSaveobject().login_hour = 0; - // public int cash_people; - // public float cash_people_1; - // public float cash_people_2; - SaveData.GetSaveobject().cash_people = UnityEngine.Random.Range(500, 800); - SaveData.GetSaveobject().cash_people_1 = UnityEngine.Random.Range(20, 30); - SaveData.GetSaveobject().cash_people_2 = UnityEngine.Random.Range(3, 6) * 100; + // public int ch_people; + // public float ch_people_1; + // public float ch_people_2; + SaveData.GetSaveobject().ch_people = UnityEngine.Random.Range(500, 800); + SaveData.GetSaveobject().ch_people_1 = UnityEngine.Random.Range(20, 30); + SaveData.GetSaveobject().ch_people_2 = UnityEngine.Random.Range(3, 6) * 100; SaveData.saveDataFunc(); } if (hour != SaveData.GetSaveobject().login_hour) { - SaveData.GetSaveobject().cash_people += ((hour - SaveData.GetSaveobject().login_hour) / 3) * UnityEngine.Random.Range(8, 10); - SaveData.GetSaveobject().cash_people_1 += ((hour - SaveData.GetSaveobject().login_hour) / 3) * UnityEngine.Random.Range(10, 15); - SaveData.GetSaveobject().cash_people_2 += ((hour - SaveData.GetSaveobject().login_hour) / 3) * UnityEngine.Random.Range(1, 3) * 100; + SaveData.GetSaveobject().ch_people += ((hour - SaveData.GetSaveobject().login_hour) / 3) * UnityEngine.Random.Range(8, 10); + SaveData.GetSaveobject().ch_people_1 += ((hour - SaveData.GetSaveobject().login_hour) / 3) * UnityEngine.Random.Range(10, 15); + SaveData.GetSaveobject().ch_people_2 += ((hour - SaveData.GetSaveobject().login_hour) / 3) * UnityEngine.Random.Range(1, 3) * 100; if (hour - SaveData.GetSaveobject().login_hour >= 3) SaveData.GetSaveobject().login_hour = hour; SaveData.saveDataFunc(); } - ui.text_number0.text = SaveData.GetSaveobject().cash_people.ToString(); - ui.text_number1.text = SaveData.GetSaveobject().cash_people_1.ToString(); - ui.text_number2.text = "$" + SaveData.GetSaveobject().cash_people_2; - ui.text_cashdate.text = string.Format(ui.text_cashdate.text, DateTime.Now.Year + "." + DateTime.Now.Month + "." + DateTime.Now.Day); + ui.text_number0.text = SaveData.GetSaveobject().ch_people.ToString(); + ui.text_number1.text = SaveData.GetSaveobject().ch_people_1.ToString(); + ui.text_number2.text = GameHelper.Get102Str((decimal)SaveData.GetSaveobject().ch_people_2); + ui.text_chdate.text = string.Format(ui.text_chdate.text, DateTime.Now.Year + "." + DateTime.Now.Month + "." + DateTime.Now.Day); } private void OnEnter() { GTextInput enter_input = null; - - // ui.text_title.SetVar("payer", GameHelper.GetPaymentPayer()).FlushVars(); - //ui.text_smaill_title.SetVar("payer", GameHelper.GetPaymentPayer()).FlushVars(); - - // if (false) - // { - // ui.text_title.SetVar("payer", "Pix").FlushVars(); - // ui.text_smaill_title.SetVar("payer", "Pix").FlushVars(); - // } - - ui.com_info.cont_type.selectedIndex = 0; enter_input = ui.com_info.enter_email; - ui.cont_state.selectedIndex = 0; + ui.text_title.text = GameHelper.getDesByKey("makeup_9"); + ui.text_smaill_title.text = GameHelper.getDesByKey("makeup_10"); ui.btn_tab.SetClick(() => { var account = enter_input.text.Replace(" ", ""); @@ -314,25 +544,29 @@ namespace BingoBrain } var lname = ui.com_lname.enter_lname.text.Replace(" ", ""); - if (!GameHelper.CheckNameValidly(lname) && !false) + if (!GameHelper.CheckNameValidly(lname)) { GameHelper.ShowTips("Please enter the correct account information", true); return; } - PreferencesMgr.Instance.ExchangeAccount = account; - PreferencesMgr.Instance.ExchangeName = $"{fname} {lname}"; - PreferencesMgr.Instance.short_name = fname; - PreferencesMgr.Instance.long_name = lname; - showPaypal(); - //uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupStepUI_Open, makeupTaskData); - //CtrlCloseUI(); + + makeupTaskData.ExchangeAccount = account; + makeupTaskData.ExchangeName = $"{fname} {lname}"; + makeupTaskData.short_name = fname; + makeupTaskData.long_name = lname; + if (GameHelper.isRDExchangeMode()) + { + makeupTaskData.SetStatus(MakeupTaskStatus.ticket); + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + InitView(); + } + else + { + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + showPaypal(); + } }); - ui.btn_back.SetClick(() => - { - CtrlCloseUI(); - - }); } void showPaypal() @@ -345,13 +579,15 @@ namespace BingoBrain } - ui.com_pay.text_name.text = PreferencesMgr.Instance.ExchangeName; - ui.com_pay.text_email.text = PreferencesMgr.Instance.ExchangeAccount; + ui.com_pay.text_name.text = makeupTaskData.ExchangeName; + ui.com_pay.text_email.text = makeupTaskData.ExchangeAccount; + // var avatarId = DataMgr.PlayerAvatarId.Value; + // TextureHelper.SetAvatarToLoader(avatarId, ui.com_pay.head.GetChild("load_avatar") as GLoader); ui.com_pay.btn_change.SetClick(() => { - PreferencesMgr.Instance.ExchangeName = null; - PreferencesMgr.Instance.ExchangeAccount = null; + makeupTaskData.ExchangeName = null; + makeupTaskData.ExchangeAccount = null; ui.cont_state.selectedIndex = 0; // uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupConfirmUI_Open, makeupTaskData); @@ -363,53 +599,20 @@ namespace BingoBrain ui.btn_confirm.SetClick(() => { - var info = new - { - email = PreferencesMgr.Instance.ExchangeAccount, - first_name = PreferencesMgr.Instance.short_name, - last_name = PreferencesMgr.Instance.long_name - }; - NetworkKit.PostWithHeader("shop/payOutUserInfo", info, (isSuccess, obj) => - { - if (isSuccess) - { - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_message, 1); + // NetApi.PayOutUserInfo(makeupTaskData.ExchangeAccount, + // makeupTaskData.short_name, makeupTaskData.long_name, (isSuccess, obj) => + // { + // if (isSuccess) + // { + // } + // }); + + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawMessage); + makeupTaskData.SetStatus(MakeupTaskStatus.Task); InitView(); // uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupConfirmUI_Open, makeupTaskData); //CtrlCloseUI(); }); - - //TextureHelper.GetCardIcon(true, spr => { ui.loader_payer.texture = spr; }); - - // ui.text_warn.SetVar("app", Application.productName).FlushVars(); - // if (GameHelper.GetCurrCountry().ToUpper().Equals("RU")) - // { - // ui.text_warn.SetVar("payer", "Qiwi").FlushVars(); - // ui.com_info.cont_counrty.selectedIndex = com_info.Counrty_ru; - // ui.btn_confirm.country.selectedIndex = btn_confirm.Country_ru; - // ui.com_trans.cont_country.selectedIndex = com_trans.Country_ru; - // ui.lang.selectedIndex = com_step.Lang_en; - // } - // else if (false) - // { - // ui.text_warn.SetVar("payer", "Pix").FlushVars(); - // ui.com_info.cont_counrty.selectedIndex = com_info.Counrty_pt; - // ui.btn_confirm.country.selectedIndex = btn_confirm.Country_ru; - // ui.com_trans.cont_country.selectedIndex = com_trans.Country_pt; - // ui.lang.selectedIndex = com_step.Lang_pt; - // } - // else - // { - // ui.text_warn.SetVar("payer", "Paypal").FlushVars(); - // ui.com_info.cont_counrty.selectedIndex = com_info.Counrty_default; - // ui.btn_confirm.country.selectedIndex = btn_confirm.Country_default; - // ui.com_trans.cont_country.selectedIndex = com_trans.Country_default; - // ui.lang.selectedIndex = com_step.Lang_en; - // } - - } private void OnConfirm() @@ -422,66 +625,47 @@ namespace BingoBrain return; } - ui.text_condi1.SetVar("cash", "$" + vo.item_need).FlushVars(); + ui.text_condi1.text = GameHelper.getChString(vo.item_need); ui.pb_condi1.max = vo.item_need; + ui.text_ch_number.text = GameHelper.getChString(PreferencesMgr.Instance.Currency102); var curValue = Math.Min(PreferencesMgr.Instance.Currency102, vo.item_need); ui.pb_condi1.value = (double)curValue; - var textTitle = ui.pb_condi1.GetChild("title"); if (textTitle != null) { - textTitle.text = $"{"$" + curValue}/{"$" + vo.item_need}"; + textTitle.text = GameHelper.getChString(curValue) + "/" + GameHelper.getChString(vo.item_need); } - var taskTime = (int)((float)vo.task_need / 60 * 100) * 0.01F; var completeTaskTime = (int)((float)PreferencesMgr.Instance.MakeupTaskH5Time / 60 * 100) * 0.01F; var completeTaskValue = Math.Min(completeTaskTime, taskTime); - ui.text_condi2.SetVar("hot", taskTime.ToString()).FlushVars(); - ui.pb_condi2.max = taskTime; - ui.pb_condi2.value = completeTaskValue; - ui.pb_condi2.title.text = $"{completeTaskValue}/{taskTime}"; - if (PreferencesMgr.Instance.MakeupTaskH5Time < vo.task_need && false) - { - ui.show_pay.selectedIndex = 1; - } - else ui.show_pay.selectedIndex = 0; - - //ui.text_wallet.SetVar("Payer", GameHelper.GetPaymentPayer()).FlushVars(); - if (false) ui.text_wallet.text = "Pix"; - ui.text_cash.text = "$" + makeupTaskData.GetAmountStr(); - ui.text_account.text = PreferencesMgr.Instance.ExchangeAccount; if (PreferencesMgr.Instance.Currency102 >= vo.item_need && completeTaskTime >= taskTime) { ui.cont_confirm.selectedIndex = 0; + ui.btn_earn.SetClick(() => { - - if (Audio.Instance.IsOpenEffect) - { - Audio.Instance.PlayDynamicEffect("makupdone"); - } + Audio.Instance.PlayDynamicEffect("makupdone"); makeupTaskData.SetStatus(MakeupTaskStatus.Task); PreferencesMgr.Instance.SaveMakeupTaskHistory(); - OnTask(); + // OnTask(); + InitView(); }); } else { ui.cont_confirm.selectedIndex = 1; + (ui.btn_earn as FGUI.tixian.btn_get).state.selectedIndex = 1; ui.btn_earn.SetClick(() => { - if (Audio.Instance.IsOpenEffect) - { - Audio.Instance.PlayDynamicEffect("makupdone"); - } - UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); - //GameDispatcher.Instance.Dispatch(GameMsg.MainTab, 1); + // AudioManager.Instance.PlayDynamicEffect(AudioConst.MakeupDone); + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open); + // //GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 1); CtrlCloseUI(); - WebviewManager.Instance.SetDarkThough(true); + // }); } } @@ -493,84 +677,114 @@ namespace BingoBrain { return; } - // makeupTaskData.videoCount = 10; ui.cont_state.selectedIndex = 2; ui.com_task.text_orderid.text = makeupTaskData.orderID; ui.com_task.text_task_title.SetVar("ad", vo.ad_need.ToString()).FlushVars(); ui.com_task.text_ads.text = $"{makeupTaskData.videoCount}/{vo.ad_need}"; - // if (false && makeupTaskData.videoCount < vo.ad_need) ui.com_task.lang.selectedIndex = com_task.Lang_pt; - ui.com_task.lang.selectedIndex = 1; - - ui.com_task.text_payer.SetVar("amt", makeupTaskData.GetAmountStr()).FlushVars(); + ui.com_task.text_payer.SetVar("amt", "$" + makeupTaskData.GetAmountStr()).FlushVars(); + if (GameHelper.isRDExchangeMode()) + { + ui.com_task.text_task.text = GameHelper.getDesByKey("makeup_12"); + } + else + { + string str = string.Format(GameHelper.getDesByKey("makeup_12"), makeupTaskData.GetAmountStr()); + ui.com_task.text_task.text = str; + } if (makeupTaskData.videoCount >= vo.ad_need) { ui.com_task.cont_process.selectedIndex = 1; + ui.cont_confirm.selectedIndex = 0; + } - else ui.com_task.cont_process.selectedIndex = 0; - ui.btn_cashout.SetClick(() => + else { - if (makeupTaskData.videoCount >= vo.ad_need) + ui.com_task.cont_process.selectedIndex = 0; + ui.cont_confirm.selectedIndex = 1; + } + if (makeupTaskData.videoCount >= vo.ad_need) + { + (ui.btn_chout as FGUI.tixian.btn_get).state.selectedIndex = 0; + ui.btn_chout.SetClick(() => { - GameHelper.ShowLoading(1, 2, () => + if (makeupTaskData.videoCount >= vo.ad_need) { - TuSystem.Consume(vo.item, vo.item_need, isSuccess => + if ((GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().ExchangeProcessMode == 1) || (!GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().CHProcessMode == 1)) { - makeupTaskData.SetStatus(MakeupTaskStatus.Inline); - makeupTaskData.inlineInitNum = - UnityEngine.Random.Range(ConfigSystem.GetConfig().inlineInitNum[0], - ConfigSystem.GetConfig().inlineInitNum[1]); - makeupTaskData.inlineNum = UnityEngine.Random.Range( - ConfigSystem.GetConfig().inlineInitNum[0], - makeupTaskData.inlineInitNum); - makeupTaskData.order_time = GameHelper.GetNowTime(); + // makeupTaskData.SetStatus(MakeupTaskStatus.Inline); + // makeupTaskData.ch_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig().BalanceExpired * 3600; + // PreferencesMgr.Instance.SaveMakeupTaskHistory(); + // InitView(); + GameHelper.ShowLoading(1, 2, () => + { + TuSystem.Consume(vo.item, vo.item_need, isSuccess => + { + makeupTaskData.SetStatus(MakeupTaskStatus.Inline); + makeupTaskData.inlineInitNum = + UnityEngine.Random.Range(ConfigSystem.GetConfig().inlineInitNum[0], + ConfigSystem.GetConfig().inlineInitNum[1]); + makeupTaskData.inlineNum = UnityEngine.Random.Range( + ConfigSystem.GetConfig().inlineInitNum[0], + makeupTaskData.inlineInitNum); + makeupTaskData.order_time = GameHelper.GetNowTime(); + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + GameDispatcher.Instance.Dispatch(BingoInfo.Update102); + //OnInline(); + // Debug.Log(JsonConvert.SerializeObject(vo)); + // if (vo.id == 1) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 1); + + // } + // else if (vo.id == 2) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 2); + // } + // else if (vo.id == 3) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawCash, 3); + // } + if (vo.id != 3) + { + ch_index++; + } + InitView(); + if (vo.id == 3) + { + // PlayerPrefs.SetInt("ch_lv", 2); + SaveData.GetSaveobject().chout_lv = 2; + SaveData.saveDataFunc(); + makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); + } + + }); + }); + } + else + { + makeupTaskData.SetStatus(MakeupTaskStatus.Level); + makeupTaskData.ch_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig().BalanceExpired * 3600; PreferencesMgr.Instance.SaveMakeupTaskHistory(); - - OnInline(); - makeup vo = null; - foreach (makeup item in ConfigSystem.GetConfig().dataList) - { - if (item.id == makeupTaskData.tableId) vo = item; - } - - PreferencesMgr.Instance.Currency102 -= vo.item_need; - Debug.Log(JsonConvert.SerializeObject(vo)); - if (vo.id == 1) - { - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_cash1, 1); - } - else if (vo.id == 2) - { - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_cash2, 1); - } - else if (vo.id == 3) - { - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_cash3, 1); - } - if (vo.id != 3) - { - cash_index++; - } - GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); - GameDispatcher.Instance.Dispatch(BingoInfo.Update102); InitView(); - if (vo.id == 3) - { - PlayerPrefs.SetInt("cash_lv", 2); - makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - } - - }); - }); - - } - else + } + } + else + { + CtrlCloseUI(); + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open); + // MainTabUI.getIns().OnGameTab(1); + } + }); + } + else + { + (ui.btn_chout as FGUI.tixian.btn_get).state.selectedIndex = 1; + ui.btn_chout.SetClick(() => { - CtrlCloseUI(); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); - // MainTabUI.getIns().OnGameTab(1); - } - }); + GameHelper.ShowTips("The AD viewing task has not been completed."); + }); + } } private void OnInline() @@ -585,34 +799,45 @@ namespace BingoBrain .SetVar("tol", makeupTaskData.inlineInitNum.ToString()).FlushVars(); CheckActive(makeupTaskData.tableId); - GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); + GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); ui.btn_tab.SetClick(CtrlCloseUI); - ui.btn_record.SetClick(() => - { - //uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupRecordUI_Open); - // MainTabUI.getIns().OnGameTab(3); - CtrlCloseUI(); - }); + RefreshRecordData(); } - #region 兑换加速 + private void RefreshRecordData() { var data = makeupTaskData; + if (data.inlineNum <= 1 && GameHelper.isRDExchangeMode()) + { + ui.cont_confirm.selectedIndex = 0; + ui.btn_inline_ok.SetClick(() => + { + makeupTaskData.SetStatus(MakeupTaskStatus.editAccount); + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + InitView(); + }); + + // return; + } + else + { + ui.cont_confirm.selectedIndex = 1; + } + + var com_rank = ui.com_newRecord.com_rank; - var com_cord = ui.com_newRecord.com_cord; + com_rank.lab_title_des.text = GameHelper.getDesByKey("makeup_7"); + com_rank.lab_rank_tips.text = GameHelper.getDesByKey("makeup_8"); - com_cord.email_text.text = PreferencesMgr.Instance.ExchangeAccount; - com_cord.number_text.text = data.inlineNum + "/" + data.inlineInitNum; + var rdVOModel = ConfigSystem.GetConfig().dataList + .FirstOrDefault(rd => rd.id == data.tableId); + if (rdVOModel == null) return; - var redeemVOModel = ConfigSystem.GetConfig().dataList - .FirstOrDefault(redeem => redeem.id == data.tableId); - if (redeemVOModel == null) return; - - if (redeemVOModel.AD_Limit_times <= data.WatchVideoSpeedNum) + if (rdVOModel.AD_Limit_times <= data.WatchVideoSpeedNum) { ui.btn_watch.enabled = false; ui.btn_watch.visible = false; @@ -624,13 +849,13 @@ namespace BingoBrain ui.btn_watch.enabled = true; ui.btn_watch.visible = true; com_rank.content1.selectedIndex = 0; - com_rank.text_rank1.SetVar("rank", redeemVOModel.AD_Down.ToString()).FlushVars(); + com_rank.text_rank1.SetVar("rank", rdVOModel.AD_Down.ToString()).FlushVars(); } - if (redeemVOModel.Login_Limit_times <= data.loginSpeedNum) + if (rdVOModel.Login_Limit_times <= data.loginSpeedNum) { com_rank.content2.selectedIndex = 1; - com_rank.text_rank2.SetVar("rank", redeemVOModel.Login_Limit_times.ToString()).FlushVars(); + com_rank.text_rank2.SetVar("rank", rdVOModel.Login_Limit_times.ToString()).FlushVars(); } else { @@ -639,17 +864,17 @@ namespace BingoBrain com_rank.text_rank2.SetVar("rank", loginRans).FlushVars(); } - if (redeemVOModel.Active_Limit_times <= data.activeSpeedNum) + if (rdVOModel.Active_Limit_times <= data.activeSpeedNum) { com_rank.content3.selectedIndex = 1; - com_rank.text_rank3.SetVar("rank", redeemVOModel.Active_Limit_times.ToString()).FlushVars(); + com_rank.text_rank3.SetVar("rank", rdVOModel.Active_Limit_times.ToString()).FlushVars(); } else { com_rank.content3.selectedIndex = 0; - com_rank.text_rank3.SetVar("time", redeemVOModel.Active_time.ToString()).FlushVars(); - com_rank.text_rank3.SetVar("rank", redeemVOModel.Active_time_Down.ToString()).FlushVars(); + com_rank.text_rank3.SetVar("time", rdVOModel.Active_time.ToString()).FlushVars(); + com_rank.text_rank3.SetVar("rank", rdVOModel.Active_time_Down.ToString()).FlushVars(); if (GameHelper.activeTimes.TryGetValue(data.tableId, out int openTimes)) { @@ -660,21 +885,21 @@ namespace BingoBrain int min_num = ((int)Time.time - data.activeMinute) / 60; //是配置的活跃时间的多少倍 - int active_times = min_num / redeemVOModel.Active_time; + int active_times = min_num / rdVOModel.Active_time; Debug.Log($"min_num=== {min_num} {active_times} "); if (active_times > 0) { data.activeMinute = (int)Time.time; // 可以加速多少排名 - int rank_num = active_times * redeemVOModel.Active_time_Down; + int rank_num = active_times * rdVOModel.Active_time_Down; var last = data.activeSpeedNum; data.activeSpeedNum += rank_num; - Debug.Log($"rank_num=== {rank_num} {last} {data.activeSpeedNum} {redeemVOModel.Active_Limit_times}"); - if (data.activeSpeedNum > redeemVOModel.Active_Limit_times) + Debug.Log($"rank_num=== {rank_num} {last} {data.activeSpeedNum} {rdVOModel.Active_Limit_times}"); + if (data.activeSpeedNum > rdVOModel.Active_Limit_times) { - rank_num = redeemVOModel.Active_Limit_times - last; - data.activeSpeedNum = redeemVOModel.Active_Limit_times; + rank_num = rdVOModel.Active_Limit_times - last; + data.activeSpeedNum = rdVOModel.Active_Limit_times; } data.inlineNum -= rank_num; @@ -693,13 +918,135 @@ namespace BingoBrain } } - com_cord.text_amt.text = $"+{data.amountStr}"; - if (data.order_time != 0) + com_rank.text_ranks.text = data.inlineNum.ToString(); + } + + void onTicket() + { + var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + ui.cont_state.selectedIndex = 6; + ui.lab_mn.text = ui.lab_mn.text; + + if (makeupTaskData.rdData != null && makeupTaskData.rdData.Count > 0) { - com_cord.time_text.text = DateTimeBoardk.Instance.TimestampToString(data.order_time); + makeupTaskData.rdData.Sort((a, b) => + { + if (a.isClaimed == b.isClaimed) + { + return b.coupon_mount.CompareTo(a.coupon_mount); + } + else + { + return a.isClaimed ? 1 : -1; + } + }); + } + else + { + makeupTaskData.rdData = new List(); + int[] arr = ConfigSystem.GetConfig().BalanceExchange; + Array.Sort(arr, (a, b) => b.CompareTo(a)); + int remainValue = vo.item_need; + List tickets = new List(); + for (int i = 0; i < arr.Length; i++) + { + tickets.Add(remainValue / arr[i]); + remainValue = remainValue % arr[i]; + for (int j = 0; j < tickets[i]; j++) + { + makeupRdData data = new makeupRdData(); + data.code = GameHelper.GenerateUniqueKey(); + data.coupon_mount = arr[i]; + data.isClaimed = false; + makeupTaskData.rdData.Add(data); + } + } + PreferencesMgr.Instance.SaveMakeupTaskHistory(); } - com_rank.text_ranks.text = data.inlineNum.ToString(); + int value = 0; + for (int i = 0; i < makeupTaskData.rdData.Count; i++) + { + if (makeupTaskData.rdData[i].isClaimed) + { + value += makeupTaskData.rdData[i].coupon_mount; + } + } + ui.lab_mn.text = GameHelper.Get101Str(vo.item_need - value); + + ui.list_kicket.itemRenderer = refreshItem; + ui.list_kicket.numItems = makeupTaskData.rdData.Count; + } + + private void refreshItem(int index, GObject obj) + { + com_ticket_item item = (com_ticket_item)obj; + + item.lab_num.text = GameHelper.getPrice(makeupTaskData.rdData[index].coupon_mount); + + if (makeupTaskData.rdData[index].isClaimed) + { + item.btn_claim.state.selectedIndex = 1; + item.btn_claim.title = "Claimed"; + } + else + { + item.btn_claim.state.selectedIndex = 0; + item.btn_claim.title = "Claim"; + } + + item.btn_claim.SetClick(() => + { + makeupTaskData.SetStatus(MakeupTaskStatus.code); + makeupTaskData.rdData[index].isClaimed = true; + makeupTaskData.lastRdData = makeupTaskData.rdData[index]; + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + + onCode(); + }); + } + + void onCode() + { + if (makeupTaskData.lastRdData == null) + { + ui.cont_state.selectedIndex = 6; + makeupTaskData.SetStatus(MakeupTaskStatus.ticket); + return; + } + ui.cont_state.selectedIndex = 7; + + int value = 0; + for (int i = 0; i < makeupTaskData.rdData.Count; i++) + { + if (makeupTaskData.rdData[i].isClaimed) + { + value += makeupTaskData.rdData[i].coupon_mount; + } + } + + var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + ui.lab_mn2.text = GameHelper.Get101Str(vo.item_need - value); + ui.lab_ticket.text = GameHelper.GetPriceInt(makeupTaskData.lastRdData.coupon_mount); + ui.lab_code.text = makeupTaskData.lastRdData.code; + + ui.btn_back.SetClick(() => + { + ui.cont_state.selectedIndex = 6; + makeupTaskData.SetStatus(MakeupTaskStatus.ticket); + InitView(); + }); + + ui.btn_copy.SetClick(() => + { + GameHelper.CopyText(ui.lab_code.text); + }); + + ui.btn_contact_us.SetClick(() => + { + GameHelper.OpenEmail(); + }); + } void CheckBtnWatchStatus() @@ -710,11 +1057,11 @@ namespace BingoBrain { return; } - var CardRedeemVOModel = ConfigSystem.GetConfig().dataList - .FirstOrDefault(redeem => redeem.id == data.tableId); - if (CardRedeemVOModel == null) return; + var CardRdVOModel = ConfigSystem.GetConfig().dataList + .FirstOrDefault(rd => rd.id == data.tableId); + if (CardRdVOModel == null) return; - bool isShow = CardRedeemVOModel.AD_Limit_times > data.WatchVideoSpeedNum && data.inlineNum > GameHelper.GetCommonModel().inlineMin; + bool isShow = CardRdVOModel.AD_Limit_times > data.WatchVideoSpeedNum && data.inlineNum > GameHelper.GetCommonModel().inlineMin; ui.btn_watch.enabled = isShow; @@ -733,7 +1080,7 @@ namespace BingoBrain } else { - Hall.Instance.UpdateSecondEvent -= updateSpeedCD; + ui.btn_watch.enabled = true; ui.btn_watch.show_cd.selectedIndex = 0; } @@ -759,7 +1106,6 @@ namespace BingoBrain void WatchBtnClick() { - Hall.Instance.UpdateSecondEvent -= updateSpeedCD; if (GameHelper.GetNowTime() <= PlayerPrefs.GetInt($"speed_ad_cool_times_{userUid}", 0) + ad_cool_down) { Debug.Log("not click"); @@ -771,41 +1117,147 @@ namespace BingoBrain if (isSuccess) { ui.btn_watch.enabled = false; - TimerHelper.mEasy.AddTimer(1.5f, () => - { - var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); - PlayerPrefs.SetInt($"speed_ad_cool_times_{userUid}", ad_times); - Hall.Instance.UpdateSecondEvent += updateSpeedCD; - InitView(); - }); + // TimerHelper.mEasy.AddTimer(1.5f, () => + // { + var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); + PlayerPrefs.SetInt($"speed_ad_cool_times_{userUid}", ad_times); + InitView(); + // }); } }); - // var adNum = PreferencesMgr.Instance.RealWatchVideo; + // var adNum = DataMgr.RealWatchVideo; // Debug.Log($"adNum========: {adNum}"); + } + void taskWatchBtnClick() + { + GameHelper.ShowVideoAd("taskWatchAd", (issuccess) => + { + if (issuccess) + { + var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); + SaveData.GetSaveobject()._watch_ad_cd = ad_times + GameHelper.GetCommonModel().exchangeCD; + + btn_watchAd btn_task_watch = ui.btn_task_watch as btn_watchAd; + btn_task_watch.enabled = false; + btn_task_watch.can_buy.selectedIndex = 1; + btn_task_watch.btn_text.text = GameHelper.TimeFormat(SaveData.GetSaveobject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + Hall.Instance.UpdateSecondEvent += upTaskWatchAdsBtn; + + OnTask(); + } + }); + } + + public void upTaskWatchAdsBtn() + { + var lastTimes = SaveData.GetSaveobject()._watch_ad_cd; + btn_watchAd btn_task_watch = ui.btn_task_watch as btn_watchAd; + btn_task_watch.img_saveingpot.visible = false; + if (GameHelper.GetNowTime() < lastTimes) + { + btn_task_watch.enabled = false; + btn_task_watch.can_buy.selectedIndex = 1; + btn_task_watch.btn_text.text = GameHelper.TimeFormat(lastTimes - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + } + else + { + Hall.Instance.UpdateSecondEvent -= upTaskWatchAdsBtn; + btn_task_watch.enabled = true; + btn_task_watch.can_buy.selectedIndex = 0; + if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_task_watch.img_saveingpot.visible = true; + } + } + + void LvWatchBtnClick() + { + GameHelper.ShowVideoAd("LevelWatchAd", (issuccess) => + { + if (issuccess) + { + var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); + SaveData.GetSaveobject()._watch_ad_cd = ad_times + GameHelper.GetCommonModel().exchangeCD; + + btn_watchAd btn_watchad = ui.btn_watchad as btn_watchAd; + btn_watchad.enabled = false; + btn_watchad.can_buy.selectedIndex = 1; + btn_watchad.btn_text.text = GameHelper.TimeFormat(SaveData.GetSaveobject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + Hall.Instance.UpdateSecondEvent += upLvWatchAdsBtn; + // makeupTaskData.cash_time = GameHelper.GetNowTime() + ConfigSystem.GetConfig().BalanceExpired * 3600; + InitView(); + } + }); + } + + public void upLvWatchAdsBtn() + { + var lastTimes = SaveData.GetSaveobject()._watch_ad_cd; + btn_watchAd btn_watchad = ui.btn_watchad as btn_watchAd; + btn_watchad.img_saveingpot.visible = false; + + if (GameHelper.GetNowTime() < lastTimes) + { + btn_watchad.enabled = false; + btn_watchad.can_buy.selectedIndex = 1; + btn_watchad.btn_text.text = GameHelper.TimeFormat(lastTimes - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + } + else + { + Hall.Instance.UpdateSecondEvent -= upLvWatchAdsBtn; + btn_watchad.enabled = true; + btn_watchad.can_buy.selectedIndex = 0; + if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_watchad.img_saveingpot.visible = true; + } } } } public class MakeupTaskData { public int tableId; + + public int id; + + public string amountStr; + + public decimal amount; + + + public long makeupTime; + + public int videoCount; + + public int inlineInitNum; + + public int inlineNum; + + public string orderID; + + public MakeupTaskStatus status; - public long order_time; + + public long order_time = 0; public int WatchVideoSpeedNum = 0; public int loginSpeedNum = 0; public int activeMinute = 0; public int activeSpeedNum = 0; - public bool is_gold = false; + public long ch_time; + public string ExchangeAccount; + public string ExchangeName; + public string short_name; + public string long_name; + public List rdData; + public makeupRdData lastRdData; + public int LvVideoCount; public void SetStatus(MakeupTaskStatus _status) { status = _status; @@ -819,7 +1271,7 @@ public class MakeupTaskData } else { - return amount.ToString(); + return GameHelper.Get101Str(amount); } } } @@ -828,6 +1280,16 @@ public enum MakeupTaskStatus { None, Task, + Level, Inline, + editAccount, + ticket, + code, } -#endregion \ No newline at end of file + +public class makeupRdData +{ + public int coupon_mount; + public string code; + public bool isClaimed; +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs.meta index 2047653..cffdad4 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs.meta +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07a6491e9479e4ca1a2043fd65945f4d +guid: 279f68dd0122f1140b46914e6d166617 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUICtrl.cs.meta index 23ffb7f..ed3064b 100644 --- a/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUICtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/MakeupConfirm/MakeupConfirmUICtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a6e16171811884e098bb5ce34879cc1e +guid: b35458b519a76474ba76f69f4da2f3de MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/MakeupRecord.meta b/Assets/BingoBrain/ModuleUI/MakeupRecord.meta deleted file mode 100644 index 9e12561..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 55fd662a0ff8340f28be8613965929f7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordCtrl.cs b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordCtrl.cs deleted file mode 100644 index e4b470f..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordCtrl.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class MakeupRecordCtrl : BaseCtrl - { - public static MakeupRecordCtrl Instance { get; private set; } - - private MakeupRecordModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.MakeupRecordModel) as MakeupRecordModel; - } - - protected override void OnDispose() - { - Instance = null; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordCtrl.cs.meta deleted file mode 100644 index a481c0a..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0b65045affd42415ab8ab3bbdda76236 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordModel.cs b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordModel.cs deleted file mode 100644 index 6e83b52..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class MakeupRecordModel : 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/MakeupRecord/MakeupRecordModel.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordModel.cs.meta deleted file mode 100644 index 0527b6b..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d09064f5b33fd46c4ab0176d4d94b807 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUI.cs b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUI.cs deleted file mode 100644 index 28a0f8a..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUI.cs +++ /dev/null @@ -1,141 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using BingoBrain.Core; -using BingoBrain.HotFix; -using DG.Tweening; -using FairyGUI; -using FGUI.ACommon; -using FGUI.G007_makeup; -using UnityEngine; - -namespace BingoBrain -{ - public class MakeupRecordUI : BaseUI - { - private MakeupRecordUICtrl ctrl; - private MakeupRecordModel model; - private FGUI.G007_makeup.com_record ui; - private long userUid; - private int curIndex = 0; - public int ad_cool_down = 120; - public MakeupRecordUI(MakeupRecordUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.MakeupRecordUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G007_makeup"; - uiInfo.assetName = "com_record"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - - } - - protected override void OnClose() - { - - - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G007_makeup.com_record; ; - } - - 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() - { - - } - - protected override void RemoveListener() - { - - } - - #endregion - - private List makeupdataList = new List(); - - - private void InitView() - { - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.group_.y += Screen.safeArea.y; - } - makeupdataList.Clear(); - - foreach (var makeupTaskData in PreferencesMgr.Instance.MakeupTaskHistory) - { - if (makeupTaskData.status != MakeupTaskStatus.Inline) - { - continue; - } - - makeupdataList.Add(makeupTaskData); - } - - if (makeupdataList.Count == 0) - { - ui.cont_show.selectedIndex = 0; - } - else - { - ui.cont_show.selectedIndex = 1; - ui.list_record.itemRenderer = ItemRenderer; - ui.list_record.numItems = makeupdataList.Count; - } - - ui.closeButton.SetClick(CtrlCloseUI); - ui.btn_help.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(SkinInfo.RegulationUI_Open); }); - } - - private void ItemRenderer(int index, GObject gObject) - { - var data = makeupdataList[index]; - var item = gObject as com_cord_new; - // TextureHelper.GetCardIcon(true, spr => { item.loader_logo.texture = spr; }); - // item.text_name.SetVar("cur", data.inlineNum.ToString()).SetVar("tol", data.inlineInitNum.ToString()) - // .FlushVars(); - item.text_amt.text = "+$" + (int)data.amount; - item.email_text.text = PreferencesMgr.Instance.ExchangeAccount; - item.number_text.text = data.inlineNum + "/" + data.inlineInitNum; - item.time_text.text = DateTimeBoardk.Instance.TimestampToString(data.order_time); - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUI.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUI.cs.meta deleted file mode 100644 index ea07e79..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bf41d32681a204da480746eb6b5fb99f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUICtrl.cs b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUICtrl.cs deleted file mode 100644 index 4ea5a3a..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUICtrl.cs +++ /dev/null @@ -1,74 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; - -namespace BingoBrain -{ - public class MakeupRecordUICtrl : BaseUICtrl - { - private MakeupRecordUI ui; - private MakeupRecordModel model; - - private uint openUIMsg = SkinInfo.MakeupRecordUI_Open; - private uint closeUIMsg = SkinInfo.MakeupRecordUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.MakeupRecordModel) as MakeupRecordModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new MakeupRecordUI(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/MakeupRecord/MakeupRecordUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUICtrl.cs.meta deleted file mode 100644 index 2e48077..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupRecord/MakeupRecordUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: adcebff8c69334963bf0fa7f9ccb627e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupStep.meta b/Assets/BingoBrain/ModuleUI/MakeupStep.meta deleted file mode 100644 index c19bf68..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c499afc5fe924577b59355d82f0747a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepCtrl.cs b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepCtrl.cs deleted file mode 100644 index 02c4a6c..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepCtrl.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class MakeupStepCtrl : BaseCtrl - { - public static MakeupStepCtrl Instance { get; private set; } - - private MakeupStepModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst. MakeupStepModel) as MakeupStepModel; - } - - protected override void OnDispose() - { - Instance = null; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepCtrl.cs.meta deleted file mode 100644 index 5b87da3..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5ffbbf7d0d1834f888ab3750e79153d1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepModel.cs b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepModel.cs deleted file mode 100644 index 2fb06c1..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class MakeupStepModel : 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/MakeupStep/MakeupStepModel.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepModel.cs.meta deleted file mode 100644 index 6f18268..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1283be4fac27d4279bf8634f23646589 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUI.cs b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUI.cs deleted file mode 100644 index 1ff50ff..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUI.cs +++ /dev/null @@ -1,144 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; -using FGUI.ACommon; -using Newtonsoft.Json; -using UnityEngine; - -namespace BingoBrain -{ - public class MakeupStepUI : BaseUI - { - private MakeupStepUICtrl ctrl; - private MakeupStepModel model; - private FGUI.G007_makeup.com_step ui; - private MakeupTaskData makeupTaskData; - public MakeupStepUI(MakeupStepUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.MakeupStepUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G007_makeup"; - uiInfo.assetName = "com_step"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst. MakeupStepModel) as MakeupStepModel; - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G007_makeup.com_step; - } - - protected override void OnOpenBefore(object args) - { - makeupTaskData = args as MakeupTaskData; - Debug.Log(JsonConvert.SerializeObject(makeupTaskData)); - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - - #endregion - - #region 消息 - - protected override void AddListener() - { - - } - - protected override void RemoveListener() - { - - } - - #endregion - - private void InitView() - { - if (makeupTaskData == null) - { - return; - } - ui.com_info.text_name.text = PreferencesMgr.Instance.ExchangeName; - ui.com_info.text_email.text = PreferencesMgr.Instance.ExchangeAccount; - - ui.com_info.btn_change.SetClick(() => - { - PreferencesMgr.Instance.ExchangeName = null; - PreferencesMgr.Instance.ExchangeAccount = null; - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - CtrlCloseUI(); - }); - - ui.btn_confirm.touchable = false; - GameHelper.PlayFGUIFx(ui.fx_in, true, () => { ui.btn_confirm.touchable = true; }); - - ui.btn_confirm.SetClick(() => - { - var info = new - { - email = PreferencesMgr.Instance.ExchangeAccount, - first_name = PreferencesMgr.Instance.short_name, - last_name = PreferencesMgr.Instance.long_name - }; - NetworkKit.PostWithHeader("shop/payOutUserInfo", info); - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_message, 1); - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - CtrlCloseUI(); - }); - - //TextureHelper.GetCardIcon(true, spr => { ui.loader_payer.texture = spr; }); - - ui.text_warn.SetVar("app", Application.productName).FlushVars(); - // if (GameHelper.GetCurrCountry().ToUpper().Equals("RU")) - // { - // ui.text_warn.SetVar("payer", "Qiwi").FlushVars(); - // ui.com_info.cont_counrty.selectedIndex = com_info.Counrty_ru; - // ui.btn_confirm.country.selectedIndex = btn_confirm.Country_ru; - // ui.com_trans.cont_country.selectedIndex = com_trans.Country_ru; - // ui.lang.selectedIndex = com_step.Lang_en; - // } - // else if (AppConst.isPt()) - // { - // ui.text_warn.SetVar("payer", "Pix").FlushVars(); - // ui.com_info.cont_counrty.selectedIndex = com_info.Counrty_pt; - // ui.btn_confirm.country.selectedIndex = btn_confirm.Country_ru; - // ui.com_trans.cont_country.selectedIndex = com_trans.Country_pt; - // ui.lang.selectedIndex = com_step.Lang_pt; - // } - // else - // { - ui.text_warn.SetVar("payer", "Paypal").FlushVars(); - ui.com_info.cont_counrty.selectedIndex =0; - ui.btn_confirm.country.selectedIndex = 0; - ui.com_trans.cont_country.selectedIndex = 0; - ui.lang.selectedIndex = 0; - //} - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUI.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUI.cs.meta deleted file mode 100644 index ce38009..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ce936432296ec431dad2c8265343873b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUICtrl.cs b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUICtrl.cs deleted file mode 100644 index 9ab8b57..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUICtrl.cs +++ /dev/null @@ -1,74 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; - -namespace BingoBrain -{ - public class MakeupStepUICtrl : BaseUICtrl - { - private MakeupStepUI ui; - private MakeupStepModel model; - - private uint openUIMsg = SkinInfo. MakeupStepUI_Open; - private uint closeUIMsg = SkinInfo. MakeupStepUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst. MakeupStepModel) as MakeupStepModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new MakeupStepUI(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/MakeupStep/MakeupStepUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUICtrl.cs.meta deleted file mode 100644 index a485b7e..0000000 --- a/Assets/BingoBrain/ModuleUI/MakeupStep/MakeupStepUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 58f6d05e1afb4462797f738d770dedd3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Menu.meta b/Assets/BingoBrain/ModuleUI/Menu.meta deleted file mode 100644 index fa60298..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3ea4f9db1d49a473a8960474e996581a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Menu/MenuCtrl.cs b/Assets/BingoBrain/ModuleUI/Menu/MenuCtrl.cs deleted file mode 100644 index 4e36214..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuCtrl.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class MenuCtrl : BaseCtrl - { - public static MenuCtrl Instance { get; private set; } - - private MenuModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.MenuModel) as MenuModel; - } - - protected override void OnDispose() - { - Instance = null; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Menu/MenuCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Menu/MenuCtrl.cs.meta deleted file mode 100644 index 979fd52..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c51eb71050f964a8b943d064f9e9b786 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Menu/MenuModel.cs b/Assets/BingoBrain/ModuleUI/Menu/MenuModel.cs deleted file mode 100644 index b607a22..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class MenuModel : 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/Menu/MenuModel.cs.meta b/Assets/BingoBrain/ModuleUI/Menu/MenuModel.cs.meta deleted file mode 100644 index 3b0e9b8..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2d8fc9d7bf29343dcab8a64d87efbfdf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Menu/MenuUI.cs b/Assets/BingoBrain/ModuleUI/Menu/MenuUI.cs deleted file mode 100644 index ee77bfb..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuUI.cs +++ /dev/null @@ -1,160 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; -using DontConfuse; -using FairyGUI; -using FGUI.ACommon; -using FGUI.G006_menu_animal; -using UnityEngine; - -namespace BingoBrain -{ - public class MenuUI : BaseUI - { - private MenuUICtrl ctrl; - private MenuModel model; - private FGUI.G006_menu_animal.com_edit ui; - - public MenuUI(MenuUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.MenuUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G006_menu_animal"; - uiInfo.assetName = "com_edit"; - uiInfo.layerType = UILayerType.Normal; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - - protected override void OnInit() - { - - // loginModel = moduleManager.GetModel(ModelConst.LoginModel) as LoginModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI=true; - //GameHelper.FadeOut(ui); - WebviewManager.Instance.SetDarkThough(true); - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G006_menu_animal.com_edit; - } - - protected override void OnOpenBefore(object args) - { - GameHelper.showGameUI = false; - InitData(); - InitView(); - WebviewManager.Instance.SetDarkThough(false); - } - - protected override void OnOpen(object args) - { - // GameHelper.FadeIn(ui); - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - - #endregion - - #region 消息 - - protected override void AddListener() - { - - } - - protected override void RemoveListener() - { - - } - - #endregion -private int selectIndex; -private int avatarTotal; - private void InitData() - { - selectIndex = PreferencesMgr.Instance.PlayerAvatarId; - - avatarTotal = 12; - } - - private void InitView() - { - // ui.closeButton.onClick.Set(OnCloseView); - - GameHelper.SetName(ui.textp_name); - - ui.btn_ok.onClick.Set(OnClickOK); - - ui.list_avatar.itemRenderer = ItemRenderer; - ui.list_avatar.numItems = 12; - - - - } - - private void OnClickOK() - { - var name = ui.textp_name.text; - OnCloseView(); - - if (selectIndex != -1) - { - PreferencesMgr.Instance.PlayerAvatarId = selectIndex; - } - - if (string.IsNullOrEmpty(name) || name.IsNullOrWhiteSpace()) - { - GameHelper.ShowTips("The input cannot be null", true); - - return; - } - - - - - PreferencesMgr.Instance.PlayerName = name; - - } - - private void ItemRenderer(int index, GObject item) - { - var btnImg = item as btn_img; - var currentIndex = index ; -Debug.Log(index); - EyesHarmony.SetAvatarToLoader(currentIndex, btnImg.head_loader.GetChild("loader_avatar") as GLoader); - btnImg.cont_select.selectedIndex = selectIndex == currentIndex - ? 1 - : 0; - - btnImg.SetClick(() => - { - selectIndex = currentIndex; - ui.list_avatar.numItems = avatarTotal; - }); - } - - - private void OnCloseView() - { - UICtrlDispatcher.Instance.Dispatch(SkinInfo.MenuUI_Close); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Menu/MenuUI.cs.meta b/Assets/BingoBrain/ModuleUI/Menu/MenuUI.cs.meta deleted file mode 100644 index 978269d..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a20e7e34e2788415fa0621734f1443d6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Menu/MenuUICtrl.cs b/Assets/BingoBrain/ModuleUI/Menu/MenuUICtrl.cs deleted file mode 100644 index 228b70c..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuUICtrl.cs +++ /dev/null @@ -1,74 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; - -namespace BingoBrain -{ - public class MenuUICtrl : BaseUICtrl - { - private MenuUI ui; - private MenuModel model; - - private uint openUIMsg = SkinInfo.MenuUI_Open; - private uint closeUIMsg = SkinInfo.MenuUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.MenuModel) as MenuModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new MenuUI(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/Menu/MenuUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Menu/MenuUICtrl.cs.meta deleted file mode 100644 index be17fe6..0000000 --- a/Assets/BingoBrain/ModuleUI/Menu/MenuUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3569920408554402da94b8c47f9621a0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/NewTask.meta b/Assets/BingoBrain/ModuleUI/NewTask.meta deleted file mode 100644 index 60e0ade..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dbce448319ae34945b4a2c8606545b9c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskCtrl.cs b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskCtrl.cs deleted file mode 100644 index dc7e86a..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class NewTaskCtrl : BaseCtrl - { - public static NewTaskCtrl Instance { get; private set; } - - private NewTaskModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.NewTaskModel) as NewTaskModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskCtrl.cs.meta deleted file mode 100644 index 8f579e3..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4d10e44523448459c81d72c5a7df0bee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskModel.cs b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskModel.cs deleted file mode 100644 index 6771a5c..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskModel.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System.IO; -using BingoBrain.Core; - -using Newtonsoft.Json; -using UnityEngine; - -namespace BingoBrain -{ - public class NewTaskModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - - - - // private static string jsonFilePath = Path.Combine(Application.persistentDataPath, "taskrecord1.json"); - - // public static void saveRecord(List list) - // { - - // string save = JsonConvert.SerializeObject(list); - // Debug.Log(save); - // if (File.Exists(jsonFilePath)) File.Delete(jsonFilePath); - // File.WriteAllText(jsonFilePath, save); - - // } - // public static List getTaskRecord() - // { - // if (File.Exists(jsonFilePath)) - // { - // string jsonstr = File.ReadAllText(jsonFilePath); - - // Debug.Log("-------------------------"); - // Debug.Log(jsonstr); - // return JsonConvert.DeserializeObject>(jsonstr); - // //return JsonUtility.FromJson(json); - - // } - // else - // { - // Debug.Log("Data file not found!"); - // return new List(); - // } - // } - - // private static string jsonFilePath_time = Path.Combine(Application.persistentDataPath, "timerecord2.json"); - - // public static void saveTimeRecord(List list) - // { - - // string save = JsonConvert.SerializeObject(list); - // Debug.Log(save); - // if (File.Exists(jsonFilePath_time)) File.Delete(jsonFilePath_time); - // File.WriteAllText(jsonFilePath_time, save); - - // } - // public static List getTimeRecord() - // { - // if (File.Exists(jsonFilePath_time)) - // { - // string jsonstr = File.ReadAllText(jsonFilePath_time); - - // Debug.Log("-------------------------"); - // Debug.Log(jsonstr); - // return JsonConvert.DeserializeObject>(jsonstr); - // //return JsonUtility.FromJson(json); - - // } - // else - // { - // Debug.Log("Data file not found!"); - // return new List(); - // } - // } - } - -} diff --git a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskModel.cs.meta b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskModel.cs.meta deleted file mode 100644 index a1679f9..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7a5db545b1de547e98645de6b166cae2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUI.cs b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUI.cs deleted file mode 100644 index 4cfdcc8..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUI.cs +++ /dev/null @@ -1,922 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G009_video_animal; -using DG.Tweening; -using System; -using System.Linq; -using Newtonsoft.Json; -using BingoBrain.HotFix; -using DontConfuse; - -namespace BingoBrain -{ - public class NewTaskUI : BaseUI - { - private NewTaskUICtrl ctrl; - private NewTaskModel model; - private FGUI.G009_video_animal.com_newtask ui; - List passing_list = new List(); - List Durationtasks_list = new List(); - List Passportrewards_list = new List(); - private Vector2 start_pos; - private int reward_number; - private int task_id = 0; - private List recored_list; - private List time_recored_list; - private int reward_type = 0; - - - public NewTaskUI(NewTaskUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.NewTaskUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G009_video_animal"; - uiInfo.assetName = "com_newtask"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - // model = ModuleManager.Instance.GetModel(ModelConst.NewTaskModel) as NewTaskModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - WebviewManager.Instance.SetDarkThough(true); - Hall.Instance.UpdateSecondEvent -= upData; - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G009_video_animal.com_newtask; - } - - protected override void OnOpenBefore(object args) - { - GameHelper.showGameUI = false; - if (GameHelper.GetGameday() != DateTime.Now.Day) - { - PlayerPrefs.SetInt("_time", 0); - SaveData.GetSaveobject().time_task_record = new List(); - for(int i=0;i().dataList.Count;i++){ - ConfigSystem.GetConfig().dataList[i].is_get=false; - } - GameHelper.SetGameday(); - } - WebviewManager.Instance.SetDarkThough(false); - Hall.Instance.UpdateSecondEvent += upData; - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.GetTaskReward, getRewardSuccess); - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.GetTaskReward, getRewardSuccess); - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - } - #endregion - void pay_success(object str) - { - string type = (string)str; - if (type == PurchasingManager.battle_pass) - { - int gold = 0; - - SaveData.GetSaveobject().is_get_battlepass = true; - - List Passportrewards_list = ConfigSystem.GetConfig().dataList; - for (int i = 0; i < Passportrewards_list.Count; i++) - { - if (GameHelper.GetBattleLv_Index() > i || (GameHelper.GetGameExp() >= Passportrewards_list[Passportrewards_list.Count - 1].Eliminating_quantity)) - { - if (Passportrewards_list[i].Paid_rewards_type == 0) gold += Passportrewards_list[i].Paid_rewards_num; - } - else break; - } - var end = GameHelper.GetUICenterPosition(ui.gold); - - start_pos = GameHelper.GetUICenterPosition(ui.pass_com.btn_pay); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(101, gold, RewardOrigin.Play) - { - startPosition = start_pos, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - - - GameHelper.ShowTips("Receive successfully"); - - - DOVirtual.DelayedCall(1f, () => - { - ui.pass_com.pass_list.numItems = Passportrewards_list.Count; - ui.pass_com.btn_pay.visible = false; - var startNum = GameHelper.GetGoldNumber() - gold; - DOVirtual.Float(startNum, (float)GameHelper.GetGoldNumber(), 1f, - value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - }); - } - } - - //初始化页面逻辑 - private void InitView() - { - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.gold.y += Screen.safeArea.y; - ui.money.y += Screen.safeArea.y; - } - if (!GameHelper.IsGiftSwitch()) ui.money.visible = false; - ui.pass_com.visible = true; - ui.task_list.visible = false; - ui.com_toptab.btn_battle.SetClick(() => - { - ui.com_toptab.tab.selectedIndex = 0; - ui.pass_com.visible = true; - ui.task_list.visible = false; - }); - ui.com_toptab.btn_pass.SetClick(() => - { - ui.com_toptab.tab.selectedIndex = 1; - sortTaskList(); - ui.pass_com.visible = false; - ui.task_list.visible = true; - }); - ui.com_toptab.btn_time.SetClick(() => - { - - ui.com_toptab.tab.selectedIndex = 2; - sortTimeList(); - ui.pass_com.visible = false; - ui.task_list.visible = true; - }); - - ui.btn_close.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NewTaskUI_Close); }); - - - passing_list = ConfigSystem.GetConfig().dataList; - Durationtasks_list = ConfigSystem.GetConfig().dataList; - Passportrewards_list = ConfigSystem.GetConfig().dataList; - setPassCom(); - ui.com_toptab.red_0.visible = SaveData.battlepassred(); - ui.com_toptab.red_1.visible = SaveData.passtaskred(); - ui.com_toptab.red_2.visible = SaveData.timetaskred(); - if (SaveData.battlepassred()) - { - ui.com_toptab.tab.selectedIndex = 0; - ui.pass_com.visible = true; - ui.task_list.visible = false; - } - else if (SaveData.timetaskred()) - { - ui.com_toptab.tab.selectedIndex = 2; - sortTimeList(); - ui.pass_com.visible = false; - ui.task_list.visible = true; - } - else if (SaveData.passtaskred()) - { - ui.com_toptab.tab.selectedIndex = 1; - sortTaskList(); - ui.pass_com.visible = false; - ui.task_list.visible = true; - } - - ui.pass_com.btn_showtips.SetClick(() => - { - ui.pass_com.t0.Stop(); - ui.pass_com.t0.Play(); - }); - SetMakeup(); - scrollToClaim(); - - - - } - - void SetMakeup(object a = null) - { - - - ui.gold.GetChild("number_text").text = GameHelper.GetGoldNumber().ToString(); - ui.money.GetChild("number_text").text = PreferencesMgr.Instance.Currency102.ToString(); - - // DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency101, 1, - // value => { ui.money.GetChild("number_text").text = GameHelper.Get101Str((decimal)value); }); - - if (GameHelper.IsGiftSwitch()) - { - - var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); - - if (vo == null) - { - return; - } - var leftCash = (double)Math.Max(vo.item_need - PreferencesMgr.Instance.Currency101, 0); - - (ui.money.GetChild("btn_cashout") as GButton).SetClickDownEffect(0.8f, 1); - ui.money.GetChild("btn_cashout").SetClick(() => - { - // if (GameHelper.CanGuide() && !GuideCtrl.Instance.IsFinishGuide(1)) - // { - // GuideCtrl.Instance.Dispatch("ClickButton"); - // // ui.com_box.finger_place.visible = false; - // } - GameHelper.showGameUI = false; - uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupConfirmUI_Open, makeupTaskData); - //CtrlCloseUI(); - }); - } - } - - void upData() - { - ui.pass_com.remain_time.text = GameHelper.TimeFormat( - SaveData.GetSaveobject().battle_pass_time + Passportrewards_list[0].Passportrewards_CD * 24 * 3600 - Convert.ToInt32(GameHelper.GetNowTime()), - CountDownType.Day); - - if ((SaveData.GetSaveobject().battle_pass_time + Passportrewards_list[0].Passportrewards_CD * 24 * 3600) < GameHelper.GetNowTime()) - { - SaveData.GetSaveobject().battle_pass_time = (int)GameHelper.GetNowTime(); - SaveData.GetSaveobject().battle_pass_freelist.Clear(); - SaveData.GetSaveobject().battle_pass_paylist.Clear(); - SaveData.GetSaveobject().is_get_battlepass = false; - GameHelper.ResetGameExp(); - SaveData.saveDataFunc(); - setPassCom(); - } - - } - void setPassCom() - { - if ((SaveData.GetSaveobject().battle_pass_time + Passportrewards_list[0].Passportrewards_CD * 24 * 3600) < GameHelper.GetNowTime()) - { - SaveData.GetSaveobject().battle_pass_time = (int)GameHelper.GetNowTime(); - GameHelper.ResetGameExp(); - SaveData.GetSaveobject().battle_pass_freelist.Clear(); - SaveData.GetSaveobject().battle_pass_paylist.Clear(); - SaveData.GetSaveobject().is_get_battlepass = false; - SaveData.saveDataFunc(); - } - upData(); - ui.pass_com.pass_list.itemRenderer = battle_itemRender; - ui.pass_com.pass_list.numItems = Passportrewards_list.Count + 1; - - ui.pass_com.now_level.text = GameHelper.getBattleLv().ToString(); - if (GameHelper.getBattleLv() >= Passportrewards_list.Count) - { - ui.pass_com.now_exp.text = GameHelper.GetGameExp().ToString(); - ui.pass_com.progress.width = 359; - } - else - { - ui.pass_com.now_exp.text = GameHelper.GetGameExp() + "/" + Passportrewards_list[GameHelper.getBattleLv()].Eliminating_quantity; - ui.pass_com.progress.width = ((float)GameHelper.GetGameExp() / Passportrewards_list[GameHelper.getBattleLv()].Eliminating_quantity) * 359; - } - ui.pass_com.btn_pay.visible = !SaveData.GetSaveobject().is_get_battlepass; - ui.pass_com.btn_pay.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PassunlockUI_Open); - - // ApplePayClass test = new ApplePayClass() - // { - // transactionId = "", - // amount = (int)(ConfigSystem.GetConfig().Passportgift * 100), - // sku = PurchasingManager.battle_pass, - // currency = "USD" - // }; - - // PurchasingManager.Instance.Purchase(PurchasingManager.battle_pass, test); - - - - - - // SaveData.GetSaveobject().is_get_battlepass = true; - // int gold = 0; - // int out_ = 0; - // int back_ = 0; - // int refresh_ = 0; - - // for (int i = 0; i < Passportrewards_list.Count; i++) - // { - // if (GameHelper.getBattleLv() > i) - // { - // if (Passportrewards_list[i].Paid_rewards_type == 0) gold += Passportrewards_list[i].Paid_rewards_num; - // else if (Passportrewards_list[i].Paid_rewards_type == 1) out_ += Passportrewards_list[i].Paid_rewards_num; - // else if (Passportrewards_list[i].Paid_rewards_type == 2) back_ += Passportrewards_list[i].Paid_rewards_num; - // else if (Passportrewards_list[i].Paid_rewards_type == 3) refresh_ += Passportrewards_list[i].Paid_rewards_num; - // SaveData.GetSaveobject().battle_pass_paylist.Add(i + 1); - // } - // else break; - // } - // if (gold > 0) - // { - // var start = GameHelper.GetUICenterPosition(ui.pass_com.btn_pay); - // var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - - - // Goda temp = new Goda() { start = start, end = end, change = gold, type = 101 }; - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); - // GameHelper.addGoldNumber(gold); - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - // DOVirtual.DelayedCall(1, () => - // { - // DOVirtual.Float(0, (float)GameHelper.GetGoldNumber(), 1f, - // value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - // }); - - // } - // GameHelper.AddItemNumber(0, out_); - // GameHelper.AddItemNumber(1, back_); - // GameHelper.AddItemNumber(2, refresh_); - // GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - // ui.pass_com.pass_list.numItems = Passportrewards_list.Count + 1; - // ui.pass_com.btn_pay.visible = false; - // SaveData.saveDataFunc(); - }); - - } - - - void setItemUrl(GLoader loader, int urltype) - { - if (urltype == 0) loader.url = "ui://G009_video_animal/master_pass_box_01_gold"; - else if (urltype == 4) loader.url = "ui://G009_video_animal/master_pass_box_02_gold"; - else if (urltype == 1) loader.url = "ui://G003_play_animal/yxjm_bottom_remove"; - else if (urltype == 2) loader.url = "ui://G003_play_animal/yxjm_bottom_undo"; - else if (urltype == 3) loader.url = "ui://G003_play_animal/yxjm_bottom_refresh"; - } - void seItemClick(com_passreward item, int number, int type) - { - var start = GameHelper.GetUICenterPosition(item); - var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - - - if (type == 0) - { - // Goda temp = new Goda() { start = start, end = end, change = number, type = 101 }; - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); - // GameHelper.addGoldNumber(number); - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - // DOVirtual.DelayedCall(1, () => - // { - // DOVirtual.Float(0, (float)GameHelper.GetGoldNumber(), 1f, - // value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - // }); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(101, number, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - } - else - { - - GameHelper.AddItemNumber(type - 1, number); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - } - - ui.pass_com.pass_list.numItems = Passportrewards_list.Count + 1; - ui.com_toptab.red_0.visible = SaveData.battlepassred(); - - - DOVirtual.DelayedCall(1.0f, () => - { - var startNum = GameHelper.GetGoldNumber() - number; - DOVirtual.Float(startNum, (float)GameHelper.GetGoldNumber(), 1f, - value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - }); - } - - - - - void battle_itemRender(int index, GObject obj) - { - com_passitem item = (com_passitem)obj; - // Debug.Log(SaveData.GetSaveobject().battle_pass_level); - int pass_level = GameHelper.getBattleLv(); - item.index_text.text = index.ToString(); - item.free_item.type.selectedIndex = 0; - item.pay_item.type.selectedIndex = 1; - - List freelist = SaveData.GetSaveobject().battle_pass_freelist; - List paylist = SaveData.GetSaveobject().battle_pass_paylist; - if (index > 0) - { - - - item.free_item.number_text.text = "x" + Passportrewards_list[index - 1].Free_rewards_num; - item.pay_item.number_text.text = "x" + Passportrewards_list[index - 1].Paid_rewards_num; - if (Passportrewards_list[index - 1].Free_rewards_type == 0) - { - setItemUrl(item.free_item.item_loader, 0); - } - else - { - setItemUrl(item.free_item.item_loader, Passportrewards_list[index - 1].Paid_rewards_type); - } - if (Passportrewards_list[index - 1].Paid_rewards_type == 0) - { - setItemUrl(item.pay_item.item_loader, 4); - } - else - { - setItemUrl(item.pay_item.item_loader, Passportrewards_list[index - 1].Paid_rewards_type); - } - if (index <= pass_level)//等级超过了 - { - if (freelist.Contains(index))//领取过 - { - item.free_item.state.selectedIndex = 2; - item.free_item.SetClick(() => { }); - } - else - { - item.free_item.state.selectedIndex = 1; - item.free_item.SetClick(() => - { - freelist.Add(index); - SaveData.saveDataFunc(); - GameHelper.ShowTips("Successfully claimed"); - seItemClick(item.free_item, Passportrewards_list[index - 1].Free_rewards_num, Passportrewards_list[index - 1].Free_rewards_type); - }); - } - - if (paylist.Contains(index))//领取过 - { - item.pay_item.state.selectedIndex = 2; - item.pay_item.SetClick(() => { }); - } - else - { - if (SaveData.GetSaveobject().is_get_battlepass) - { - item.pay_item.state.selectedIndex = 1; - item.pay_item.SetClick(() => - { - paylist.Add(index); - SaveData.saveDataFunc(); - seItemClick(item.pay_item, Passportrewards_list[index - 1].Paid_rewards_num, Passportrewards_list[index - 1].Paid_rewards_type); - - GameHelper.ShowTips("Successfully claimed"); - - }); - } - else - { - item.pay_item.state.selectedIndex = 4; - item.pay_item.SetClick(() => - { - if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PassunlockUI_Open); - }); - } - - } - - } - else - { - item.free_item.state.selectedIndex = 0;//不可领取 - item.free_item.SetClick(() => - { - GameHelper.ShowTips("Receiving level not reached"); - }); - item.pay_item.SetClick(() => - { - if (SaveData.GetSaveobject().is_get_battlepass) - { - GameHelper.ShowTips("Receiving level not reached"); - } - else - { - if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PassunlockUI_Open); - } - }); - if (SaveData.GetSaveobject().is_get_battlepass) - { - item.pay_item.state.selectedIndex = 0; - } - else - { - item.pay_item.state.selectedIndex = 3; - } - } - - - } - - - - - - if (index == 0) - { - item.state.selectedIndex = 3; - - } - else if (index == 1) - { - item.state.selectedIndex = 0; - - if (pass_level > 0) - { - item.progress_0_top.height = 135; - - Debug.Log((((float)(GameHelper.GetGameExp() - Passportrewards_list[0].Eliminating_quantity) / ((Passportrewards_list[1].Eliminating_quantity - Passportrewards_list[0].Eliminating_quantity)))) * 2); - if (((float)(GameHelper.GetGameExp() - Passportrewards_list[0].Eliminating_quantity) / (Passportrewards_list[1].Eliminating_quantity - Passportrewards_list[0].Eliminating_quantity)) > 0.5) - { - item.progress_0_down.height = 175; - } - else - { - - item.progress_0_down.height = (((float)(GameHelper.GetGameExp() - Passportrewards_list[0].Eliminating_quantity) / ((Passportrewards_list[1].Eliminating_quantity - Passportrewards_list[0].Eliminating_quantity)))) * 2 * 175; - } - - } - else - { - item.progress_0_top.height = (float)GameHelper.GetGameExp() / Passportrewards_list[0].Eliminating_quantity * 135; - item.progress_0_down.height = 0; - - } - } - - else if (index == Passportrewards_list.Count) - { - item.state.selectedIndex = 2; - - - if (((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 2].Eliminating_quantity) / (Passportrewards_list[index - 1].Eliminating_quantity - Passportrewards_list[index - 2].Eliminating_quantity)) > 0.5) - { - float height = (((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 2].Eliminating_quantity) / (Passportrewards_list[index - 1].Eliminating_quantity - Passportrewards_list[index - 2].Eliminating_quantity)) - 0.5f) * 2 * 167; - if (height > 167) height = 167; - item.progress_2_top.height = height; - } - else item.progress_2_top.height = 0; - - - } - - else - { - item.state.selectedIndex = 1; - - if (pass_level >= index) - { - item.progress_1_top.height = 167; - } - else - { - if (pass_level == (index - 1)) - { - - if (((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 2].Eliminating_quantity) / (Passportrewards_list[index - 1].Eliminating_quantity - Passportrewards_list[index - 2].Eliminating_quantity)) > 0.5) - { - float height = (((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 2].Eliminating_quantity) / (Passportrewards_list[index - 1].Eliminating_quantity - Passportrewards_list[index - 2].Eliminating_quantity)) - 0.5f) * 2 * 167; - if (height > 167) height = 167; - item.progress_1_top.height = height; - } - else item.progress_1_top.height = 0; - - - } - else - { - item.progress_1_top.height = 0; - } - } - - if (pass_level == index) - { - Debug.Log("-----------------"); - Debug.Log(((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 1].Eliminating_quantity) / (Passportrewards_list[index].Eliminating_quantity - Passportrewards_list[index - 1].Eliminating_quantity))); - if (((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 1].Eliminating_quantity) / (Passportrewards_list[index].Eliminating_quantity - Passportrewards_list[index - 1].Eliminating_quantity)) <= 0.5) - { - float height = (((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 1].Eliminating_quantity) / (Passportrewards_list[index].Eliminating_quantity - Passportrewards_list[index - 1].Eliminating_quantity))) * 2 * 167; - if (height > 167) height = 167; - item.progress_1_down.height = height; - } - else - { - item.progress_1_down.height = 167; - } - - } - else - { - if (pass_level > index) item.progress_1_down.height = 167; - else item.progress_1_down.height = 0; - } - } - } - - - void sortTaskList() - { - // recored_list = NewTaskModel.getTaskRecord(); - recored_list = SaveData.GetSaveobject().pass_task_record; - List templist = new List(); - passing_list.Sort((x, y) => x.id - y.id); - for (int i = 0; i < passing_list.Count; i++) - { - if (recored_list.Contains(passing_list[i].id)) - { - passing_list[i].is_get = true; - templist.Add(passing_list[i]); - passing_list.Remove(passing_list[i]); - i--; - } - } - passing_list.AddRange(templist); - - ui.task_list.itemRenderer = passingTaskrRender; - ui.task_list.numItems = passing_list.Count; - ui.com_toptab.red_1.visible = SaveData.passtaskred(); - } - void sortTimeList() - { - //time_recored_list = NewTaskModel.getTimeRecord(); - time_recored_list = SaveData.GetSaveobject().time_task_record; - List templist = new List(); - Durationtasks_list.Sort((x, y) => x.id - y.id); - - for (int i = 0; i < Durationtasks_list.Count; i++) - { - if (time_recored_list.Contains(Durationtasks_list[i].id)) - { - Durationtasks_list[i].is_get = true; - templist.Add(Durationtasks_list[i]); - Durationtasks_list.Remove(Durationtasks_list[i]); - i--; - } - } - Durationtasks_list.AddRange(templist); - - ui.task_list.itemRenderer = durationRender; - ui.task_list.numItems = Durationtasks_list.Count; - ui.com_toptab.red_2.visible = SaveData.timetaskred(); - } - - void passingTaskrRender(int index, GObject obj) - { - task_item item = (task_item)obj; - // item.content_text.text=string .Format(passing_list[index].text_read,passing_list[index].tol_num); - - item.content_text.text = passing_list[index].text_read; - item.number_text.text = "x" + passing_list[index].reward_num; - // if (passing_list[index].id % 3 == 0) - // { - // item.ez_img.visible = item.text_ez.visible = false; - // item.diff_img.visible = item.text_diff.visible = true; - // } - // else - // { - // item.ez_img.visible = item.text_ez.visible = true; - // item.diff_img.visible = item.text_diff.visible = false; - // } - if ((GameHelper.GetLevel() - 1) < passing_list[index].tol_num) - { - item.progress_text.text = (GameHelper.GetLevel() - 1) + "/" + passing_list[index].tol_num; - item.progress.width = 418 * ((float)(GameHelper.GetLevel() - 1) / passing_list[index].tol_num); - item.btn_get.state.selectedIndex = 1; - item.btn_get.progress_text.text = "To complete"; - item.btn_get.SetClick(() => - { - - }); - } - else - { - item.progress_text.text = passing_list[index].tol_num + "/" + passing_list[index].tol_num; - item.progress.width = 418; - if (!passing_list[index].is_get) - { - item.btn_get.state.selectedIndex = 0; - item.btn_get.SetClick(() => - { - start_pos = GameHelper.GetUICenterPosition(item.gold_img); - reward_number = passing_list[index].reward_num; - task_id = passing_list[index].id; - reward_type = 1; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GetTaskRewardUI_Open, passing_list[index].reward_num); - }); - item.btn_get.progress_text.text = "Claim"; - } - else - { - item.btn_get.SetClick(() => -{ -}); - item.btn_get.progress_text.text = "Claimed"; - item.btn_get.state.selectedIndex = 1; - } - - } - } - void getRewardSuccess(object a = null) - { - - if ((bool)a) reward_number *= 2; - var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - - // Goda temp = new Goda() { start = start_pos, end = end, change = reward_number, type = 101 }; - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(101, reward_number, RewardOrigin.Play) - { - startPosition = start_pos, - endPosition = end, - - }; - - rewardData.AddReward(rewardSingleData); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - if (reward_type == 1) - { - recored_list.Add(task_id); - // NewTaskModel.saveRecord(recored_list); - SaveData.saveDataFunc(); - } - else - { - time_recored_list.Add(task_id); - //NewTaskModel.saveTimeRecord(time_recored_list); - SaveData.saveDataFunc(); - } - - DOVirtual.DelayedCall(1.0f, () => - { - var startNum = GameHelper.GetGoldNumber() - reward_number; - DOVirtual.Float(startNum, (float)GameHelper.GetGoldNumber(), 1f, - value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - }); - - if (reward_type == 1) - { - sortTaskList(); - } - else - { - sortTimeList(); - } - //GameHelper.addInterAdnumber(); - - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - } - - void durationRender(int index, GObject obj) - { - task_item item = (task_item)obj; - - item.content_text.text = Durationtasks_list[index].text_read; - item.number_text.text = "x" + Durationtasks_list[index].reward_num; - - // item.ez_img.visible = item.text_ez.visible = false; - // item.diff_img.visible = item.text_diff.visible = false; - - if ((GameHelper.GetGameTime() / 60) < Durationtasks_list[index].tol_num) - { - item.progress_text.text = Math.Round((float)GameHelper.GetGameTime() / 60, 2) + "/" + Durationtasks_list[index].tol_num; - item.progress.width = 418 * ((((float)GameHelper.GetGameTime()) / 60) / Durationtasks_list[index].tol_num); - item.btn_get.state.selectedIndex = 1; - item.btn_get.SetClick(() => - { - - }); - item.btn_get.progress_text.text = "To complete"; - } - else - { - item.progress_text.text = Durationtasks_list[index].tol_num + "/" + Durationtasks_list[index].tol_num; - item.progress.width = 418; - if (!Durationtasks_list[index].is_get) - { - item.btn_get.state.selectedIndex = 0; - item.btn_get.SetClick(() => - { - start_pos = GameHelper.GetUICenterPosition(item.gold_img); - reward_number = Durationtasks_list[index].reward_num; - task_id = Durationtasks_list[index].id; - reward_type = 2; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GetTaskRewardUI_Open, Durationtasks_list[index].reward_num); - }); - item.btn_get.progress_text.text = "Claim"; - } - else - { - item.btn_get.SetClick(() => - { - }); - item.btn_get.progress_text.text = "Claimed"; - item.btn_get.state.selectedIndex = 1; - } - - } - } - void scrollToClaim() - { - - for (int index = 1; index < Passportrewards_list.Count + 1; index++) - { - - - int pass_level = GameHelper.GetBattleLv_Index(); - - - List freelist = SaveData.GetSaveobject().battle_pass_freelist; - List paylist = SaveData.GetSaveobject().battle_pass_paylist; - - - if (index <= pass_level || (GameHelper.GetGameExp() >= Passportrewards_list[Passportrewards_list.Count - 1].Eliminating_quantity))//等级超过了 - { - if (freelist.Contains(index))//领取过 - { - - } - else - { - ///keyitiaozhuan - - Debug.Log("---------------" + index); - - ui.pass_com.pass_list.ScrollToView_UseAnim(index - 1, true, 0.5f); - return; - } - if (paylist.Contains(index))//领取过 - { - - } - else - { - if (SaveData.GetSaveobject().is_get_battlepass) - { - ///keyitiaozhuan - Debug.Log("---------------" + index); - ui.pass_com.pass_list.ScrollToView_UseAnim(index - 1, true, 0.5f); - return; - } - } - - } - - } - - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUI.cs.meta b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUI.cs.meta deleted file mode 100644 index 88b2030..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5c5e4db4d12a94c1aaecba7ecf0b768c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUICtrl.cs b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUICtrl.cs deleted file mode 100644 index 7460273..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class NewTaskUICtrl : BaseUICtrl - { - private NewTaskUI ui; - private NewTaskModel model; - - private uint openUIMsg = UICtrlMsg.NewTaskUI_Open; - private uint closeUIMsg = UICtrlMsg.NewTaskUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.NewTaskModel) as NewTaskModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new NewTaskUI(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/NewTask/NewTaskUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUICtrl.cs.meta deleted file mode 100644 index 989156d..0000000 --- a/Assets/BingoBrain/ModuleUI/NewTask/NewTaskUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b25d00163eecd4ac8aed9dc94897ee9b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/OpenGame.meta b/Assets/BingoBrain/ModuleUI/OpenGame.meta deleted file mode 100644 index 5ee2adc..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b1e0b5a709e9a4d1597f22ae04ca30f6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameCtrl.cs b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameCtrl.cs deleted file mode 100644 index 690bf04..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class OpenGameCtrl : BaseCtrl - { - public static OpenGameCtrl Instance { get; private set; } - - private OpenGameModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.OpenGameModel) as OpenGameModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameCtrl.cs.meta deleted file mode 100644 index a794e29..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 619b238dcaf0147a28182583aa7f4f0b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameModel.cs b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameModel.cs deleted file mode 100644 index 95e4c5a..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class OpenGameModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameModel.cs.meta b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameModel.cs.meta deleted file mode 100644 index fa1802f..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8e175d106ca664d5bb372aa27dbb9be4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUI.cs b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUI.cs deleted file mode 100644 index fd282d8..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUI.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G003_play_animal; -using DG.Tweening; -using Spine.Unity; -using System; - -namespace BingoBrain -{ - public class OpenGameUI : BaseUI - { - private OpenGameUICtrl ctrl; - private OpenGameModel model; - private FGUI.G003_play_animal.com_opengame ui; - - public OpenGameUI(OpenGameUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.OpenGameUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G003_play_animal"; - uiInfo.assetName = "com_opengame"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = false; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.OpenGameModel) as OpenGameModel; - } - - protected override void OnClose() - { - - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G003_play_animal.com_opengame; - } - - protected override void OnOpenBefore(object args) - { - DOVirtual.DelayedCall(0.7f, () => { GameDispatcher.Instance.Dispatch(GameMsg.reset_game, args); }); - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - private Action closeCallback; - //初始化页面逻辑 - private void InitView() - { - ui.lv_text.text = "Level " + GameHelper.GetLevel().ToString(); - ui.t1.Play(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Close); - }); - if (GameHelper.IsShowLevelTips()) - { - Debug.Log("????????????"); - ui.tips_node.visible = true; - FX.Instance.SetFx(ui.tips_node, Fx_Type.fx_tips, sk => - { - // NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); - // OnChangeCardFinish(null); - NAAVsa.PlayAnim(sk, "animation", false); - }, closeCallback); - - // DOVirtual.DelayedCall(0.2f, () => - // { - // ui.tips_node.visible = true; - // var meteor1 = FXManager.Instance.SetFx(ui.tips_node, Fx_Type.fx_tips, ref closeCallback); - // }); - } - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUI.cs.meta b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUI.cs.meta deleted file mode 100644 index 615d2b8..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c0726da6c334349c994d257574585439 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUICtrl.cs b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUICtrl.cs deleted file mode 100644 index 06ae516..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class OpenGameUICtrl : BaseUICtrl - { - private OpenGameUI ui; - private OpenGameModel model; - - private uint openUIMsg = UICtrlMsg.OpenGameUI_Open; - private uint closeUIMsg = UICtrlMsg.OpenGameUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.OpenGameModel) as OpenGameModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new OpenGameUI(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/OpenGame/OpenGameUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUICtrl.cs.meta deleted file mode 100644 index 8c0e366..0000000 --- a/Assets/BingoBrain/ModuleUI/OpenGame/OpenGameUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f819527a7b9184743b3fbc1d52f7c307 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Packreward.meta b/Assets/BingoBrain/ModuleUI/Packreward.meta deleted file mode 100644 index 2ec8fe9..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 626c8cad8103b4f3e9672314f214f721 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardCtrl.cs b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardCtrl.cs deleted file mode 100644 index e1b6d52..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class PackrewardCtrl : BaseCtrl - { - public static PackrewardCtrl Instance { get; private set; } - - private PackrewardModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.PackrewardModel) as PackrewardModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardCtrl.cs.meta deleted file mode 100644 index 5b19ed6..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6716776f97890437d8a618c997ea689d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardModel.cs b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardModel.cs deleted file mode 100644 index 584f881..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class PackrewardModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardModel.cs.meta b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardModel.cs.meta deleted file mode 100644 index 921ec51..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8f3f1bbd4dedd499bb4917a0a83b8d09 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUI.cs b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUI.cs deleted file mode 100644 index af1141e..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUI.cs +++ /dev/null @@ -1,452 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G008_reward_animal; -using DG.Tweening; -using BingoBrain.HotFix; -using FGUI.Common_animal; -using System; -using DontConfuse; - -namespace BingoBrain -{ - public class PackrewardUI : BaseUI - { - private PackrewardUICtrl ctrl; - private PackrewardModel model; - private FGUI.G008_reward_animal.com_packreward ui; - - public PackrewardUI(PackrewardUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.PackrewardUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G008_reward_animal"; - uiInfo.assetName = "com_packreward"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = false; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PackrewardModel) as PackrewardModel; - } - - protected override void OnClose() - { - if (GameHelper.IsAdModelOfPay()) - { - Hall.Instance.UpdateSecondEvent -= InitView; - - } - GameHelper.showGameUI = true; - WebviewManager.Instance.SetDarkThough(true); - GameDispatcher.Instance.Dispatch(GameMsg.pack_close); - int three_gift_got_index = SaveData.GetSaveobject().three_gift_got_index; - if (isAutoPop && (three_gift_got_index <= (int)rewardState.day3)) - { - uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open); - } - } - - private bool isAutoPop = false; - protected override void OnBind() - { - ui = baseUI as FGUI.G008_reward_animal.com_packreward; - } - - protected override void OnOpenBefore(object args) - { - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.gold.y += Screen.safeArea.y; - - } - - GameHelper.showGameUI = false; - bool need_scroll = false; - PackRewardData Datas = args as PackRewardData; - if (args != null) - { - Datas = args as PackRewardData; - need_scroll = Datas.isNeedScroll; - isAutoPop = Datas.isAutoPop; - } - if (need_scroll) ui.panel_parent.scrollPane.ScrollDown(300, false); - if (need_scroll) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.remove_ad_show, 1); - } - else - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.pack_show, 1); - } - list = ConfigSystem.GetConfig().dataList; - gold_num = list[0].coins_quantity; - back_num = list[0].props_quantity[1]; - out_num = list[0].props_quantity[0]; - refresh_num = list[0].props_quantity[2]; - - ui.panel_parent.panel.btn_close0.SetClick(CtrlCloseUI); - ui.panel_parent.panel.btn_close1.SetClick(CtrlCloseUI); - ui.gold.GetChild("number_text").text = GameHelper.GetGoldNumber().ToString(); - InitView(); - if (GameHelper.IsAdModelOfPay()) - { - Hall.Instance.UpdateSecondEvent += InitView; - } - WebviewManager.Instance.SetDarkThough(false); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - } - #endregion - void pay_success(object str) - { - string type = (string)str; - if (type == PurchasingManager.remove_ad) - { - - var start = GameHelper.GetUICenterPosition(ui.panel_parent.panel.text_goldnum2); - - DOVirtual.DelayedCall(1, () => - { - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency101, 1, - value => { ui.gold.GetChild("number_text").text = GameHelper.Get101Str((decimal)value); }); - }); - - var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(101, list[1].coins_quantity, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted(success => - { - // if (success) - // { - // RefreshGold(awardNum); - // } - }); - - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Close); - SaveData.GetSaveobject().is_get_removead = true; - InitView(); - - - } - else if (type == PurchasingManager.pack_reward) - { - var start = GameHelper.GetUICenterPosition(ui.panel_parent.panel.text_goldnum); - - DOVirtual.DelayedCall(1, () => - { - DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency101, 1, - value => { ui.gold.GetChild("number_text").text = ((int)value).ToString(); }); - }); - ; - var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - - - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(101, list[0].coins_quantity, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted(success => - { - // if (success) - // { - // RefreshGold(awardNum); - // } - }); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - SaveData.GetSaveobject().is_get_packreward = true; - InitView(); - } - - - - } - //初始化页面逻辑 - private int gold_num = 300; - private int back_num = 1; - private int out_num = 1; - private int refresh_num = 1; - private List list; - private void InitView() - { - ui.panel_parent.panel.pay_type.selectedIndex = 0; - - list = ConfigSystem.GetConfig().dataList; - ui.panel_parent.panel.text_have1.text = "Owner ADs:" + SaveData.GetSaveobject().look_ad_numbers; - ui.panel_parent.panel.text_have2.text = "Owner ADs:" + SaveData.GetSaveobject().look_ad_numbers; - - ui.panel_parent.panel.need_text1.text = "need " + list[0].Paid_price + " ADs"; - ui.panel_parent.panel.need_text2.text = "need " + list[1].Paid_price + " ADs"; - ui.panel_parent.panel.text_goldnum.text = "x" + gold_num; - ui.panel_parent.panel.text_backnum1.text = "x" + back_num; - ui.panel_parent.panel.text_outnum.text = "x" + out_num; - ui.panel_parent.panel.text_refreshnum.text = "x" + refresh_num; - btn_green btn_buypack = (ui.panel_parent.panel.btn_buypack as btn_green); - GObject pack_title = ui.panel_parent.panel.btn_buypack.GetChild("title"); - - ui.panel_parent.panel.text_goldnum2.text = "x" + list[1].coins_quantity; - btn_green btn_removead = (ui.panel_parent.panel.btn_buyremovead as btn_green); - GObject removead_title = ui.panel_parent.panel.btn_buyremovead.GetChild("title"); - btn_buypack.img_saveingpot.visible = false; - btn_removead.img_saveingpot.visible = false; - if (!GameHelper.IsAdModelOfPay()) - { - ui.panel_parent.panel.pay_type.selectedIndex = 1; - - decimal price_pack = (decimal)list[0].Paid_price2; - ui.panel_parent.panel.btn_max_pack.title = GameHelper.Get102Str(price_pack); - bool is_get_pack = SaveData.GetSaveobject().is_get_packreward; - if (is_get_pack) - { - ui.panel_parent.panel.btn_max_pack.enabled = false; - ui.panel_parent.panel.btn_max_pack.SetClick(() => { }); - } - else - { - - ui.panel_parent.panel.btn_max_pack.SetClick(() => - { - MaxPayClass maxPayData = new MaxPayClass - { - amount = (int)Math.Round(price_pack * 100), - sku = MaxPayManager.pack_reward, - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.panel_parent.panel.btn_max_pack.GetChild("img_saveingpot") as GImage).visible = true; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.panel_parent.panel.btn_max_remove.GetChild("img_saveingpot") as GImage).visible = true; - decimal price_remove = (decimal)list[1].Paid_price2; - ui.panel_parent.panel.btn_max_remove.title = GameHelper.Get102Str(price_remove); - bool is_get_removead = SaveData.GetSaveobject().is_get_removead; - if (is_get_removead) - { - ui.panel_parent.panel.btn_max_remove.enabled = false; - ui.panel_parent.panel.btn_max_remove.SetClick(() => { }); - } - else - { - ui.panel_parent.panel.btn_max_remove.SetClick(() => - { - MaxPayClass maxPayData = new MaxPayClass - { - amount = (int)Math.Round(price_remove * 100), - sku = MaxPayManager.remove_ad, - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - - return; - } - - bool is_get = SaveData.GetSaveobject().is_get_packreward; - if (is_get) - { - btn_buypack.state.selectedIndex = 0; - btn_buypack.cooldown.selectedIndex = 1; - ui.panel_parent.panel.btn_buypack.grayed = true; - pack_title.text = "Cliamed"; - ui.panel_parent.panel.btn_buypack.SetClick(() => - { - - }); - } - else if (SaveData.GetSaveobject().look_ad_numbers >= list[0].Paid_price) - { - btn_buypack.state.selectedIndex = 1; - btn_buypack.cooldown.selectedIndex = 0; - btn_buypack.SetClick(() => - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.pack_success, 1); - ApplePayClass test = new ApplePayClass() - { - sku = PurchasingManager.pack_reward, - }; - SaveData.GetSaveobject().look_ad_numbers -= (int)list[0].Paid_price; - PurchasingManager.Instance.Purchase(PurchasingManager.pack_reward, test); - }); - } - else if (SaveData.GetSaveobject().look_ad_time > GameHelper.GetNowTime()) - { - btn_buypack.state.selectedIndex = 0; - btn_buypack.cooldown.selectedIndex = 1; - pack_title.text = GameHelper.TimeFormat(SaveData.GetSaveobject().look_ad_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - btn_buypack.SetClick(() => - { - - - }); - } - else - { - btn_buypack.state.selectedIndex = 0; - btn_buypack.cooldown.selectedIndex = 0; - pack_title.text = "Watch AD"; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_buypack.img_saveingpot.visible = true; - btn_buypack.SetClick(() => - { - - GameHelper.ShowVideoAd("PackReward", (issuccess) => - { - if (issuccess) - { - SaveData.GetSaveobject().look_ad_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().exchangeCD; - InitView(); - - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.pack_click, 1); - }); - } - - - - - is_get = SaveData.GetSaveobject().is_get_removead; - if (is_get) - { - - btn_removead.state.selectedIndex = 0; - btn_removead.cooldown.selectedIndex = 1; - removead_title.text = "Cliamed"; - btn_removead.SetClick(() => - { - - - }); - } - - else if (SaveData.GetSaveobject().look_ad_numbers >= list[1].Paid_price) - { - btn_removead.state.selectedIndex = 1; - btn_removead.cooldown.selectedIndex = 0; - btn_removead.SetClick(() => - { - ApplePayClass test = new ApplePayClass() - { - sku = PurchasingManager.remove_ad, - }; - SaveData.GetSaveobject().look_ad_numbers -= (int)list[1].Paid_price; - PurchasingManager.Instance.Purchase(PurchasingManager.pack_reward, test); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.remove_ad_success, 1); - }); - } - else if (SaveData.GetSaveobject().look_ad_time > GameHelper.GetNowTime()) - { - btn_removead.state.selectedIndex = 0; - btn_removead.cooldown.selectedIndex = 1; - removead_title.text = GameHelper.TimeFormat(SaveData.GetSaveobject().look_ad_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - btn_removead.SetClick(() => - { - - - }); - - } - - - - else - { - btn_removead.state.selectedIndex = 0; - btn_removead.cooldown.selectedIndex = 0; - removead_title.text = "Watch AD"; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_removead.img_saveingpot.visible = true; - btn_removead.SetClick(() => - { - GameHelper.ShowVideoAd("RemoveAd", (issuccess) => - { - if (issuccess) - { - SaveData.GetSaveobject().look_ad_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().exchangeCD; - InitView(); - - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.remove_ad_click, 1); - // ApplePayClass test = new ApplePayClass() - // { - // transactionId = "", - // amount = (int)(list[1].Paid_price * 100), - // sku = PurchasingManager.remove_ad, - // currency = "USD" - // }; - - // PurchasingManager.Instance.Purchase(PurchasingManager.remove_ad, test); - - - // SaveData.GetSaveobject().is_get_removead = true; - // SaveData.saveDataFunc(); - // InitView(); - - }); - } - - - - } - } -} - public class PackRewardData - { - public bool isAutoPop; - public bool isNeedScroll; - } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUI.cs.meta b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUI.cs.meta deleted file mode 100644 index d508d02..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2e683256807814283b0ddd73c92ca520 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUICtrl.cs b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUICtrl.cs deleted file mode 100644 index f969f0a..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class PackrewardUICtrl : BaseUICtrl - { - private PackrewardUI ui; - private PackrewardModel model; - - private uint openUIMsg = UICtrlMsg.PackrewardUI_Open; - private uint closeUIMsg = UICtrlMsg.PackrewardUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PackrewardModel) as PackrewardModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new PackrewardUI(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/Packreward/PackrewardUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUICtrl.cs.meta deleted file mode 100644 index 2abdc43..0000000 --- a/Assets/BingoBrain/ModuleUI/Packreward/PackrewardUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 485f5d5cee496478b8c94d2649adcb49 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Passunlock.meta b/Assets/BingoBrain/ModuleUI/Passunlock.meta deleted file mode 100644 index 52c3df2..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4811806088644438dabc5a05e8c26a37 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockCtrl.cs b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockCtrl.cs deleted file mode 100644 index af4c1b6..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class PassunlockCtrl : BaseCtrl - { - public static PassunlockCtrl Instance { get; private set; } - - private PassunlockModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.PassunlockModel) as PassunlockModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockCtrl.cs.meta deleted file mode 100644 index 5a2ba20..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2b53fa48e580b4882a9c0441fac55e15 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockModel.cs b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockModel.cs deleted file mode 100644 index 3541855..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class PassunlockModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockModel.cs.meta b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockModel.cs.meta deleted file mode 100644 index 0557970..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: eb4bc378cc43143cdaa3c2fa20c27548 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUI.cs b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUI.cs deleted file mode 100644 index 2e4f927..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUI.cs +++ /dev/null @@ -1,187 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G009_video_animal; -using FGUI.Common_animal; -using System; - -namespace BingoBrain -{ - public class PassunlockUI : BaseUI - { - private PassunlockUICtrl ctrl; - private PassunlockModel model; - private FGUI.G009_video_animal.com_passunlock ui; - - public PassunlockUI(PassunlockUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.PassunlockUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G009_video_animal"; - uiInfo.assetName = "com_passunlock"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PassunlockModel) as PassunlockModel; - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G009_video_animal.com_passunlock; - } - - protected override void OnOpenBefore(object args) - { - InitView(); - ui.btn_close.SetClick(CtrlCloseUI); - int gold = 0; - - List Passportrewards_list = ConfigSystem.GetConfig().dataList; - for (int i = 0; i < Passportrewards_list.Count; i++) - { - - if (Passportrewards_list[i].Paid_rewards_type == 0) gold += Passportrewards_list[i].Paid_rewards_num; - - } - ui.text_allgold.text = gold.ToString(); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event,BuriedPointEvent.pass_show,1); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - if (GameHelper.IsAdModelOfPay()){ - Hall.Instance.UpdateSecondEvent += InitView; - } - } - protected override void RemoveListener() - { - if (GameHelper.IsAdModelOfPay()){ - Hall.Instance.UpdateSecondEvent -= InitView; - } - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - } - #endregion - void pay_success(object str) - { - string type = (string)str; - if (type == PurchasingManager.battle_pass) - { - CtrlCloseUI(); - } - } - //初始化页面逻辑 - private void InitView() - { - if (!GameHelper.IsAdModelOfPay()) - { - ui.pay_type.selectedIndex = 1; - decimal price = (decimal)GameHelper.GetCommonModel().Passportgift2; - ui.btn_max_pay.title = GameHelper.Get102Str(price); - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true; - ui.btn_max_pay.SetClick(() => { - MaxPayClass maxPayData = new() - { - amount = (int)Math.Round(price * 100), - sku = MaxPayManager.battle_pass, - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - - return; - } - ui.pay_type.selectedIndex = 0; - - btn_green btn_buypass = ui.btn_buypass as btn_green; - - ui.text_have.text = "Owner ADs:" + SaveData.GetSaveobject().look_ad_numbers; - ui.need_text.text = "need " + ConfigSystem.GetConfig().Passportgift + " ADs"; - btn_buypass.img_saveingpot.visible = false; - if (SaveData.GetSaveobject().look_ad_numbers >= ConfigSystem.GetConfig().Passportgift) - { - btn_buypass.state.selectedIndex = 1; - btn_buypass.cooldown.selectedIndex = 0; - ui.btn_buypass.SetClick(() => - { - ApplePayClass test = new ApplePayClass() - { - - sku = PurchasingManager.battle_pass, - - }; - SaveData.GetSaveobject().look_ad_numbers -= (int)ConfigSystem.GetConfig().Passportgift; - PurchasingManager.Instance.Purchase(PurchasingManager.battle_pass, test); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.pass_success, 1); - }); - } - else if (SaveData.GetSaveobject().look_ad_time > GameHelper.GetNowTime()) - { - btn_buypass.state.selectedIndex = 0; - btn_buypass.cooldown.selectedIndex = 1; - btn_buypass.text = GameHelper.TimeFormat(SaveData.GetSaveobject().look_ad_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - btn_buypass.SetClick(() => - { - - - }); - } - else - { - btn_buypass.state.selectedIndex = 0; - btn_buypass.cooldown.selectedIndex = 0; - btn_buypass.text = "Watch AD"; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_buypass.img_saveingpot.visible = true; - btn_buypass.SetClick(() => - { - GameHelper.ShowVideoAd("Pass", (issuccess) => - { - if (issuccess) - { - SaveData.GetSaveobject().look_ad_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().exchangeCD; - InitView(); - - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.pass_click, 1); - }); - } - - - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUI.cs.meta b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUI.cs.meta deleted file mode 100644 index d4777a2..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6923c290d351644508b81cee1a88e1d8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUICtrl.cs b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUICtrl.cs deleted file mode 100644 index 6406353..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class PassunlockUICtrl : BaseUICtrl - { - private PassunlockUI ui; - private PassunlockModel model; - - private uint openUIMsg = UICtrlMsg.PassunlockUI_Open; - private uint closeUIMsg = UICtrlMsg.PassunlockUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PassunlockModel) as PassunlockModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new PassunlockUI(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/Passunlock/PassunlockUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUICtrl.cs.meta deleted file mode 100644 index 68052a1..0000000 --- a/Assets/BingoBrain/ModuleUI/Passunlock/PassunlockUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9730d87819cc94ea5b1f8a5871d19ccc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingCtrl.cs b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingCtrl.cs deleted file mode 100644 index 8c6ea2e..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingCtrl.cs +++ /dev/null @@ -1,44 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class PayloadingCtrl : BaseCtrl - { - public static PayloadingCtrl Instance { get; private set; } - - private PayloadingModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.PayloadingModel) as PayloadingModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingCtrl.cs.meta deleted file mode 100644 index 5790be1..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 105d69bbdd9dd46bea6cd8bc0593c98f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingModel.cs b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingModel.cs deleted file mode 100644 index 8444a64..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingModel.cs +++ /dev/null @@ -1,45 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class PayloadingModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingModel.cs.meta b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingModel.cs.meta deleted file mode 100644 index 9843a3e..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d3537c81351e541aaa7d6078f65f5e6f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUI.cs b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUI.cs deleted file mode 100644 index 0b85ae4..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUI.cs +++ /dev/null @@ -1,82 +0,0 @@ -using BingoBrain.Core; -using DG.Tweening; - -namespace BingoBrain -{ - public class PayloadingUI : BaseUI - { - private PayloadingUICtrl ctrl; - private PayloadingModel model; - private FGUI.G008_reward_animal.com_payloading ui; - - public PayloadingUI(PayloadingUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.PayloadingUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G008_reward_animal"; - uiInfo.assetName = "com_payloading"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = false; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PayloadingModel) as PayloadingModel; - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - // ui = baseUI as FGUI.jiangli.com_payloading; - } - - 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() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - DOVirtual.DelayedCall(5, () => - { - CtrlCloseUI(); - }); - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUI.cs.meta b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUI.cs.meta deleted file mode 100644 index 7390caf..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7234ad021bd9d48578a2006435070883 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUICtrl.cs b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUICtrl.cs deleted file mode 100644 index c65a4be..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUICtrl.cs +++ /dev/null @@ -1,73 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class PayloadingUICtrl : BaseUICtrl - { - private PayloadingUI ui; - private PayloadingModel model; - - private uint openUIMsg = UICtrlMsg.PayloadingUI_Open; - private uint closeUIMsg = UICtrlMsg.PayloadingUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PayloadingModel) as PayloadingModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new PayloadingUI(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/Payloading/PayloadingUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUICtrl.cs.meta deleted file mode 100644 index cf7ec9d..0000000 --- a/Assets/BingoBrain/ModuleUI/Payloading/PayloadingUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e860c5f33db524b09a94aa6a6a461036 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/PurchasingManager.cs b/Assets/BingoBrain/ModuleUI/PurchasingManager.cs deleted file mode 100644 index 206c17c..0000000 --- a/Assets/BingoBrain/ModuleUI/PurchasingManager.cs +++ /dev/null @@ -1,73 +0,0 @@ -using UnityEngine; - -using System.Threading.Tasks; -using BingoBrain; -using BingoBrain; -using BingoBrain.Core; - -public class PurchasingManager -{ - public static readonly PurchasingManager Instance = new PurchasingManager(); - - - PurchasingManager() - { - - } - - /// - /// 初始化商品 - /// 建议在游戏初始化完成的时候就去初始化商品 - /// - internal void Purchase(string _productId, ApplePayClass data_) - { - //is debug test---------- - - GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, data_.sku); - - - - - } - public static string buy_one = "com.sugar.space.24.99"; - public static string buy_gold_1 = "com.sugar.shop.1.99"; - public static string buy_gold_2 = "com.sugar.shop.3.99"; - public static string buy_gold_3 = "com.sugar.shop.9.99"; - public static string buy_gold_4 = "com.sugar.shop.19.99"; - - public static string remove_ad = "com.sugar.remove.2.99"; - public static string battle_pass = "com.sugar.pass.9.99"; - public static string pack_reward = "com.sugar.reward.1.99"; - public static string fail_pack = "com.sugar.fail_pack"; - public static string three_days_gift = "com.wingwizard.3daygift1.1.99"; - - /// - /// 发起内购 - /// - /// 要购买的商品ID - /// 购买成功回调 - /// 购买失败回调/* */ - -} -internal class ApplePayClass -{ - public string innerOrderId; - public string transactionId; - public int amount; - public string sku; - public string currency = "USD"; - -} - -public class CheckData -{ - public string signedPayload; - public string innerOrderId; -} - - -public class orderData -{ - public string order_id; - public string pay_url; -} diff --git a/Assets/BingoBrain/ModuleUI/PurchasingManager.cs.meta b/Assets/BingoBrain/ModuleUI/PurchasingManager.cs.meta deleted file mode 100644 index ec868e1..0000000 --- a/Assets/BingoBrain/ModuleUI/PurchasingManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b34ba062906fa46ebbd68075522548bc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/ReadyBingo/ReadyBingoUI.cs b/Assets/BingoBrain/ModuleUI/ReadyBingo/ReadyBingoUI.cs index 8259af6..b1a8d27 100644 --- a/Assets/BingoBrain/ModuleUI/ReadyBingo/ReadyBingoUI.cs +++ b/Assets/BingoBrain/ModuleUI/ReadyBingo/ReadyBingoUI.cs @@ -96,7 +96,7 @@ namespace BingoBrain { GameDispatcher.Instance.AddListener(BingoInfo.UpdateHotFixMax, OnUpdateHotFixMax); GameDispatcher.Instance.AddListener(BingoInfo.UpdateHotFixProgress, OnUpdateHotFixProgress); - GameDispatcher.Instance.AddListener(GameMsg.Network_reconnection, Reconnection); + GameDispatcher.Instance.AddListener(BingoInfo.Network_reconnection, Reconnection); } @@ -104,7 +104,7 @@ namespace BingoBrain { GameDispatcher.Instance.RemoveListener(BingoInfo.UpdateHotFixMax, OnUpdateHotFixMax); GameDispatcher.Instance.RemoveListener(BingoInfo.UpdateHotFixProgress, OnUpdateHotFixProgress); - GameDispatcher.Instance.RemoveListener(GameMsg.Network_reconnection, Reconnection); + GameDispatcher.Instance.RemoveListener(BingoInfo.Network_reconnection, Reconnection); } diff --git a/Assets/BingoBrain/ModuleUI/RecordView.meta b/Assets/BingoBrain/ModuleUI/RecordView.meta index d0cb294..cfec749 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView.meta +++ b/Assets/BingoBrain/ModuleUI/RecordView.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 182254be83d77454393ddb455ce6026d +guid: 58047cf7496897b40974c58f8321d4ec folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs index 09ed9f0..ec5a7f3 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs @@ -1,8 +1,6 @@ -using System.Collections; -using System.Collections.Generic; using BingoBrain.Core; - namespace BingoBrain +namespace BingoBrain { public class RecordViewCtrl : BaseCtrl { @@ -10,14 +8,18 @@ using BingoBrain.Core; private RecordViewModel model; + #region 生命周期 protected override void OnInit() { Instance = this; + //model = ModuleManager.Instance..GetModel(ModelConst.RecordViewModel) as RecordViewModel; } protected override void OnDispose() { Instance = null; } + + #endregion } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs.meta index d86ccd3..64672ad 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewCtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5c219c03fd1474d73bd17b07c7df43c7 +guid: ad133fc8d24bd3e4392d1d483e156019 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs index 32af09f..027131c 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs @@ -1,9 +1,11 @@ using System.Collections.Generic; using BingoBrain.Core; + namespace BingoBrain { public class RecordViewModel : BaseModel { + #region 生命周期 public List recordList = new List(); protected override void OnInit() { @@ -15,7 +17,8 @@ namespace BingoBrain protected override void OnReset() { - throw new System.NotImplementedException(); } + + #endregion } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs.meta b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs.meta index 04b009d..25cd110 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs.meta +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewModel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8267bf1de4e9949828f446ca83bcacfa +guid: c68b8b32fc927ea468ccee7c68846d2d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs index 01d387d..70ca4aa 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs @@ -1,20 +1,20 @@ +using System; using System.Collections; using System.Collections.Generic; -using UnityEngine; using BingoBrain.Core; +using BingoBrain.HotFix; +using DG.Tweening; using FairyGUI; using FGUI.ACommon; -using System; -using DG.Tweening; using FGUI.bkg_jilu; -using Unity.VisualScripting; +using UnityEngine; namespace BingoBrain { public class RecordViewUI : BaseUI { - private RecordViewUICtrl ctrl; - private RecordViewModel model; + public RecordViewUICtrl ctrl; + public RecordViewModel model; private FGUI.bkg_jilu.com_jilu ui; public RecordViewUI(RecordViewUICtrl ctrl) : base(ctrl) @@ -28,15 +28,15 @@ namespace BingoBrain uiInfo.packageName = "bkg_jilu"; uiInfo.assetName = "com_jilu"; uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = true; - uiInfo.isNeedCloseAnim = true; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; uiInfo.isNeedUIMask = true; } #region 生命周期 protected override void OnInit() { - + //model = ModuleManager.Instance.GetModel(ModelConst.RecordViewModel) as RecordViewModel; } protected override void OnClose() @@ -49,7 +49,7 @@ namespace BingoBrain protected override void OnBind() { - ui = baseUI as FGUI.bkg_jilu.com_jilu; + ui = baseUI as com_jilu; } protected override void OnOpenBefore(object args) @@ -86,7 +86,7 @@ namespace BingoBrain } #endregion - private bool isroll = false; + private bool isroll; private List list_panel = new List(); @@ -102,7 +102,7 @@ namespace BingoBrain UpdateRecord(); } - private Coroutine coroutine = null; + private Coroutine coroutine; public void UpdateRecord() { if (ctrl.model == null || ctrl.model.recordList.Count == 0) return; @@ -129,11 +129,10 @@ namespace BingoBrain string[] values = ctrl.model.recordList[index].Split('-'); item.name.text = values[0]; - item.num.text = "$" + values[1]; // 假设 money 是显示金额的字段 - - + item.num.text = GameHelper.getChString(decimal.Parse(values[1])); string[] parts = values[2].Split(" "); item.time.text = parts[0]; + item.lab_claim.text = GameHelper.getDesByKey("ww"); } private IEnumerator ScrollRoutine() @@ -145,8 +144,8 @@ namespace BingoBrain { if (i < list_panel.Count) // 再次检查索引是否有效 { - float targetY = list_panel[i].y - 129; - GObjectMoveFunc.MoveTween(list_panel[i], targetY); + float targetY = list_panel[i].y - 110; + list_panel[i].MoveTween(targetY); } } @@ -172,13 +171,14 @@ namespace BingoBrain { obj.TweenMove(new Vector2(obj.x, targetY), 0.5f) .SetEase((EaseType)Ease.Linear) - .OnComplete(()=>{ - if (targetY <= -16) - { - // 第一个 item 放到最后一个位置 - obj.y = 1048; - } + .OnComplete(() => + { + if (targetY <= -16) + { + // 第一个 item 放到最后一个位置 + obj.y = 890; + } }); } } -} \ No newline at end of file +} diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs.meta b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs.meta index 6a6e936..8eb8154 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs.meta +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ead525ed41bd47bb87703021c40c757 +guid: 401f77facf125e0439d09580a69ddae7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs index 3ea6fb8..090eb29 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs @@ -1,23 +1,22 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; + using BingoBrain.Core; +using BingoBrain.HotFix; +using UnityEngine; namespace BingoBrain - { public class RecordViewUICtrl : BaseUICtrl { - private RecordViewUI ui; + public RecordViewUI ui; public RecordViewModel model; - private uint openUIMsg = UICtrlMsg.RecordViewUI_Open; - private uint closeUIMsg = UICtrlMsg.RecordViewUI_Close; + private uint openUIMsg = SkinInfo.RecordViewUI_Open; + private uint closeUIMsg = SkinInfo.RecordViewUI_Close; #region 生命周期 protected override void OnInit() { - model = ModuleBoardk.GetModel(ModelConst.RecordViewModel) as RecordViewModel; + model = ModuleBoardk.Instance.GetModel(ModelConst.RecordViewModel) as RecordViewModel; } protected override void OnDispose() @@ -57,16 +56,32 @@ namespace BingoBrain { uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - GameDispatcher.Instance.AddListener(GameMsg.updateRecordList, RefreshList); - + GameDispatcher.Instance.AddListener(BingoInfo.updateRecordList, RefreshList); } protected override void RemoveListener() { uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - GameDispatcher.Instance.RemoveListener(GameMsg.updateRecordList, RefreshList); + GameDispatcher.Instance.RemoveListener(BingoInfo.updateRecordList, RefreshList); } + void RefreshList(object args = null) + { + Debug.Log("????????????????0"); + Debug.Log(args); + Debug.Log(model); + Debug.Log(model.recordList); + if (args == null || model.recordList == null) return; +Debug.Log("????????????????1"); + if (model.recordList.Count >= 9) + { + model.recordList.RemoveAt(0); + } + model.recordList.Add(args.ToString()); + + ui?.UpdateRecord(); + + } protected override void AddServerListener() { @@ -74,23 +89,6 @@ namespace BingoBrain protected override void RemoveServerListener() { - } - - void RefreshList(object args = null) - { - if (args == null || model.recordList == null) return; - - // Debug.Log($" barry refresh args == {args}"); - // Debug.Log($" barry refresh list == {model.recordList.Count}"); - if (model.recordList.Count >= 9) - { - model.recordList.RemoveAt(0); - - } - model.recordList.Add(args.ToString()); - - ui?.UpdateRecord(); - } #endregion } diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs.meta index 5f17d24..78c1c1a 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUICtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4b262c4e5a954831be8cf5baf8aff72 +guid: 25d0f566135c40f478971ffae78516c8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/Regulation.meta b/Assets/BingoBrain/ModuleUI/Regulation.meta deleted file mode 100644 index 28b0e7c..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 99a604c7e9af149778225049fafc92f9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Regulation/RegulationCtrl.cs b/Assets/BingoBrain/ModuleUI/Regulation/RegulationCtrl.cs deleted file mode 100644 index 923cf5f..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationCtrl.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class RegulationCtrl : BaseCtrl - { - public static RegulationCtrl Instance { get; private set; } - - private RegulationModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.RegulationModel) as RegulationModel; - } - - protected override void OnDispose() - { - Instance = null; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Regulation/RegulationCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Regulation/RegulationCtrl.cs.meta deleted file mode 100644 index 8202aee..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bde26c66484c940e1a0426975773d3db -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Regulation/RegulationModel.cs b/Assets/BingoBrain/ModuleUI/Regulation/RegulationModel.cs deleted file mode 100644 index 8b1221b..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class RegulationModel : 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/Regulation/RegulationModel.cs.meta b/Assets/BingoBrain/ModuleUI/Regulation/RegulationModel.cs.meta deleted file mode 100644 index ef571f3..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6a2333077a7754a9c8889f854a973001 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Regulation/RegulationUI.cs b/Assets/BingoBrain/ModuleUI/Regulation/RegulationUI.cs deleted file mode 100644 index 3df8062..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationUI.cs +++ /dev/null @@ -1,83 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; -using FGUI.ACommon; -using UnityEngine; - -namespace BingoBrain -{ - public class RegulationUI : BaseUI - { - private RegulationUICtrl ctrl; - private RegulationModel model; - private FGUI.G007_makeup.com_regulation ui; - - public RegulationUI(RegulationUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.RegulationUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G007_makeup"; - uiInfo.assetName = "com_regulation"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RegulationModel) as RegulationModel; - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G007_makeup.com_regulation; - } - - 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() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - ui.closeButton.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(SkinInfo.RegulationUI_Close); - }); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Regulation/RegulationUI.cs.meta b/Assets/BingoBrain/ModuleUI/Regulation/RegulationUI.cs.meta deleted file mode 100644 index 9d07667..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dfb2492e10d844fc98015d29fa4f6a9b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Regulation/RegulationUICtrl.cs b/Assets/BingoBrain/ModuleUI/Regulation/RegulationUICtrl.cs deleted file mode 100644 index 9914576..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationUICtrl.cs +++ /dev/null @@ -1,74 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; - -namespace BingoBrain -{ - public class RegulationUICtrl : BaseUICtrl - { - private RegulationUI ui; - private RegulationModel model; - - private uint openUIMsg = SkinInfo.RegulationUI_Open; - private uint closeUIMsg = SkinInfo.RegulationUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RegulationModel) as RegulationModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new RegulationUI(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/Regulation/RegulationUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Regulation/RegulationUICtrl.cs.meta deleted file mode 100644 index f2fd118..0000000 --- a/Assets/BingoBrain/ModuleUI/Regulation/RegulationUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fc5c3093da2564203879581013525880 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Remake.meta b/Assets/BingoBrain/ModuleUI/Remake.meta deleted file mode 100644 index dc893ee..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7fb5aae7a8e9543e9acfbb51a711f809 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Remake/RemakeCtrl.cs b/Assets/BingoBrain/ModuleUI/Remake/RemakeCtrl.cs deleted file mode 100644 index 4e65ebb..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class RemakeCtrl : BaseCtrl - { - public static RemakeCtrl Instance { get; private set; } - - private RemakeModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.RemakeModel) as RemakeModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Remake/RemakeCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Remake/RemakeCtrl.cs.meta deleted file mode 100644 index 1030014..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 30f4147b6a9f34f8a98d5bbc0a788e6d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Remake/RemakeModel.cs b/Assets/BingoBrain/ModuleUI/Remake/RemakeModel.cs deleted file mode 100644 index 4d622f7..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class RemakeModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Remake/RemakeModel.cs.meta b/Assets/BingoBrain/ModuleUI/Remake/RemakeModel.cs.meta deleted file mode 100644 index 64fbd46..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 24f4458949b044bf5ad0e021638528e0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Remake/RemakeUI.cs b/Assets/BingoBrain/ModuleUI/Remake/RemakeUI.cs deleted file mode 100644 index 05fc0fc..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeUI.cs +++ /dev/null @@ -1,206 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G006_menu_animal; - -namespace BingoBrain -{ - public class RemakeUI : BaseUI - { - private RemakeUICtrl ctrl; - private RemakeModel model; - private FGUI.G006_menu_animal.com_remake ui; - - public RemakeUI(RemakeUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.RemakeUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G006_menu_animal"; - uiInfo.assetName = "com_remake"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RemakeModel) as RemakeModel; - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G006_menu_animal.com_remake; - } - - 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() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - Debug.Log(GameHelper.GetLevelstate()); - int state = GameHelper.GetLevelstate(); - int need_gold = ConfigSystem.GetConfig().RevivalCoins; - ui.btn_gold.GetChild("number_text").text = need_gold.ToString(); - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_ad.GetChild("img_saveingpot") as GImage).visible = true; - if (state == 3) - { - ui.state.selectedIndex = 0; - ui.btn_ad.SetClick(() => - { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - GameHelper.SetLevelstate(1); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - } - }); - - }); - ui.btn_gold.SetClick(() => - { - if (GameHelper.checkGoldNumber(need_gold)) - { - //GameHelper.addGoldNumber(-need_gold); - PreferencesMgr.Instance.Currency101 -= need_gold; - GameHelper.SetLevelstate(2); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - } - else - { - GameHelper.ShowTips("Not enough gold"); - } - - }); - } - else if (state == 2) - { - ui.state.selectedIndex = 2; - ui.btn_ad.SetClick(() => - { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - GameHelper.SetLevelstate(0); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - } - }); - - }); - - } - else if (state == 1) - { - ui.state.selectedIndex = 1; - ui.btn_gold.SetClick(() => - { - if (GameHelper.checkGoldNumber(need_gold)) - { - PreferencesMgr.Instance.Currency101 -= need_gold; - GameHelper.SetLevelstate(0); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - } - else - { - GameHelper.ShowTips("Not enough gold"); - } - - }); - } - - ui.btn_back.SetClick(() => - { - float[] cash_array = GameHelper.GetRewardValue(2); - // var temp = new { is_success = false, cash_number = cash_array[0], is_level_success = true,is_h5_reward=false }; - var temp = new SuccessData(); - temp.IsWin = false; - temp.cash_number = cash_array[0]; - temp.IsLevelSuccess = true; - temp.IsH5Reward = false; - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - - }); - ui.btn_close.SetClick(() => - { - - float[] cash_array = GameHelper.GetRewardValue(2); - // var temp = new { is_success = false, cash_number = cash_array[0], is_level_success = true, is_h5_reward = false }; - var temp = new SuccessData(); - temp.IsWin = false; - temp.cash_number = cash_array[0]; - temp.IsLevelSuccess = true; - temp.IsH5Reward = false; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - }); - - - - // ui.btn_back.SetClick(() => - // { - // GameHelper.SetLevelstate(3); - // GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, false); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open); - // }); - // ui.btn_close.SetClick(() => - // { - // GameHelper.SetLevelstate(3); - // GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, false); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Close); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open); - // }); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Remake/RemakeUI.cs.meta b/Assets/BingoBrain/ModuleUI/Remake/RemakeUI.cs.meta deleted file mode 100644 index 8f88452..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 05d11be9302224ba99cc14d10974266f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Remake/RemakeUICtrl.cs b/Assets/BingoBrain/ModuleUI/Remake/RemakeUICtrl.cs deleted file mode 100644 index 65d95ad..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class RemakeUICtrl : BaseUICtrl - { - private RemakeUI ui; - private RemakeModel model; - - private uint openUIMsg = UICtrlMsg.RemakeUI_Open; - private uint closeUIMsg = UICtrlMsg.RemakeUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RemakeModel) as RemakeModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new RemakeUI(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/Remake/RemakeUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Remake/RemakeUICtrl.cs.meta deleted file mode 100644 index 8574a8e..0000000 --- a/Assets/BingoBrain/ModuleUI/Remake/RemakeUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d012c092edd6c41a2bbbed3c72ca2bfe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Resurgence.meta b/Assets/BingoBrain/ModuleUI/Resurgence.meta deleted file mode 100644 index 9e55bf9..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1a8d60fdc0d4e4282a435ba0814c8b01 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceCtrl.cs b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceCtrl.cs deleted file mode 100644 index ed3fb06..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceCtrl.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - namespace BingoBrain -{ - public class ResurgenceCtrl : BaseCtrl - { - public static ResurgenceCtrl Instance { get; private set; } - - private ResurgenceModel model; - - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceCtrl.cs.meta deleted file mode 100644 index 6f01cf3..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4d56a2d552aac4144bd57d8ba295b6fc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceModel.cs b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceModel.cs deleted file mode 100644 index c782339..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using BingoBrain.Core; -namespace BingoBrain -{ - public class ResurgenceModel : BaseModel - { - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - throw new System.NotImplementedException(); - } - } -} diff --git a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceModel.cs.meta b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceModel.cs.meta deleted file mode 100644 index 5eb8977..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0a39a114043b6494f946e195cd413673 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUI.cs b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUI.cs deleted file mode 100644 index 33ca225..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUI.cs +++ /dev/null @@ -1,269 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using BingoBrain.Core; -using FairyGUI; -using FGUI.failpack; -using System; -using FGUI.ACommon; -using DG.Tweening; -using BingoBrain.HotFix; -using FGUI.Common_animal; - -namespace BingoBrain -{ - public class ResurgenceUI : BaseUI - { - private ResurgenceUICtrl ctrl; - private ResurgenceModel model; - private FGUI.failpack.com_resurgence ui; - - public ResurgenceUI(ResurgenceUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.ResurgenceUI; - this.ctrl = ctrl; - } - private float progress_value; - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "failpack"; - uiInfo.assetName = "com_resurgence"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - ui = baseUI as FGUI.failpack.com_resurgence; - } - - protected override void OnOpenBefore(object args) - { - - Debug.Log(args); - progress_value = (float)args * 100; - InitView(); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.fail_show, 1); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - if (GameHelper.IsAdModelOfPay()) - { - Hall.Instance.UpdateSecondEvent += InitView; - } - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - Hall.Instance.UpdateSecondEvent += updatEevent; - } - protected override void RemoveListener() - { - if (GameHelper.IsAdModelOfPay()) - { - Hall.Instance.UpdateSecondEvent -= InitView; - } - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - Hall.Instance.UpdateSecondEvent -= updatEevent; - } - #endregion - private void updatEevent() - { - - // ui.text_remain.text=GameHelper.TimeFormat((int)(SaveData.GetSaveobject().failed_pack_time - Convert.ToInt32(GameHelper.GetNowTime())), CountDownType.Hour); - - } - void pay_success(object str) - { - string type = (string)str; - - // if (type == PurchasingManager.fail_pack) - // { - - // var start = GameHelper.GetUICenterPosition(ui.bg); - // var rewardData = new RewardData(); - // var end = GameHelper.GetUICenterPosition(ui.end_point); - // var rewardSingleData = new RewardSingleData(101, list[2].coins_quantity, RewardOrigin.AdTask) - // { - // startPosition = start, - // endPosition = end - // }; - - // rewardData.AddReward(rewardSingleData); - // rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - // rewardData.AddCompleted(success => - // { - // }); - - // GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Close); - // } - - if (type == PurchasingManager.fail_pack) - { - - var start = GameHelper.GetUICenterPosition(ui.bg); - - var end = GameHelper.GetUICenterPosition(ui.end_point); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(101, list[2].coins_quantity, RewardOrigin.Play) - { - startPosition = start, - endPosition = end, - - }; - rewardData.AddReward(rewardSingleData); - - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted(success => - { - // if (success) - // { - // RefreshGold(awardNum); - // } - }); - - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Close); - - } - - } - private List list; - //初始化页面逻辑 - private void InitView() - { - if (SaveData.GetSaveobject().failed_pack_time < GameHelper.GetNowTime()) - { - - SaveData.GetSaveobject().failed_pack_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().FailedGiftCD; - } - ui.btn_back.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Close); - GameDispatcher.Instance.Dispatch(GameMsg.resurgence_close); - }); - list = ConfigSystem.GetConfig().dataList; - int gold_num = list[2].coins_quantity; - int back_num = list[2].props_quantity[1]; - int out_num = list[2].props_quantity[0]; - int refresh_num = list[2].props_quantity[2]; - ui.text_outnum.text = "x" + out_num; - ui.text_backnum.text = "x" + back_num; - Debug.Log(back_num); - Debug.Log(list[2].props_quantity[1]); - ui.text_refreshnum.text = "x" + refresh_num; - ui.text_goldnum.text = "x" + gold_num; - ui.text_progress.text = "Completion:" + Math.Round(progress_value) + "%"; - ui.progress_1.value = progress_value; - if (!GameHelper.IsAdModelOfPay()) - { - ui.pay_type.selectedIndex = 1; - - decimal price = (decimal)list[2].Paid_price2; - ui.btn_max_pay.title = GameHelper.Get102Str(price); - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true; - ui.btn_max_pay.SetClick(() => - { - MaxPayClass maxPayData = new() - { - amount = (int)Math.Round(price * 100), - sku = MaxPayManager.fail_pack, - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - - - return; - } - ui.text_have.text = "Owner ADs:" + SaveData.GetSaveobject().look_ad_numbers; - ui.need_text.text = "need " + list[2].Paid_price + " ADs"; - btn_green btn_buy_green = ui.btn_buy as btn_green; - btn_buy_green.img_saveingpot.visible = false; - // btn_buy_green.SetClick(() => - // { - // GameDispatcher.Instance.Dispatch(GameMsg.resurgence); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Close); - // }); - - - - if (SaveData.GetSaveobject().look_ad_numbers >= list[2].Paid_price) - { - btn_buy_green.state.selectedIndex = 1; - btn_buy_green.cooldown.selectedIndex = 0; - btn_buy_green.SetClick(() => - { - ApplePayClass test = new ApplePayClass() - { - sku = PurchasingManager.fail_pack, - }; - PurchasingManager.Instance.Purchase(PurchasingManager.fail_pack, test); - SaveData.GetSaveobject().look_ad_numbers -= (int)list[2].Paid_price; - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.fail_buy_success, 1); - }); - } - else if (SaveData.GetSaveobject().look_ad_time > GameHelper.GetNowTime()) - { - btn_buy_green.state.selectedIndex = 0; - btn_buy_green.cooldown.selectedIndex = 1; - btn_buy_green.text = GameHelper.TimeFormat(SaveData.GetSaveobject().look_ad_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - btn_buy_green.SetClick(() => - { - - - }); - } - else - { - btn_buy_green.state.selectedIndex = 0; - btn_buy_green.cooldown.selectedIndex = 0; - btn_buy_green.text = "Watch AD"; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_buy_green.img_saveingpot.visible = true; - btn_buy_green.SetClick(() => - { - GameHelper.ShowVideoAd("Pass", (issuccess) => - { - if (issuccess) - { - SaveData.GetSaveobject().look_ad_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().exchangeCD; - InitView(); - - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.fail_click, 1); - }); - } - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUI.cs.meta b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUI.cs.meta deleted file mode 100644 index 1c25402..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fb8f89f92a98b4317be64d4c14d8f602 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUICtrl.cs b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUICtrl.cs deleted file mode 100644 index 935e301..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUICtrl.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System.Collections; -using System.Collections.Generic; - -using BingoBrain.Core; -namespace BingoBrain - -{ - public class ResurgenceUICtrl : BaseUICtrl - { - private ResurgenceUI ui; - private ResurgenceModel model; - - private uint openUIMsg = UICtrlMsg.ResurgenceUI_Open; - private uint closeUIMsg = UICtrlMsg.ResurgenceUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.ResurgenceModel) as ResurgenceModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new ResurgenceUI(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/Resurgence/ResurgenceUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUICtrl.cs.meta deleted file mode 100644 index 9dd7412..0000000 --- a/Assets/BingoBrain/ModuleUI/Resurgence/ResurgenceUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad517c5a5d56648249afb6f3adb0582d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew.meta b/Assets/BingoBrain/ModuleUI/RewardMulNew.meta deleted file mode 100644 index 074107b..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d03304e171be64b8f925b81c3a250fc7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs deleted file mode 100644 index e76c4ed..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - namespace BingoBrain -{ - public class RewardMulNewCtrl : BaseCtrl - { - public static RewardMulNewCtrl Instance { get; private set; } - - private RewardMulNewModel model; - - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs.meta deleted file mode 100644 index 73199e3..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad6b6ad714766497bab936fd94a74d9e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewModel.cs b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewModel.cs deleted file mode 100644 index a8d512d..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewModel.cs +++ /dev/null @@ -1,39 +0,0 @@ -using BingoBrain.Core; -namespace BingoBrain -{ - public class RewardMulNewModel : BaseModel - { - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - - - protected override void OnReadData() - { - } - - - protected override void WriteLocalStorage() - { - - } - - - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewModel.cs.meta b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewModel.cs.meta deleted file mode 100644 index 2f9079d..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: de45ca22a6e504abca9a1fc7b66af5f1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUI.cs b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUI.cs deleted file mode 100644 index ecc9053..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUI.cs +++ /dev/null @@ -1,256 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using BingoBrain.Core; -using FairyGUI; -using FGUI.bkg_reward_new; -using System; -using DG.Tweening; -using BingoBrain.HotFix; - - -namespace BingoBrain -{ - public class RewardMulNewUI : BaseUI - { - private RewardMulNewUICtrl ctrl; - private RewardMulNewModel model; - private FGUI.bkg_reward_new.com_reward_mul ui; - private Action closeCallback; - private GiftData rewardInfo; - bool hasCoin = false; - decimal m_coinReward = 0; - public RewardMulNewUI(RewardMulNewUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.RewardMulNewUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "bkg_reward_new"; - uiInfo.assetName = "com_reward_mul"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - - protected override void OnInit() - { - - } - - protected override void OnClose() - { - - } - - protected override void OnBind() - { - ui = baseUI as FGUI.bkg_reward_new.com_reward_mul; - - } - - protected override void OnOpenBefore(object args) - { - rewardInfo = (GiftData)args; - InitView(); - } - - protected override void OnOpen(object args) - { - - } - - - - private void InitView() - { - // AudioManager.Instance.PlayDynamicEffect(AudioConst.reward_show); - ui.node_coin.visible = false; - ui.node_undo.visible = false; - ui.node_move_out.visible = false; - ui.node_refresh.visible = false; - ui.add_undo.visible = false; - ui.add_move_out.visible = false; - ui.add_refresh.visible = false; - - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - (ui.btn_mul.GetChild("img_saveingpot") as GImage).visible = true; - } - else - { - (ui.btn_mul.GetChild("img_saveingpot") as GImage).visible = false; - } - - - for (int i = 0; i < rewardInfo.type.Count; i++) - { - if (rewardInfo.type[i] == (int)GiftType.coin) - { - hasCoin = true; - ui.node_coin.visible = true; - ui.node_coin.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } - else if (rewardInfo.type[i] == (int)GiftType.undo) - { - ui.node_undo.visible = true; - ui.node_undo.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - ui.add_undo.visible = true; - ui.add_undo.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } - else if (rewardInfo.type[i] == (int)GiftType.move_out) - { - ui.node_move_out.visible = true; - ui.node_move_out.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - ui.add_move_out.visible = true; - ui.add_move_out.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } - else if (rewardInfo.type[i] == (int)GiftType.refresh) - { - ui.node_refresh.visible = true; - ui.node_refresh.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - ui.add_refresh.visible = true; - ui.add_refresh.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } - } - - ui.btn_mul.SetClick(() => - { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - GameHelper.ShowTips("Successfully claimed"); - - getReward(2); - playCoinAni(); - - ui.ani_group.visible = true; - ui.t0.Play(() => - { - ui.ani_group.visible = false; - }); - } - }); - }); - - ui.btn_claim.SetClick(() => - { - ui.btn_claim.SetClick(() => { }); - ui.btn_mul.SetClick(() => { }); - getReward(1); - playCoinAni(); - DOVirtual.DelayedCall(2f, () => - { - GameHelper.addInterAdnumber(); - }); - - ui.ani_group.visible = true; - ui.t0.Play(() => - { - ui.ani_group.visible = false; - }); - }); - } - - private void getReward(int rate = 1) - { - for (int i = 0; i < rewardInfo.type.Count; i++) - { - if (rewardInfo.type[i] == (int)GiftType.coin || rewardInfo.type[i] == 101) - { - m_coinReward = rewardInfo.reward[i] * rate; - } - else if (rewardInfo.type[i] == (int)GiftType.undo) - { - int num = GameHelper.GetItemNumber(1) + rewardInfo.reward[i] * rate; - GameHelper.SetItemNumber(1, num); - ui.add_undo.GetChild("lab_num").text = "x" + rewardInfo.reward[i] * rate; - } - else if (rewardInfo.type[i] == (int)GiftType.move_out) - { - int num = GameHelper.GetItemNumber(0) + rewardInfo.reward[i] * rate; - GameHelper.SetItemNumber(0, num); - ui.add_move_out.GetChild("lab_num").text = "x" + rewardInfo.reward[i] * rate; - } - else if (rewardInfo.type[i] == (int)GiftType.refresh) - { - int num = GameHelper.GetItemNumber(2) + rewardInfo.reward[i] * rate; - GameHelper.SetItemNumber(2, num); - ui.add_refresh.GetChild("lab_num").text = "x" + rewardInfo.reward[i] * rate; - } - } - } - - private bool isget = false; - private void playCoinAni() - { - if (!hasCoin) - { - GameDispatcher.Instance.Dispatch(GameMsg.rewardMul_close); - CtrlCloseUI(); - return; - } - - if (isget) return; - isget = true; - - - // var rewardData = new RewardData(); - // int curr_type = 101; - Vector2 end_ = GameHelper.GetUICenterPosition(ui.node_end, true); - // var rewardSingleData = new RewardSingleData(curr_type, m_coinReward, RewardOrigin.Play) - // { - // startPosition = GameHelper.GetUICenterPosition(ui.btn_mul, true), - // endPosition = new Vector2(end_.x + 30, end_.y + 30), - // }; - - // rewardData.AddReward(rewardSingleData); - // rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - // rewardData.AddCompleted(success => - // { - // if (success) - // { - // DOVirtual.DelayedCall(0.7f, () => - // { - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - // GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - // GameDispatcher.Instance.Dispatch(GameMsg.rewardMul_close); - // CtrlCloseUI(); - // }); - // } - // }); - // GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(101, (decimal)m_coinReward, RewardOrigin.Play) - { - startPosition = GameHelper.GetUICenterPosition(ui.btn_mul, true), - endPosition = new Vector2(end_.x + 30, end_.y + 30), - - }; - rewardData.AddReward(rewardSingleData); - rewardData.AddCompleted(success => - { - if (success) - { - DOVirtual.DelayedCall(0.7f, () => - { - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - GameDispatcher.Instance.Dispatch(GameMsg.rewardMul_close); - CtrlCloseUI(); - }); - } - }); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUI.cs.meta b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUI.cs.meta deleted file mode 100644 index 5fbbd21..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4490553e4e1f94f1bba8ad923fbb61c0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs deleted file mode 100644 index 05ef8cf..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -namespace BingoBrain - -{ - public class RewardMulNewUICtrl : BaseUICtrl - { - private RewardMulNewUI ui; - private RewardMulNewModel model; - - private uint openUIMsg = UICtrlMsg.RewardMulNewUI_Open; - private uint closeUIMsg = UICtrlMsg.RewardMulNewUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RewardMulNewModel) as RewardMulNewModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new RewardMulNewUI(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/RewardMulNew/RewardMulNewUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs.meta deleted file mode 100644 index 9ada3eb..0000000 --- a/Assets/BingoBrain/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0c90cdcc991c64c09a5c46a37c7ea15d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox.meta b/Assets/BingoBrain/ModuleUI/Rewardbox.meta deleted file mode 100644 index 33be073..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5ad926e7905c6487f83611bb980ec664 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxCtrl.cs b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxCtrl.cs deleted file mode 100644 index 6aa8077..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class RewardboxCtrl : BaseCtrl - { - public static RewardboxCtrl Instance { get; private set; } - - private RewardboxModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.RewardboxModel) as RewardboxModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxCtrl.cs.meta deleted file mode 100644 index ef23779..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 475737b2327d44d4ea721739dc354479 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxModel.cs b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxModel.cs deleted file mode 100644 index ba418d6..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class RewardboxModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxModel.cs.meta b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxModel.cs.meta deleted file mode 100644 index 897a33c..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 94870495d6abb40eaaca680d24852477 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUI.cs b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUI.cs deleted file mode 100644 index c4d5a0d..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUI.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G008_reward_animal; -using DG.Tweening; -using FGUI.Common_animal; - -namespace BingoBrain -{ - public class RewardboxUI : BaseUI - { - private RewardboxUICtrl ctrl; - private RewardboxModel model; - private FGUI.G008_reward_animal.com_rewardbox ui; - - public RewardboxUI(RewardboxUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.RewardboxUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G008_reward_animal"; - uiInfo.assetName = "com_rewardbox"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RewardboxModel) as RewardboxModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G008_reward_animal.com_rewardbox; - } - - protected override void OnOpenBefore(object args) - { -GameHelper.showGameUI = false; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_lookad.GetChild("img_saveingpot") as GImage).visible = true; - if (GameHelper.IsGiftSwitch()) ui.switchgift.selectedIndex = 1; - else ui.switchgift.selectedIndex = 0; - (ui.btn_lookad as btn_tabad).color.selectedIndex = 1; - float[] cash_array = GameHelper.GetRewardValue(2); - ui.btn_lookad.SetClick(() => - { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - GameDispatcher.Instance.Dispatch(GameMsg.Ad_success, cash_array[0]); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardboxUI_Close); - } - }); - - }); - ui.btn_close.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardboxUI_Close); - GameHelper.addInterAdnumber(); - }); - ui.gold_text.text = string.Format(ui.gold_text.text, cash_array[0]); - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUI.cs.meta b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUI.cs.meta deleted file mode 100644 index 87f53ba..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 107c313d002eb42708a62beb702590ed -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUICtrl.cs b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUICtrl.cs deleted file mode 100644 index f10df85..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class RewardboxUICtrl : BaseUICtrl - { - private RewardboxUI ui; - private RewardboxModel model; - - private uint openUIMsg = UICtrlMsg.RewardboxUI_Open; - private uint closeUIMsg = UICtrlMsg.RewardboxUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RewardboxModel) as RewardboxModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new RewardboxUI(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/Rewardbox/RewardboxUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUICtrl.cs.meta deleted file mode 100644 index 86c52d9..0000000 --- a/Assets/BingoBrain/ModuleUI/Rewardbox/RewardboxUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 694209ebe845a485f81ac656bf536fb7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/SaveData.cs b/Assets/BingoBrain/ModuleUI/SaveData.cs index 475d4bb..fe2d118 100644 --- a/Assets/BingoBrain/ModuleUI/SaveData.cs +++ b/Assets/BingoBrain/ModuleUI/SaveData.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using System.IO; +using Castle.Core.Internal; using Newtonsoft.Json; using UnityEngine; namespace BingoBrain @@ -32,9 +33,10 @@ namespace BingoBrain public static void saveDataFunc() { - + if (saveobject == null) return; string save = JsonConvert.SerializeObject(saveobject); - + if (save.IsNullOrEmpty()) return; + if (save == null || save == "") return; if (File.Exists(jsonFilePath)) File.Delete(jsonFilePath); File.WriteAllText(jsonFilePath, save); @@ -161,15 +163,25 @@ namespace BingoBrain public int look_ad_time; public int[] dark_Dayref; public int[] _goldtime; - public MaxPayClass max_pay_object; + // public MaxPayClass max_pay_object; public List saveingpot_history = new List(); - public float saveingpot_cash; - public float last_saveingpot_cash; + public long failed_pack_time; public int three_gift_got_index = 1; public long last_got_three_gift_time = 0; public bool is_get_ThreeDaysGift; + //tixian + public int ExchangeProcessMode = -1; + public int CHProcessMode = -1; + public int chout_lv; + public int ch_people; + public float ch_people_1; + public float ch_people_2; + public int _watch_ad_cd; + public float saveingpot_ch; + public float last_saveingpot_ch; + public int ExchangeModeToggle = 1; } } diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot.meta b/Assets/BingoBrain/ModuleUI/SaveingPot.meta index d82b3ae..deb7d33 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot.meta +++ b/Assets/BingoBrain/ModuleUI/SaveingPot.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c6bd9648d5d6b408bb8f56b85c178bd1 +guid: b1882840e62bbc64eb7c1fdcfb4a9fc9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs index 722824b..c4839cd 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs @@ -1,8 +1,6 @@ -using System.Collections; -using System.Collections.Generic; using BingoBrain.Core; - namespace BingoBrain +namespace BingoBrain { public class SaveingPotCtrl : BaseCtrl { @@ -10,14 +8,18 @@ using BingoBrain.Core; private SaveingPotModel model; + #region 生命周期 protected override void OnInit() { Instance = this; + //model = ModuleManager.Instance..GetModel(ModelConst.SaveingPotModel) as SaveingPotModel; } protected override void OnDispose() { Instance = null; } + + #endregion } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs.meta index b4367e4..8080fca 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotCtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e59681e9218143e58eea10a87070d4a +guid: af216d9654ba02a4c90f79ee76873da4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs index bf8f4ca..d3a2f52 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs @@ -1,8 +1,11 @@ using BingoBrain.Core; + namespace BingoBrain { public class SaveingPotModel : BaseModel { + #region 生命周期 + protected override void OnInit() { } @@ -13,7 +16,8 @@ namespace BingoBrain protected override void OnReset() { - throw new System.NotImplementedException(); } + + #endregion } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs.meta b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs.meta index 6622e3d..f32a457 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs.meta +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotModel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ffa8bfa81fde34182899a4958a8aa4c1 +guid: fcdacba71247f9d4daae11b443420be7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs index b6b0c80..37b402f 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs @@ -1,15 +1,15 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using BingoBrain.Core; -using FairyGUI; -using FGUI.SaveingPot; using System; -using DontConfuse; +using System.Collections.Generic; using System.Linq; -using UnityEngine.PlayerLoop; -using Spine.Unity; +using BingoBrain.Core; +using BingoBrain.HotFix; using DG.Tweening; +using FairyGUI; +using FGUI.ACommon; +using FGUI.Common_01; +using FGUI.tixian; +using Spine.Unity; +using UnityEngine; namespace BingoBrain { @@ -17,12 +17,11 @@ namespace BingoBrain { private SaveingPotUICtrl ctrl; private SaveingPotModel model; - private FGUI.SaveingPot.com_saveingpot ui; + private FGUI.tixian.com_saveingpot ui; private SaveingPotClass makeupTaskData; public int ad_cool_down = 120; private int broadtime = 1; - public SaveingPotUI(SaveingPotUICtrl ctrl) : base(ctrl) { uiName = UIConst.SaveingPotUI; @@ -31,7 +30,7 @@ namespace BingoBrain protected override void SetUIInfo(UIInfo uiInfo) { - uiInfo.packageName = "SaveingPot"; + uiInfo.packageName = "tixian"; uiInfo.assetName = "com_saveingpot"; uiInfo.layerType = UILayerType.Popup; uiInfo.isNeedOpenAnim = false; @@ -42,20 +41,29 @@ namespace BingoBrain #region 生命周期 protected override void OnInit() { - + //model = ModuleManager.Instance.GetModel(ModelConst.SaveingPotModel) as SaveingPotModel; } protected override void OnClose() { + // AdRedeemManager.Instance.Destroy(); Hall.Instance.UpdateSecondEvent -= updateSpeedCD; + Hall.Instance.UpdateSecondEvent -= Update; + Hall.Instance.UpdateSecondEvent -= upTaskWatchAdsBtn; closeCallback?.Invoke(); - WebviewManager.Instance.SetDarkThough(true); - GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot); + // WebviewManager.ShezhiACT(true); + + GameDispatcher.Instance.Dispatch(BingoInfo.RefreshSaveingPot); + + // if (SaveLocalData.GetSaveLocalObject().rankRewardData.Count > 0 && !Hall.Instance.isShowRankView) + // { + // Hall.Instance.isShowRankView = true; + // uiCtrlDispatcher.Dispatch(UICtrlMsg.RankRewardUI_Open); + // } } - private SkeletonAnimation ske_pot; protected override void OnBind() { - ui = baseUI as FGUI.SaveingPot.com_saveingpot; + ui = baseUI as FGUI.tixian.com_saveingpot; } protected override void OnOpenBefore(object args) @@ -64,34 +72,48 @@ namespace BingoBrain {//刘海屏 ui.group_.y += Screen.safeArea.y; } + + // WebviewManager.ShezhiACT(false); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Close); - // ske_pot = FX.Instance.SetFx(ui.ani_potparent, Fx_Type.fx_savepot, closeCallback); - // ske_pot.state.SetAnimation(0, "edie", true); - FX.Instance.SetFx(ui.ani_potparent, Fx_Type.fx_savepot, sk => - { - ske_pot = sk; - // NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); - // OnChangeCardFinish(null); - NAAVsa.PlayAnim(sk, "edie", true); - }, closeCallback); - WebviewManager.Instance.SetDarkThough(false); SaveingPotHelper.TestingClearTime(); makeupTaskData = SaveData.GetSaveobject().saveingpot_history[SaveData.GetSaveobject().saveingpot_history.Count - 1]; + makeupTaskData.H5Time = 99999999; + // SaveData.GetSaveobject().saveingpot_ch = 999; //zhushi + // makeupTaskData.videoCount = 99999999;//zhushi + // makeupTaskData.inlineNum = 0;//zhushi + // ske_pot = FXManager.Instance.SetFx(ui.ani_potparent, Fx_Type.fx_saving, ref closeCallback); + // ske_pot.state.SetAnimation(0, "edie", true); + FX.Instance.SetFx(ui.ani_potparent, Fx_Type.fx_saving, ps => + { + // ps.transform.localPosition = new Vector3(0, 195, 0); + ske_pot = ps; + NAAVsa.PlayAnim(ske_pot, "edie", true); + }, closeCallback); + ui.btn_close.SetClick(() => { CtrlCloseUI(); }); - ui.btn_close1.SetClick(() => - { - CtrlCloseUI(); - }); InitView(); + + if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) + { + ui.btn_watch.GetChild("img_saveingpot").visible = true; + } + ui.btn_watch.SetClick(WatchBtnClick); - ad_cool_down = ConfigSystem.GetConfig().WithdrawalaccelerationCD; + + // AdRedeemManager.Instance.SetWatchAd(AdRedeemManager.SavingPotMakeupAd, ui.btn_task_watch as btn_watchAd, () => { }); + // AdRedeemManager.Instance.Start(); + ui.btn_task_watch.SetClick(taskWatchBtnClick); + ad_cool_down = ConfigSystem.GetConfig().WwalaccelerationCD; Hall.Instance.UpdateSecondEvent += updateSpeedCD; - updateSpeedCD(); + Hall.Instance.UpdateSecondEvent += Update; + Hall.Instance.UpdateSecondEvent += upTaskWatchAdsBtn; + InitBroadCast(); } @@ -112,72 +134,128 @@ namespace BingoBrain #region 消息 protected override void AddListener() { - } protected override void RemoveListener() { - } #endregion + void taskWatchBtnClick() + { + GameHelper.ShowVideoAd("taskWatchAd", (issuccess) => + { + if (issuccess) + { + var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); + SaveData.GetSaveobject()._watch_ad_cd = ad_times + GameHelper.GetCommonModel().exchangeCD; + + btn_watchAd btn_task_watch = ui.btn_task_watch as btn_watchAd; + btn_task_watch.enabled = false; + btn_task_watch.can_buy.selectedIndex = 1; + btn_task_watch.btn_text.text = GameHelper.TimeFormat(SaveData.GetSaveobject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + Hall.Instance.UpdateSecondEvent += upTaskWatchAdsBtn; + + OnTask(); + } + }); + } + + public void upTaskWatchAdsBtn() + { + var lastTimes = SaveData.GetSaveobject()._watch_ad_cd; + btn_watchAd btn_task_watch = ui.btn_task_watch as btn_watchAd; + btn_task_watch.img_saveingpot.visible = false; + if (GameHelper.GetNowTime() < lastTimes) + { + btn_task_watch.enabled = false; + btn_task_watch.can_buy.selectedIndex = 1; + btn_task_watch.btn_text.text = GameHelper.TimeFormat(lastTimes - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + } + else + { + Hall.Instance.UpdateSecondEvent -= upTaskWatchAdsBtn; + btn_task_watch.enabled = true; + btn_task_watch.can_buy.selectedIndex = 0; + if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) btn_task_watch.img_saveingpot.visible = true; + } + } + + private void Update() + { + if (ui.type.selectedIndex == 4) + { + OnTask(); + } + } + private SkeletonAnimation ske_pot; private Action closeCallback; //初始化页面逻辑 private void InitView() { - Debug.Log(PreferencesMgr.Instance.ExchangeAccount); + // Debug.Log(DataMgr.ExchangeAccount); makeup_2 makeupVo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); - ui.text_ad.text = "1. Earn " + makeupVo.ADIncrease + " USD for each ad you watch "; - ui.text_pay.text = "2. Pay USD for " + makeupVo.PayIncrease + " times cashback."; + ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"), makeupVo.ADIncrease); + string str = string.Format(GameHelper.getDesByKey("saving_pot_2"), makeupVo.PayIncrease); + ui.text_pay.text = str; initTop(); - // SaveData.GetSaveobject().saveingpot_cash = 999; //zhushi - ui.text_lose.text = string.Format(ui.text_lose.text, SaveingPotHelper.getCashString(SaveData.GetSaveobject().saveingpot_cash)); + ske_pot.gameObject.SetActive(false); - ske_pot.skeleton.SetColor(new Color(1, 1, 1, 0)); // 设置透明 + string val = $"{SaveData.GetSaveobject().saveingpot_ch:N}"; + ui.text_lose.SetVar("num", val).FlushVars(); + // ui.text_lose.text = string.Format(ui.text_lose.text, SaveingPotHelper.getChString(SaveData.GetSaveobject().saveingpot_ch)); if (makeupTaskData.needShowAni) { - Debug.Log("showani"); ui.type.selectedIndex = 0; - ui.text_cashprogress.text = SaveingPotHelper.getCashNumber(SaveData.GetSaveobject().saveingpot_cash) + "/" + SaveingPotHelper.getCashNumber(makeupTaskData.amount); - ui.progress_cash.value = (SaveData.GetSaveobject().saveingpot_cash / makeupTaskData.amount) * 100; - - ske_pot.skeleton.SetColor(new Color(1, 1, 1, 1)); ; - if (SaveData.GetSaveobject().saveingpot_cash < makeupTaskData.amount) + ui.text_chprogress.text = SaveingPotHelper.getChNumber(SaveData.GetSaveobject().saveingpot_ch) + "/" + SaveingPotHelper.getChNumber(makeupTaskData.amount); + ui.progress_ch.value = (SaveData.GetSaveobject().saveingpot_ch / makeupTaskData.amount) * 100; + ske_pot.gameObject.SetActive(true); + Debug.Log("iiiiiiiiiiiiiiiiiiiii"); + if (SaveData.GetSaveobject().saveingpot_ch < makeupTaskData.amount) { - ui.btn_cash.title = "Go"; - ui.btn_cash.SetClick(() => + ui.btn_ch.title = "Go"; + ui.btn_ch.SetClick(() => { + // if (UIManager.Instance.IsExistUI(UIConst.HallUI)) + // { + // GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 1); + // } + // else + // { + // buygoldParam param = new buygoldParam() + // { + // isShow1 = false, + // is_in_game = true + // }; + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Open, param); + // } CtrlCloseUI(); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Open, false); }); } else { - ui.btn_cash.SetClick(() => + ui.btn_ch.SetClick(() => { makeupTaskData.needShowAni = false; SaveData.saveDataFunc(); InitView(); }); } - if (SaveData.GetSaveobject().saveingpot_cash > SaveData.GetSaveobject().last_saveingpot_cash) + if (SaveData.GetSaveobject().saveingpot_ch > SaveData.GetSaveobject().last_saveingpot_ch) { - DOVirtual.Float(SaveData.GetSaveobject().last_saveingpot_cash, SaveData.GetSaveobject().saveingpot_cash, 1, - value => { ui.text_nowcash.text = SaveingPotHelper.getCashString(value); }); - // ske_pot.state.SetAnimation(0, "getcash", false); - NAAVsa.PlayAnim(ske_pot, "getcash", true); + DOVirtual.Float(SaveData.GetSaveobject().last_saveingpot_ch, SaveData.GetSaveobject().saveingpot_ch, 1, + value => { ui.text_nowch.text = GameHelper.Get102Str((decimal)value); }); + ske_pot.state.SetAnimation(0, "getcash", false); ske_pot.state.Complete += (a) => { - NAAVsa.PlayAnim(ske_pot, "edie", true); - // ske_pot.state.SetAnimation(0, "edie", true); + ske_pot.state.SetAnimation(0, "edie", true); }; - } - else ui.text_nowcash.text = SaveingPotHelper.getCashString(SaveData.GetSaveobject().saveingpot_cash); - SaveData.GetSaveobject().last_saveingpot_cash = SaveData.GetSaveobject().saveingpot_cash; + else ui.text_nowch.text = GameHelper.Get102Str((decimal)SaveData.GetSaveobject().saveingpot_ch); + SaveData.GetSaveobject().last_saveingpot_ch = SaveData.GetSaveobject().saveingpot_ch; SaveData.saveDataFunc(); } else if (makeupTaskData.status == SaveingPotTaskStatus.None) @@ -198,10 +276,24 @@ namespace BingoBrain } else if (makeupTaskData.status == SaveingPotTaskStatus.Inline) { + // makeupTaskData.status = SaveingPotTaskStatus.ticket; + // PreferencesMgr.Instance.SaveMakeupTaskHistory(); + // InitView(); + // return; OnInline(); Debug.Log("inline"); } - + else if (makeupTaskData.status == SaveingPotTaskStatus.ticket) + { + onTicket(); + } + else if (makeupTaskData.status == SaveingPotTaskStatus.code) + { + onCode(); + } + upTaskWatchAdsBtn(); + updateSpeedCD(); + Update(); } void WatchBtnClick() { @@ -226,7 +318,7 @@ namespace BingoBrain } }); - // var adNum = PreferencesMgr.Instance.RealWatchVideo; + // var adNum = DataMgr.RealWatchVideo; // Debug.Log($"adNum========: {adNum}"); } @@ -236,7 +328,7 @@ namespace BingoBrain BroadCast(); if (makeupTaskData.needShowAni) { - ui.text_remaintime.text = GameHelper.TimeFormat((int)makeupTaskData.clear_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + ui.text_remaintime.text = GameHelper.TimeFormat((int)makeupTaskData.clear_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Day); } if (SaveingPotHelper.TestingClearTime()) @@ -269,7 +361,7 @@ namespace BingoBrain CheckActive(makeupTaskData.tableId); - GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); + GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData); RefreshRecordData(); @@ -280,27 +372,44 @@ namespace BingoBrain var data = makeupTaskData; if (data.inlineNum <= 1) { - ui.type.selectedIndex = 6; - ui.text_payhint.text = "You will get the " + makeupTaskData.amountStr + " for 90 days"; - ui.text_query.text = PreferencesMgr.Instance.ExchangeAccount; - ui.btn_confirm.SetClick(() => + if (GameHelper.isRDExchangeMode()) { - CtrlCloseUI(); - }); - return; - + ui.cont_confirm.selectedIndex = 0; + ui.btn_inline_ok.SetClick(() => + { + makeupTaskData.SetStatus(SaveingPotTaskStatus.ticket); + SaveData.saveDataFunc(); + InitView(); + }); + } + else + { + ui.cont_confirm.selectedIndex = 0; + ui.type.selectedIndex = 6; + ui.text_payhint.text = "You will get the " + makeupTaskData.amountStr + " for 90 days"; + ui.text_query.text = PreferencesMgr.Instance.ExchangeAccount; + ui.btn_confirm.SetClick(() => + { + CtrlCloseUI(); + }); + } } + else + { + ui.cont_confirm.selectedIndex = 1; + } + var com_rank = ui.com_newRecord.com_rank; - var com_cord = ui.com_newRecord.com_cord; - - com_cord.email_text.text = PreferencesMgr.Instance.ExchangeAccount; + com_rank.lab_title_des.text = GameHelper.getDesByKey("saving_pot_3"); + com_rank.lab_rank_tips.text = GameHelper.getDesByKey("saving_pot_4"); - var redeemVOModel = ConfigSystem.GetConfig().dataList - .FirstOrDefault(redeem => redeem.id == data.tableId); - if (redeemVOModel == null) return; - if (redeemVOModel.AD_Limit_times <= data.WatchVideoSpeedNum) + var rdVOModel = ConfigSystem.GetConfig().dataList + .FirstOrDefault(rd => rd.id == data.tableId); + if (rdVOModel == null) return; + + if (rdVOModel.AD_Limit_times <= data.WatchVideoSpeedNum) { ui.btn_watch.enabled = false; ui.btn_watch.visible = false; @@ -312,13 +421,13 @@ namespace BingoBrain ui.btn_watch.enabled = true; ui.btn_watch.visible = true; com_rank.content1.selectedIndex = 0; - com_rank.text_rank1.SetVar("rank", redeemVOModel.AD_Down.ToString()).FlushVars(); + com_rank.text_rank1.SetVar("rank", rdVOModel.AD_Down.ToString()).FlushVars(); } - if (redeemVOModel.Login_Limit_times <= data.loginSpeedNum) + if (rdVOModel.Login_Limit_times <= data.loginSpeedNum) { com_rank.content2.selectedIndex = 1; - com_rank.text_rank2.SetVar("rank", redeemVOModel.Login_Limit_times.ToString()).FlushVars(); + com_rank.text_rank2.SetVar("rank", rdVOModel.Login_Limit_times.ToString()).FlushVars(); } else { @@ -327,17 +436,17 @@ namespace BingoBrain com_rank.text_rank2.SetVar("rank", loginRans).FlushVars(); } - if (redeemVOModel.Active_Limit_times <= data.activeSpeedNum) + if (rdVOModel.Active_Limit_times <= data.activeSpeedNum) { com_rank.content3.selectedIndex = 1; - com_rank.text_rank3.SetVar("rank", redeemVOModel.Active_Limit_times.ToString()).FlushVars(); + com_rank.text_rank3.SetVar("rank", rdVOModel.Active_Limit_times.ToString()).FlushVars(); } else { com_rank.content3.selectedIndex = 0; - com_rank.text_rank3.SetVar("time", redeemVOModel.Active_time.ToString()).FlushVars(); - com_rank.text_rank3.SetVar("rank", redeemVOModel.Active_time_Down.ToString()).FlushVars(); + com_rank.text_rank3.SetVar("time", rdVOModel.Active_time.ToString()).FlushVars(); + com_rank.text_rank3.SetVar("rank", rdVOModel.Active_time_Down.ToString()).FlushVars(); if (GameHelper.activeTimes_saveingpot.TryGetValue(data.tableId, out int openTimes)) { @@ -348,21 +457,21 @@ namespace BingoBrain int min_num = ((int)Time.time - data.activeMinute) / 60; //是配置的活跃时间的多少倍 - int active_times = min_num / redeemVOModel.Active_time; + int active_times = min_num / rdVOModel.Active_time; //Debug.Log($"min_num=== {min_num} {active_times} "); if (active_times > 0) { data.activeMinute = (int)Time.time; // 可以加速多少排名 - int rank_num = active_times * redeemVOModel.Active_time_Down; + int rank_num = active_times * rdVOModel.Active_time_Down; var last = data.activeSpeedNum; data.activeSpeedNum += rank_num; - //Debug.Log($"rank_num=== {rank_num} {last} {data.activeSpeedNum} {redeemVOModel.Active_Limit_times}"); - if (data.activeSpeedNum > redeemVOModel.Active_Limit_times) + //Debug.Log($"rank_num=== {rank_num} {last} {data.activeSpeedNum} {rdVOModel.Active_Limit_times}"); + if (data.activeSpeedNum > rdVOModel.Active_Limit_times) { - rank_num = redeemVOModel.Active_Limit_times - last; - data.activeSpeedNum = redeemVOModel.Active_Limit_times; + rank_num = rdVOModel.Active_Limit_times - last; + data.activeSpeedNum = rdVOModel.Active_Limit_times; } data.inlineNum -= rank_num; @@ -381,16 +490,139 @@ namespace BingoBrain } } - com_cord.text_amt.text = $"+{data.amountStr}"; - if (data.order_time != 0) - { - com_cord.time_text.text = DateTimeBoardk.Instance.TimestampToString(data.order_time); - } - com_rank.text_ranks.text = data.inlineNum.ToString(); - com_cord.number_text.text = data.inlineNum + "/" + data.inlineInitNum; } + + void onTicket() + { + var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + ui.type.selectedIndex = 7; + + if (makeupTaskData.rdData != null && makeupTaskData.rdData.Count > 0) + { + makeupTaskData.rdData.Sort((a, b) => + { + if (a.isClaimed == b.isClaimed) + { + return b.coupon_mount.CompareTo(a.coupon_mount); + } + else + { + return a.isClaimed ? 1 : -1; + } + }); + } + else + { + makeupTaskData.rdData = new List(); + int[] arr = ConfigSystem.GetConfig().PotExchange; + Array.Sort(arr, (a, b) => b.CompareTo(a)); + int remainValue = vo.item_need; + List tickets = new List(); + for (int i = 0; i < arr.Length; i++) + { + tickets.Add(remainValue / arr[i]); + remainValue = remainValue % arr[i]; + for (int j = 0; j < tickets[i]; j++) + { + SaveingPotRdData data = new SaveingPotRdData(); + data.code = GameHelper.GenerateUniqueKey(); + data.coupon_mount = arr[i]; + data.isClaimed = false; + makeupTaskData.rdData.Add(data); + } + } + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + } + + int value = 0; + for (int i = 0; i < makeupTaskData.rdData.Count; i++) + { + if (makeupTaskData.rdData[i].isClaimed) + { + value += makeupTaskData.rdData[i].coupon_mount; + } + } + + ui.lab_mn.text = GameHelper.Get101Str(vo.item_need - value); + + ui.list_kicket.itemRenderer = refreshItem; + ui.list_kicket.numItems = makeupTaskData.rdData.Count; + } + + private void refreshItem(int index, GObject obj) + { + com_ticket_item item = (com_ticket_item)obj; + item.lab_num.text = GameHelper.getPrice(makeupTaskData.rdData[index].coupon_mount); + + if (makeupTaskData.rdData[index].isClaimed) + { + item.btn_claim.state.selectedIndex = 1; + item.btn_claim.title = "Claimed"; + } + else + { + item.btn_claim.state.selectedIndex = 0; + item.btn_claim.title = "Claim"; + } + + item.btn_claim.SetClick(() => + { + makeupTaskData.SetStatus(SaveingPotTaskStatus.code); + makeupTaskData.rdData[index].isClaimed = true; + makeupTaskData.lastRdData = makeupTaskData.rdData[index]; + onCode(); + // DataMgr.ImmediateSendSave(); + PreferencesMgr.Instance.SaveMakeupTaskHistory(); + GameDispatcher.Instance.Dispatch(BingoInfo.RefreshSaveingPot); + SaveData.saveDataFunc(); + }); + } + + void onCode() + { + if (makeupTaskData.lastRdData == null) + { + ui.type.selectedIndex = 7; + makeupTaskData.SetStatus(SaveingPotTaskStatus.ticket); + return; + } + ui.type.selectedIndex = 8; + + int value = 0; + for (int i = 0; i < makeupTaskData.rdData.Count; i++) + { + if (makeupTaskData.rdData[i].isClaimed) + { + value += makeupTaskData.rdData[i].coupon_mount; + } + } + + var vo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); + ui.lab_mn2.text = GameHelper.Get101Str(vo.item_need - value); + ui.lab_ticket.text = GameHelper.GetPriceInt(makeupTaskData.lastRdData.coupon_mount); + ui.lab_code.text = makeupTaskData.lastRdData.code; + + ui.btn_back.SetClick(() => + { + ui.type.selectedIndex = 7; + makeupTaskData.SetStatus(SaveingPotTaskStatus.ticket); + InitView(); + }); + + ui.btn_copy.SetClick(() => + { + GameHelper.CopyText(ui.lab_code.text); + }); + + ui.btn_contact_us.SetClick(() => + { + GameHelper.OpenEmail(); + }); + + } + private void CheckActive(int index) { if (GameHelper.activeTimes_saveingpot.TryGetValue(index, out int value)) @@ -414,11 +646,11 @@ namespace BingoBrain { return; } - var CardRedeemVOModel = ConfigSystem.GetConfig().dataList - .FirstOrDefault(redeem => redeem.id == data.tableId); - if (CardRedeemVOModel == null) return; + var CardRdVOModel = ConfigSystem.GetConfig().dataList + .FirstOrDefault(rd => rd.id == data.tableId); + if (CardRdVOModel == null) return; - bool isShow = CardRedeemVOModel.AD_Limit_times > data.WatchVideoSpeedNum && data.inlineNum > GameHelper.GetCommonModel().inlineMin; + bool isShow = CardRdVOModel.AD_Limit_times > data.WatchVideoSpeedNum && data.inlineNum > GameHelper.GetCommonModel().inlineMin; ui.btn_watch.enabled = isShow; @@ -433,28 +665,25 @@ namespace BingoBrain return; } - // ui.text_condi1.SetVar("cash", GameHelper.Get102Str(vo.item_need)).FlushVars(); + // ui.text_condi1.text = GameHelper.Get101Str(vo.item_need); // ui.pb_condi1.max = vo.item_need; - // var curValue = Math.Min(PreferencesMgr.Instance.Currency102, vo.item_need); + // var curValue = Math.Min(SaveData.GetSaveobject().saveingpot_ch, vo.item_need); // ui.pb_condi1.value = (double)curValue; - // ui.pay_text1.text = - // String.Format("Pague [color=#18a218][size=44]R${0}[/size][/color] para pular anúncios", - // (ConfigSystem.GetConfig().purchase1 + ",00")); - // var textTitle = ui.pb_condi1.GetChild("title"); + // var textTitle = ui.pb_condi1.GetChild("title"); // if (textTitle != null) // { - // textTitle.text = "$" + GameHelper.Get102Str(curValue) + "/" + "$" + GameHelper.Get102Str(vo.item_need); + // textTitle.text = GameHelper.Get102Str((decimal)curValue) + "/" + GameHelper.Get102Str(vo.item_need); // } var taskTime = (int)((float)vo.task_need / 60 * 100) * 0.01F; - var completeTaskTime = (int)((float)makeupTaskData.H5Time / 60 * 100) * 0.01F; - var completeTaskValue = Math.Min(completeTaskTime, taskTime); - ui.text_condi2.text = taskTime.ToString(); - ui.pb_condi2.max = taskTime; - ui.pb_condi2.value = completeTaskValue; - ui.pb_condi2.title.text = $"{completeTaskValue}/{taskTime}"; - // if (PreferencesMgr.Instance.MakeupTaskH5Time < vo.task_need && AppConst.isPt()) + // var completeTaskTime = (int)((float)makeupTaskData.H5Time / 60 * 100) * 0.01F; + // var completeTaskValue = Math.Min(completeTaskTime, taskTime); + // ui.text_condi2.text = taskTime.ToString(); + // ui.pb_condi2.max = taskTime; + // ui.pb_condi2.value = completeTaskValue; + // ui.pb_condi2.title.text = $"{completeTaskValue}/{taskTime}"; + // if (DataMgr.MakeupTaskH5Time < vo.task_need && AppConst.isPt()) // { // ui.show_pay.selectedIndex = com_confirm.Show_pay_true; // } @@ -462,10 +691,11 @@ namespace BingoBrain //ui.text_wallet.SetVar("Payer", "$").FlushVars(); // if (AppConst.isPt()) ui.text_wallet.text = "Pix"; - ui.text_cash.text = makeupTaskData.GetAmountStr(); + ui.text_ch.text = GameHelper.Get102Str((decimal)makeupTaskData.amount); + if (!GameHelper.isRDExchangeMode()) ui.card_.visible = false; ui.text_account.text = PreferencesMgr.Instance.ExchangeAccount; - if (completeTaskTime >= taskTime) + if (SaveData.GetSaveobject().saveingpot_ch >= vo.item_need) { ui.cont_confirm.selectedIndex = 0; ui.btn_confirm.SetClick(() => @@ -473,7 +703,7 @@ namespace BingoBrain Audio.Instance.PlayDynamicEffect("makupdone"); makeupTaskData.SetStatus(SaveingPotTaskStatus.Task); - // PreferencesMgr.Instance.SaveMakeupTaskHistory(); + SaveData.saveDataFunc(); OnTask(); }); } @@ -483,11 +713,10 @@ namespace BingoBrain ui.btn_confirm.SetClick(() => { Audio.Instance.PlayDynamicEffect("makupdone"); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); - //GameDispatcher.Instance.Dispatch(GameMsg.MainTab, 1); + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open); + //GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 1); CtrlCloseUI(); - WebviewManager.Instance.SetDarkThough(true); }); } } @@ -498,77 +727,93 @@ namespace BingoBrain { return; } - // makeupTaskData.videoCount = 10;//zhushi ui.type.selectedIndex = 4; + ui.com_task.text_task.text = "get gift card"; + ui.com_task.text_payer.text = "{amt=$0.5} directly to your gift card"; ui.com_task.text_orderid.text = makeupTaskData.orderID; ui.com_task.text_task_title.SetVar("ad", vo.ad_need.ToString()).FlushVars(); ui.com_task.text_ads.text = $"{makeupTaskData.videoCount}/{vo.ad_need}"; - //if (AppConst.isPt() && makeupTaskData.videoCount < vo.ad_need) ui.com_task.lang.selectedIndex = com_task.Lang_pt; - //else ui.com_task.lang.selectedIndex = com_task.Lang_en; - // ui.com_task.pay_text1.text = String.Format("Pague [color=#18a218][size=44]R${0}[/size][/color] para pular anúncios", - // (ConfigSystem.GetConfig().purchase2 + ",00")); ui.com_task.text_payer.SetVar("amt", makeupTaskData.GetAmountStr()).FlushVars(); + if (makeupTaskData.videoCount >= vo.ad_need) { ui.com_task.cont_process.selectedIndex = 1; + ui.cont_confirm.selectedIndex = 0; + } - else ui.com_task.cont_process.selectedIndex = 0; - ui.btn_confirm.SetClick(() => + else { - if (makeupTaskData.videoCount >= vo.ad_need) - { - GameHelper.ShowLoading(1, 2, () => - { - TuSystem.Consume(vo.item, vo.item_need, isSuccess => - { - makeupTaskData.SetStatus(SaveingPotTaskStatus.Inline); - makeupTaskData.inlineInitNum = - UnityEngine.Random.Range(ConfigSystem.GetConfig().inlineInitNum[0], - ConfigSystem.GetConfig().inlineInitNum[1]); - makeupTaskData.inlineNum = UnityEngine.Random.Range( - ConfigSystem.GetConfig().inlineInitNum[0], - makeupTaskData.inlineInitNum); - makeupTaskData.order_time = GameHelper.GetNowTime(); - // PreferencesMgr.Instance.SaveMakeupTaskHistory(); - //OnInline(); - SaveData.GetSaveobject().saveingpot_cash -= vo.item_need; - SaveingPotHelper.CreatSaveingPotItem(); - // Debug.Log(JsonConvert.SerializeObject(vo)); - if (vo.id == 1) - { - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_cash1, 1); - } - else if (vo.id == 2) - { - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_cash2, 1); - } - else if (vo.id == 3) - { - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_cash3, 1); - } - if (vo.id != 3) - { - // cash_index++; - } - InitView(); + ui.com_task.cont_process.selectedIndex = 0; + ui.cont_confirm.selectedIndex = 1; + } - if (vo.id == 3) - { - // PlayerPrefs.SetInt("cash_lv", 2); - makeupTaskData = SaveData.GetSaveobject().saveingpot_history.Last(); - } + if (makeupTaskData.videoCount >= vo.ad_need) + { + ui.btn_confirm.state.selectedIndex = 0; + ui.btn_confirm.visible = true; + ui.btn_confirm.SetClick(() => + { + if (makeupTaskData.videoCount >= vo.ad_need) + { + GameHelper.ShowLoading(1, 2, () => + { + TuSystem.Consume(vo.item, vo.item_need, isSuccess => + { + makeupTaskData.SetStatus(SaveingPotTaskStatus.Inline); + makeupTaskData.inlineInitNum = + UnityEngine.Random.Range(ConfigSystem.GetConfig().inlineInitNum[0], + ConfigSystem.GetConfig().inlineInitNum[1]); + makeupTaskData.inlineNum = UnityEngine.Random.Range( + ConfigSystem.GetConfig().inlineInitNum[0], + makeupTaskData.inlineInitNum); + makeupTaskData.order_time = GameHelper.GetNowTime(); + // PreferencesMgr.Instance.SaveMakeupTaskHistory(); + //OnInline(); + SaveData.GetSaveobject().saveingpot_ch -= vo.item_need; + SaveingPotHelper.CreatSaveingPotItem(); + // Debug.Log(JsonConvert.SerializeObject(vo)); + // if (vo.id == 1) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.withdraw_cash1); + // } + // else if (vo.id == 2) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.withdraw_cash2); + // } + // else if (vo.id == 3) + // { + // TrackKit.SendEvent(Property.withdraw_Event, Property.withdraw_cash3); + // } + if (vo.id != 3) + { + // ch_index++; + } + InitView(); - }); - }); + if (vo.id == 3) + { + // PlayerPrefs.SetInt("ch_lv", 2); + makeupTaskData = SaveData.GetSaveobject().saveingpot_history.Last(); + } + + }); + }); + + } + else + { + CtrlCloseUI(); + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open); + // MainTabUI.getIns().OnGameTab(1); + } + }); + } + else + { + ui.btn_confirm.state.selectedIndex = 1; + ui.btn_confirm.visible = false; + } - } - else - { - CtrlCloseUI(); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); - // MainTabUI.getIns().OnGameTab(1); - } - }); } private void OnEnter() { @@ -600,7 +845,7 @@ namespace BingoBrain return; } - var lname = ui.com_lname.enter_fname_1.text.Replace(" ", ""); + var lname = ui.com_lname.enter_lname.text.Replace(" ", ""); if (!GameHelper.CheckNameValidly(lname)) { GameHelper.ShowTips("Please enter the correct account information4", true); @@ -636,29 +881,28 @@ namespace BingoBrain OnEnter(); }); - GameHelper.SetSelfAvatar(ui.com_pay.load_avatar); + + var avatarId = PreferencesMgr.Instance.PlayerAvatarId; + // EyesHarmony.SetAvatarToLoader(avatarId, ui.com_pay.head.GetChild("load_avatar") as GLoader); ui.btn_confirm.SetClick(() => - { - var info = new - { - email = PreferencesMgr.Instance.ExchangeAccount, - first_name = PreferencesMgr.Instance.short_name, - last_name = PreferencesMgr.Instance.long_name - }; - NetworkKit.PostWithHeader("shop/payOutUserInfo", info, (isSuccess, obj) => - { - if (isSuccess) - { - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.withdraw_behavior, BuriedPointEvent.withdraw_message, 1); - InitView(); - }); + { + // NetApi.PayOutUserInfo(DataMgr.ExchangeAccount.Value, + // DataMgr.short_name, DataMgr.long_name, (isSuccess, obj) => + // { + // if (isSuccess) + // { + // } + // }); + + // TrackKit.SendEvent(Property.withdraw_Event, Property.WithdrawMessage); + + InitView(); + }); } public int now_selectindex; void initTop() { - // Debug.Log(JsonConvert.SerializeObject(PreferencesMgr.Instance.MakeupTaskHistory)); + // Debug.Log(JsonConvert.SerializeObject(DataMgr.MakeupTaskHistory.Value)); List btn_list = new List() { ui.btn_level0, ui.btn_level1, ui.btn_level2 }; @@ -668,14 +912,14 @@ namespace BingoBrain for (int i = 0; i < btn_list.Count; i++) { - btn_list[i].text_cash.text = "$" + makeup_list[i].item_need; + btn_list[i].text_ch.text = "$" + (int)makeup_list[i].item_need; Debug.Log(makeup_list[i].item_need); btn_list[i].index.selectedIndex = i; if (i >= saveingpot_history.Count) { btn_list[i].btn_state.selectedIndex = 2; - btn_list[i].text_type.grayed = true; - btn_list[i].text_cash.grayed = true; + // btn_list[i].text_type.grayed = true; + btn_list[i].text_ch.grayed = true; } else if (saveingpot_history.Count > i + 1 || ((saveingpot_history.Count == 3) && (saveingpot_history[2].status == SaveingPotTaskStatus.Inline))) { @@ -727,7 +971,7 @@ namespace BingoBrain } private List config_name_list = exBrPoolModel_2.config_name_list; - private List config_money_list = exBrPoolModel.config_money_list; + private List config_money_list = exBrPoolModel_2.config_money_list; private List broad_list = new List(); private void BroadCast() { @@ -741,7 +985,14 @@ namespace BingoBrain broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] }); for (int i = 0; i < 4; i++) { - text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; + if (GameHelper.isRDExchangeMode()) + { + text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]" + broad_list[i][1] + "[/color]"; + } + else + { + text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; + } } }); @@ -752,22 +1003,25 @@ namespace BingoBrain private List text_list = new List(); private void InitBroadCast() { - text_list.Add(ui.broad.text_0); - text_list.Add(ui.broad.text_1); - text_list.Add(ui.broad.text_2); - text_list.Add(ui.broad.text_3); + text_list.Add(ui.broad.rich_text0); + text_list.Add(ui.broad.rich_text1); + text_list.Add(ui.broad.rich_text2); + text_list.Add(ui.broad.rich_text3); for (int i = 0; i < 4; i++) { int name_index = UnityEngine.Random.Range(0, config_name_list.Count); int money_index = UnityEngine.Random.Range(0, config_money_list.Count); broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] }); - text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; - + if (GameHelper.isRDExchangeMode()) + { + text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]" + broad_list[i][1] + "[/color]"; + } + else + { + text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]"; + } } - - - } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs.meta b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs.meta index 38c4ffe..d3309c0 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs.meta +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f92e47328a7945b6a75b1bead2ad203 +guid: a000fe1a5aa69e34ebe07fbf928351cc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs index 41c35d7..c502288 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs @@ -1,17 +1,15 @@ -using System.Collections; -using System.Collections.Generic; - using BingoBrain.Core; -namespace BingoBrain +using BingoBrain.HotFix; +namespace BingoBrain { public class SaveingPotUICtrl : BaseUICtrl { private SaveingPotUI ui; private SaveingPotModel model; - private uint openUIMsg = UICtrlMsg.SaveingPotUI_Open; - private uint closeUIMsg = UICtrlMsg.SaveingPotUI_Close; + private uint openUIMsg = SkinInfo.SaveingPotUI_Open; + private uint closeUIMsg = SkinInfo.SaveingPotUI_Close; #region 生命周期 protected override void OnInit() diff --git a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs.meta index aeb539f..aaaa18e 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs.meta +++ b/Assets/BingoBrain/ModuleUI/SaveingPot/SaveingPotUICtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd17eb44157da4774b1a9293490c2550 +guid: e04976b3040d0864aa2161e9d15b45f1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/SaveingPotClass.cs b/Assets/BingoBrain/ModuleUI/SaveingPotClass.cs index 3e5a3c4..6fc6005 100644 --- a/Assets/BingoBrain/ModuleUI/SaveingPotClass.cs +++ b/Assets/BingoBrain/ModuleUI/SaveingPotClass.cs @@ -66,12 +66,16 @@ public class SaveingPotClass } public float cash_number = 0; + public List rdData; + public SaveingPotRdData lastRdData; } public enum SaveingPotTaskStatus { None, Task, Inline, + ticket, + code, } // var makeupTaskData = new MakeupTaskData(); // makeupTaskData.tableId = makeupVo.id; @@ -83,6 +87,12 @@ public enum SaveingPotTaskStatus // PreferencesMgr.Instance.MakeupTaskHistory.Add(makeupTaskData); // Debug.Log("uuuuuuuuuuuuuuuuuuuu"); // makeupTaskData.SetStatus(MakeupTaskStatus.None); +public class SaveingPotRdData +{ + public int coupon_mount; + public string code; + public bool isClaimed; +} public class SaveingPotHelper { @@ -128,10 +138,10 @@ public class SaveingPotHelper Debug.Log("qinglisaveingpot"); int index = SaveData.GetSaveobject().saveingpot_history.Count - 1; makeup_2 config = ConfigSystem.GetConfig().dataList[index]; - SaveData.GetSaveobject().saveingpot_cash = 0; + SaveData.GetSaveobject().saveingpot_ch = 0; SaveData.GetSaveobject().saveingpot_history[SaveData.GetSaveobject().saveingpot_history.Count - 1].clear_time = GameHelper.GetNowTime() + config.Reset_time * 3600; SaveData.GetSaveobject().saveingpot_history[SaveData.GetSaveobject().saveingpot_history.Count - 1].auto_show = false; - + return true; } @@ -156,11 +166,11 @@ public class SaveingPotHelper - public static string getCashString(float cash) + public static string getChString(float cash) { return $"${cash:N}"; } - public static string getCashNumber(float cash) + public static string getChNumber(float cash) { return $"{cash:N}"; } diff --git a/Assets/BingoBrain/ModuleUI/Setting.meta b/Assets/BingoBrain/ModuleUI/Setting.meta deleted file mode 100644 index 76367fb..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7de5dd013a910475e9692a582058885d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Setting/SettingCtrl.cs b/Assets/BingoBrain/ModuleUI/Setting/SettingCtrl.cs deleted file mode 100644 index a6f19fb..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingCtrl.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class SettingCtrl : BaseCtrl - { - public static SettingCtrl Instance { get; private set; } - - private SettingModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.SettingModel) as SettingModel; - } - - protected override void OnDispose() - { - Instance = null; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Setting/SettingCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Setting/SettingCtrl.cs.meta deleted file mode 100644 index 80db7cd..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 940f6f98be14d40cca280cf00a245d75 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Setting/SettingModel.cs b/Assets/BingoBrain/ModuleUI/Setting/SettingModel.cs deleted file mode 100644 index 5819f0b..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingModel.cs +++ /dev/null @@ -1,34 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class SettingModel : BaseModel - { - #region 生命周期 - public bool IsOpenMusic - { - get => Audio.Instance.IsOpenBGM; - set => Audio.Instance.IsOpenBGM = value; - } - - public bool IsOpenEffect - { - get => Audio.Instance.IsOpenEffect; - set => Audio.Instance.IsOpenEffect = value; - } - - 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/Setting/SettingModel.cs.meta b/Assets/BingoBrain/ModuleUI/Setting/SettingModel.cs.meta deleted file mode 100644 index 2edc866..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8c0892ddea99447d78101be9bb65543c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Setting/SettingUI.cs b/Assets/BingoBrain/ModuleUI/Setting/SettingUI.cs deleted file mode 100644 index 6c0c37e..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingUI.cs +++ /dev/null @@ -1,291 +0,0 @@ -using System; -using BingoBrain.Core; -using BingoBrain.HotFix; -using FairyGUI; -using FGUI.ACommon; -using UnityEngine; -using FGUI.JSettings; -using BingoBrain.Core; -using BingoBrain.HotFix; -using UnityEngine.Device; -namespace BingoBrain -{ - public class SettingUI : BaseUI - { - private SettingUICtrl ctrl; - private SettingModel model; - private FGUI.G006_menu_animal.com_setting_ani ui; - - public SettingUI(SettingUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.SettingUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G006_menu_animal"; - uiInfo.assetName = "com_setting_ani"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - model = ModuleBoardk.Instance.GetModel(ModelConst.SettingModel) as SettingModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - - } - - protected override void OnBind() - { - - ui = baseUI as FGUI.G006_menu_animal.com_setting_ani; - } - - protected override void OnOpenBefore(object args) - { - GameHelper.showGameUI = false; - InitView(); - } - - protected override void OnOpen(object args) - { - - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - - #endregion - - #region 消息 - - protected override void AddListener() - { - - - } - - protected override void RemoveListener() - { - - - } - - #endregion - - private void InitView() - { - if (GameHelper.IsGiftSwitch()) - { - ui.switchgift.selectedIndex = 1; - } - else - { - ui.switchgift.selectedIndex = 0; - } - - ui.btn_close.SetClick(OnCloseView); - - // var menuRedeem = (btn_tap)ui.list_tab.GetChild("menu_redeem"); - // menuRedeem.cont_button.selectedIndex = btn_tap.Button_record; - // menuRedeem.visible = GameHelper.IsGiftSwitch(); - // menuRedeem.SetClick(OnClickRedeem); - // - // var menuLang = (btn_tap)ui.list_tab.GetChild("menu_lang"); - // - // menuLang.cont_button.selectedIndex = btn_tap.Button_lang; - // menuLang.SetClick(OnClickLanguage); - // - // var menuPrivacy = (btn_tap)ui.list_tab.GetChild("menu_privacy"); - // menuPrivacy.cont_button.selectedIndex = btn_tap.Button_privacy; - // menuPrivacy.SetClick(OnClickPrivacy); - // - // var menuUser = (btn_tap)ui.list_tab.GetChild("menu_user"); - // menuUser.cont_button.selectedIndex = btn_tap.Button_user; - // menuUser.SetClick(OnClickTerms); - // - // var menuContact = (btn_tap)ui.list_tab.GetChild("menu_contact"); - // menuContact.cont_button.selectedIndex = btn_tap.Button_contact; - // menuContact.SetClick(OnClickContact); - - - SetName(); - - - SetUID(); - - - SetAvatar(); - - - SetVersion(); - - - - - ui.btn_edit.SetClick(OnClickAvatar); - - ui.text_name.SetClick(OnClickProfile); - - ui.btn_music.SetClick(OnClickSetMusic); - - ui.btn_sound.SetClick(OnClickSoundBtn); - - RefreshMusicUI(); - - - ui.btn_pri.btn_state.selectedIndex =1; - ui.btn_terms.btn_state.selectedIndex =2; - ui.btn_contact.btn_state.selectedIndex = 3; - ui.btn_record.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Close); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.MakeupRecordUI_Open); - }); - ui.btn_pri.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(SkinInfo.JTermUI_Open); }); - ui.btn_terms.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(SkinInfo.JTermUI_Open, true); }); - ui.btn_contact.SetClick(() => { OnClickContact(); }); - } - - - public override void OnSwitchLanguage() - { - base.OnSwitchLanguage(); - - SetVersion(); - - SetUID(); - - SetName(); - } - - - - - private void SetName() - { - GameHelper.SetName(ui.text_name); - } - - - - - private void SetAvatar() - { - - } - - - - - private void SetUID() - { - ui.text_uid.text = $"UID:{GameHelper.GetLoginModel().uid}"; - } - - - - - private void SetVersion() - { - ui.text_version.text = $"Version:{UnityEngine.Application.version}"; - } - - - - - - private void CloseMenu(Action action = null) - { - CtrlCloseUI(); - action?.Invoke(); - } - - - - - - - - - - - - - - private void OnCloseView() - { - CloseMenu(); - } - - private void OnClickRedeem() - { - CloseMenu(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MakeupRecordUI_Open); }); - } - - private void OnClickLanguage() - { - CloseMenu(); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LanguageWinUI_Open); - } - - private void OnClickAvatar() - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ProfileUI_Open); - } - - private void OnClickProfile() - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ProfileUI_Open); - } - - private void OnClickPrivacy() - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open); - } - - private void OnClickTerms() - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, true); - } - - private void OnClickContact() - { - GameHelper.OpenEmail(); - } - - private void OnClickSetMusic() - { - model.IsOpenMusic = !model.IsOpenMusic; - RefreshMusicUI(); - } - - private void OnClickSoundBtn() - { - model.IsOpenEffect = !model.IsOpenEffect; - RefreshMusicUI(); - } - - private void RefreshMusicUI() - { - ui.btn_music.cont_button.selectedIndex = - model.IsOpenMusic ? 1 : 0; - ui.btn_sound.cont_button.selectedIndex = - model.IsOpenEffect ? 1 : 0; - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Setting/SettingUI.cs.meta b/Assets/BingoBrain/ModuleUI/Setting/SettingUI.cs.meta deleted file mode 100644 index e15b95a..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 96cce0d347bcb4e76b91fb3bb94eeb32 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Setting/SettingUICtrl.cs b/Assets/BingoBrain/ModuleUI/Setting/SettingUICtrl.cs deleted file mode 100644 index 597af52..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingUICtrl.cs +++ /dev/null @@ -1,74 +0,0 @@ -using BingoBrain.Core; -using BingoBrain.HotFix; - -namespace BingoBrain -{ - public class SettingUICtrl : BaseUICtrl - { - private SettingUI ui; - private SettingModel model; - - private uint openUIMsg = SkinInfo.SettingUI_Open; - private uint closeUIMsg = SkinInfo.SettingUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.SettingModel) as SettingModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new SettingUI(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/Setting/SettingUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Setting/SettingUICtrl.cs.meta deleted file mode 100644 index 38d2e85..0000000 --- a/Assets/BingoBrain/ModuleUI/Setting/SettingUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 37731d303ab5b4dc3b41d3636cc4d688 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay.meta b/Assets/BingoBrain/ModuleUI/SheepPlay.meta deleted file mode 100644 index 78ee74b..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 233e3a28e378b45b584265876d3c8b9f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayCtrl.cs b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayCtrl.cs deleted file mode 100644 index 0aa83f1..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class SheepPlayCtrl : BaseCtrl - { - public static SheepPlayCtrl Instance { get; private set; } - - private SheepPlayModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.SheepPlayModel) as SheepPlayModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayCtrl.cs.meta deleted file mode 100644 index 3e7a5d9..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dccdf152f07be452bbd8727e8a8aa708 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayModel.cs b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayModel.cs deleted file mode 100644 index 8ae1a19..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class SheepPlayModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayModel.cs.meta b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayModel.cs.meta deleted file mode 100644 index f48eb8d..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: eb3e7a6ac36b945dcb2b6b04634732d7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUI.cs b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUI.cs deleted file mode 100644 index e757e53..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUI.cs +++ /dev/null @@ -1,2019 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G003_play_animal; -using Newtonsoft.Json; -using Unity.VisualScripting; -using Random = UnityEngine.Random; -using DG.Tweening; -using Spine.Unity; - -using System.Linq; -using System.IO; -using AppsFlyerSDK; -using BingoBrain; -using BingoBrain.HotFix; -using FGUI.Common_animal; -using FGUI.ACommon; - -namespace BingoBrain -{ - public class SheepPlayUI : BaseUI - { - private SheepPlayUICtrl ctrl; - private SheepPlayModel model; - private FGUI.G003_play_animal.sheep_play ui; - - public SheepPlayUI(SheepPlayUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.SheepPlayUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G003_play_animal"; - uiInfo.assetName = "sheep_play"; - uiInfo.layerType = UILayerType.Normal; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = false; - } - private Action closeCallback; - private Action clearSpinepool; - private static string jsonFilePath = Path.Combine(Application.persistentDataPath, "card_json.json"); - private int width_max = 7; - private int height_max = 6; - private readonly float card_width = 7.3f; //视觉宽度 - private readonly float card_height = 7.3f; //视觉高度 - - private float real_card_width = 7.3f; - private float real_card_height = 7.3f; - - private float card_width_slot = 6.497f; // 宽度 乘以一个比例，此项目为0.9 - - - public readonly float card_scale = 5.2f; //正常的缩放 - public static float card_slot_scale = 4.628f; // 宽度 乘以一个比例，此项目为0.9 - private int card_type_max = 15; - - private int card_layer = 2; - - private int all_card_numbers = 0; - - private int slot_max = 7; - private int extra_max = 5; - private Card_item last_card_item; - - // private sheep_card refresh_item; - //private List card_item_list = new List(); - // private List[] stacked_list = new List(); - private List left_extra_list = new List(); - private List right_extra_list = new List(); - private List> map_list = new List>(); - private List> card_item_list = new List>(); - private List slot_list = new List(); - private List refresh_list = new List(); - private List out_list = new List(); - private List pool_list = new List(); - private string jsonstr = null; - private float bg_x = -22.8f; - private float bg_y = GameObject.Find("card_bg").transform.position.y + 0.5f; - - private int[] layer_array; - private int[] type_array; - private int[] all_array; - public int ad_numbers = 0; - public int ad_times = 0; - - private bool is_first_login_go_to_h5 = false; - #region 生命周期 - protected override void OnInit() - { - - } - void UpdateEvent() - { - long t = SaveData.GetSaveobject().failed_pack_time; - if (SaveData.GetSaveobject().failed_pack_time > GameHelper.GetNowTime()) - { - ui.btn_failpack.visible = true; - long time_ = t * 1000 - GameHelper.getNowTimeByMillisecond(); - DateTime oldDate = new DateTime(1970, 1, 1); - oldDate = oldDate.AddMilliseconds(time_); - ui.btn_failpack.GetChild("lab_time").text = DateTimeBoardk.Instance.DateTimeToFFFString(oldDate); - } - else - { - ui.btn_failpack.visible = false; - } - - } - protected override void OnClose() - { - Hall.Instance.UpdateSecondEvent -= GameHelper.AddGameTime; - Hall.Instance.UpdateSecondEvent -= timeEvent; - Hall.Instance.UpdateSecondEvent -= GameHelper.SetGameTimes; - Hall.Instance.UpdateEvent -= UpdateEvent; - closeCallback?.Invoke(); - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G003_play_animal.sheep_play; - //model = ModuleManager.Instance.GetModel(ModelConst.SheepPLayUIModel) as SheepPLayUIModel; - - } - - protected override void OnOpenBefore(object args) - { - GameHelper.PostFunnelLogin("enterHall"); - if (args != null) need_show_openui = (bool)args; - layer_array = new int[] { 19, }; - type_array = new int[] { 14, }; - all_array = new int[] { 30, }; - // SetDiffArray(); - Sprite e = Resources.Load("card/card_sprite/1"); - real_card_width = e.bounds.size.x * 5.2f; - real_card_height = e.bounds.size.y * 5.2f; - ad_times = PlayerPrefs.GetInt("ad_time", 0); - ad_numbers = PlayerPrefs.GetInt("ad_number", 1); - - CreateGoldtimeList(); - - - - // PreferencesMgr.Instance.Currency102=99999; - // PreferencesMgr.Instance.WatchVideoSum=99999; - // ui.btn_head.SetClick(() => - // { - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open); - // GameHelper.showGameUI = false; - // }); - - //ui.btn_game_menu.SetClickDownEffect(1.0f); - - - - - ui.btn_setting.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(SkinInfo.SettingUI_Open); - GameHelper.showGameUI = false; - // ui.btn_game_menu.hide.Play(); - }); - - ui.gold.GetChild("btn_buygold").SetClick(() => - { - uiCtrlDispatcher.Dispatch(UICtrlMsg.BuygoldUI_Open); - }); - - - setBtnAds(); - ui.btn_noads.SetClick(() => - { - if (!SaveData.GetSaveobject().is_get_packreward && !SaveData.GetSaveobject().is_get_removead) - { - if (ui.btn_noads.GetChild("img_ad").visible) - { - PackRewardData param = new PackRewardData(); - param.isAutoPop = false; - param.isNeedScroll = true; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param); - } - else - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open); - } - - } - else if (SaveData.GetSaveobject().is_get_packreward) - { - PackRewardData param = new PackRewardData(); - param.isAutoPop = false; - param.isNeedScroll = true; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param); - } - else - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open); - } - GameHelper.showGameUI = false; - }); - Hall.Instance.UpdateSecondEvent += GameHelper.AddGameTime; - Hall.Instance.UpdateSecondEvent += timeEvent; - Hall.Instance.UpdateSecondEvent += GameHelper.SetGameTimes; - Hall.Instance.UpdateEvent += UpdateEvent; - timeEvent(); - LoadData(); - - // is_first_login_go_to_h5 = GameHelper.GetBoolByChance(ConfigSystem.GetConfig().loginhallrate / 100f); - - InitView(); - var loginModel = GameHelper.GetLoginModel(); - if (true && !loginModel.new_player) - { - //var isShow = false; - // Debug.Log($"GotoH5 =====isShow:{ConfigSystem.GetConfig().loginhallrate} {is_first_login_go_to_h5}"); - if (is_first_login_go_to_h5) - { - - } - else - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, need_show_openui); - GameHelper.is_first_login = false; - } - } - else - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, need_show_openui); - GameHelper.is_first_login = false; - - } - if (GameHelper.GetGameday() != DateTime.Now.Day) - { - PlayerPrefs.SetInt("_time", 0); - SaveData.GetSaveobject().time_task_record = new List(); - GameHelper.SetGameday(); - } - ui.btn_menu_.SetClick(() => - { - uiCtrlDispatcher.Dispatch(SkinInfo.MenuUI_Open); - }); - - // var ske1 = FX.Instance.SetFx((ui.btn_look_ad as btn_look_ad).gp, Fx_Type.fx_main_ad, closeCallback); - // ske1.state.SetAnimation(0, "animation", true); - - FX.Instance.SetFx((ui.btn_look_ad as btn_look_ad).gp, Fx_Type.fx_main_ad, sk => - { - SkeletonAnimation cardSpine = sk; - NAAVsa.PlayAnim(cardSpine, "animation", true); - - }, closeCallback); - - } - public void setBtnAds() - { - btn_noads btn_ = (ui.btn_noads as btn_noads); - if (!SaveData.GetSaveobject().is_get_removead && !SaveData.GetSaveobject().is_get_packreward) - { - btn_.t0.Play(-1, 0, null); - } - else if (SaveData.GetSaveobject().is_get_removead && SaveData.GetSaveobject().is_get_packreward) - { - btn_.t0.Stop(); - btn_.visible = false; - } - else if (SaveData.GetSaveobject().is_get_packreward) - { - btn_.t0.Stop(); - btn_.t1.Play(); - //ui.btn_noads.state.selectedIndex = 0; - btn_.img_pack.visible = false; - btn_.img_ad.visible = true; - - } - else if (SaveData.GetSaveobject().is_get_removead) - { - btn_.t0.Stop(); - btn_.t1.Play(); - btn_.img_pack.visible = true; - btn_.img_ad.visible = false; - //ui.btn_noads.state.selectedIndex = 1; - } - - } - private void OnBackToHall(object a = null) - { - - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - - if (card_item_list[i][j] != null) - { - GameObject.Destroy(card_item_list[i][j].sheep_card); - } - - } - } - SaveJson(); - - - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Close); - GameDispatcher.Instance.Dispatch(GameMsg.BackMainScene); - CtrlCloseUI(); - } - - private int clear_nubers = 0; - private bool main_ui_show = true; - - private List Paidcoins_list = ConfigSystem.GetConfig().dataList; - private int btn_look_ad_showtime = 0; - private int time_count = 11; - private com_broadcast_text1 text_ui; - void timeEvent() - { - - int time = SaveData.GetSaveobject()._goldtime[0]; - if (time + Paidcoins_list[0].receive_CD < GameHelper.GetNowTime()) - { - (ui.gold as new_topgold).state.selectedIndex = 2; - // ui.gold.red.visible = true; - } - else (ui.gold as new_topgold).state.selectedIndex = 1; - - ui.btn_task.red.visible = SaveData.getRed(); - if (!GameHelper.IsGiftSwitch()) return; - - // time_count++; - // if (time_count > 11) - // { - // ui.broadcast.visible = false; - // } - // if (time_count > 30) - // { - // time_count = 0; - // var name_index = Random.Range(0, exBrPoolModel.config_name_list.Count); - // var money_index = Random.Range(0, exBrPoolModel.config_money_list.Count); - - // ui.broadcast.visible = true; - - // if (text_ui == null) text_ui = ui.broadcast.GetChild("broad_cast_text") as com_broadcast_text1; - // text_ui.cast_text.text = String.Format(text_ui.show_text.text, exBrPoolModel.config_name_list[name_index], - // exBrPoolModel.config_money_list[money_index], DateTimeBoardk.Instance.GetCurrDateTime()); - // text_ui.t0.Play(() => { ui.broadcast.visible = false; }); - // } - - btn_look_ad_showtime++; - if (btn_look_ad_showtime > 15) ui.btn_look_ad.visible = false; - - if ((!SaveData.GetSaveobject().is_get_packreward || !SaveData.GetSaveobject().is_get_removead) && !SaveData.GetSaveobject().is_autopack_show - && (Time.time > (ConfigSystem.GetConfig().Activetimes * 60))) - { - Window Popup = GRoot.inst.GetChild("Popup") as Window; - if (Popup.GetChildren().Length > 0) return; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open); - SaveData.GetSaveobject().is_autopack_show = true; - SaveData.GetSaveobject().is_autopack_show_day = DateTime.Now.Day; - SaveData.saveDataFunc(); - - } - SetSaveingPotBtn(); - if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BroadcastUI_Open); - // UICtrlDispatcher.Instance.Dispatch(SkinInfo.BroadcastUI_Open); - } - - void CreateGoldtimeList() - { - // 获取保存对象 - var saveObject = SaveData.GetSaveobject(); - - // 检查_goldtime是否为null或者长度与Paidcoins_list.Count不相等 - if (saveObject._goldtime == null || saveObject._goldtime.Length != Paidcoins_list.Count) - { - // 重置_goldtime，并创建一个新的数组，长度为Paidcoins_list.Count - saveObject._goldtime = new int[Paidcoins_list.Count]; - } - } - void setBtntask() - { - ui.btn_task.number_text.text = "Lv." + GameHelper.getBattleLv(); - if (GameHelper.getBattleLv() >= ConfigSystem.GetConfig().dataList.Count) - { - ui.btn_task.progress.value = 100; - } - else - { - ui.btn_task.progress.value = - ((float)GameHelper.GetGameExp() / ConfigSystem.GetConfig().dataList[GameHelper.getBattleLv()].Eliminating_quantity) * 100; - } - - - } - void SetDiffArray(object a = null) - { - // layer_array = ConfigSystem.GetConfig().tiers; - // type_array = ConfigSystem.GetConfig().patterntypes; - // all_array = new int[ConfigSystem.GetConfig().patternnumber.Length]; - // for (int i = 0; i < ConfigSystem.GetConfig().patternnumber.Length; i++) - // { - // all_array[i] = ConfigSystem.GetConfig().patternnumber[i] / 3; - // } - } - - private bool need_show_openui = true; - protected override void OnOpen(object args) - { - - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - GameDispatcher.Instance.AddListener(GameMsg.Sheep_item_refresh, SetItemNumber); - GameDispatcher.Instance.AddListener(GameMsg.Slot_refresh, SetSlotNumber); - GameDispatcher.Instance.AddListener(GameMsg.Remake_state, ReceiveRemakState); - GameDispatcher.Instance.AddListener(GameMsg.Gold_refresh, SetTopCurr); - AppDispatcher.Instance.AddListener(CsjInfoC.App_Focus_False, SaveJson); - GameDispatcher.Instance.AddListener(GameMsg.reset_game, ReSetGame); - GameDispatcher.Instance.AddListener(GameMsg.card_click, CardClick); - GameDispatcher.Instance.AddListener(GameMsg.RefreshGame, RefreshGame); - GameDispatcher.Instance.AddListener(BingoInfo.Update101, SetTopCurr); - GameDispatcher.Instance.AddListener(BingoInfo.Update102, SetTopCurr); - GameDispatcher.Instance.AddListener(GameMsg.Ad_success, ad_success); - PreferencesDispatcher.Instance.AddListener(PreferencesMsg.playerAvatarId, UpdataAvatar); - // MainThreadDispatcher.Instance.AddListener(MainThreadMsg.App_Focus_True, backGame); - GameDispatcher.Instance.AddListener(GameMsg.backHall, OnBackToHall); - GameDispatcher.Instance.AddListener(GameMsg.sendLog, SendLog); - // DataDispatcher.Instance.AddListener(PreferencesMsg.currency102, SetTopCurr); - // DataDispatcher.Instance.AddListener(PreferencesMsg.currency101, SetTopCurr); - GameDispatcher.Instance.AddListener(GameMsg.checkGameState, checkGameState); - GameDispatcher.Instance.AddListener(GameMsg.resurgence, Resurgence); - GameDispatcher.Instance.AddListener(GameMsg.resurgence_close, ChangeSlotState); - GameDispatcher.Instance.AddListener(GameMsg.RefreshSaveingPot, SetSaveingPotBtn); - GameDispatcher.Instance.AddListener(GameMsg.ThreeDaysGiftUIClose, checkThreeGift); - } - protected override void RemoveListener() - { - - GameDispatcher.Instance.RemoveListener(GameMsg.Sheep_item_refresh, SetItemNumber); - GameDispatcher.Instance.RemoveListener(GameMsg.Slot_refresh, SetSlotNumber); - GameDispatcher.Instance.RemoveListener(GameMsg.Remake_state, ReceiveRemakState); - GameDispatcher.Instance.RemoveListener(GameMsg.Gold_refresh, SetTopCurr); - // AppDispatcher.Instance.RemoveListener(CsjInfoC.App_Focus_False, SaveJson); - GameDispatcher.Instance.RemoveListener(GameMsg.reset_game, ReSetGame); - GameDispatcher.Instance.RemoveListener(GameMsg.card_click, CardClick); - GameDispatcher.Instance.RemoveListener(GameMsg.RefreshGame, RefreshGame); - GameDispatcher.Instance.RemoveListener(GameMsg.Update101, SetTopCurr); - GameDispatcher.Instance.RemoveListener(GameMsg.Update102, SetTopCurr); - GameDispatcher.Instance.RemoveListener(GameMsg.Ad_success, ad_success); - PreferencesDispatcher.Instance.RemoveListener(PreferencesMsg.playerAvatarId, UpdataAvatar); - GameDispatcher.Instance.RemoveListener(GameMsg.backHall, OnBackToHall); - GameDispatcher.Instance.RemoveListener(GameMsg.sendLog, SendLog); - GameDispatcher.Instance.RemoveListener(GameMsg.resurgence, Resurgence); - GameDispatcher.Instance.RemoveListener(GameMsg.resurgence_close, ChangeSlotState); - GameDispatcher.Instance.RemoveListener(GameMsg.RefreshSaveingPot, SetSaveingPotBtn); - GameDispatcher.Instance.RemoveListener(GameMsg.ThreeDaysGiftUIClose, checkThreeGift); - } - - #endregion - - public static Dictionary adCallbackInfo = new Dictionary(); - private void checkThreeGift(object obj = null) - { - // if (SaveData.GetSaveobject().is_get_ThreeDaysGift) { - var isToday = GameHelper.InToday(SaveData.GetSaveobject().last_got_three_gift_time, 0, true); - int three_gift_got_index = SaveData.GetSaveobject().three_gift_got_index; - if (three_gift_got_index > (int)rewardState.day3) - { - ui.btn_three_day.visible = false; - } - else if (!isToday) - { - ui.btn_three_day.GetChild("red").visible = true; - } - else - { - ui.btn_three_day.GetChild("red").visible = false; - } - // } - } - //初始化页面逻辑 - private void InitView() - { - -#if UNITY_EDITOR - ui.btn_clear.visible = true; -#endif - - ui.btn_clear.SetClick(() => - { - clear_nubers++; - if (clear_nubers < 5) return; - PlayerPrefs.DeleteAll(); - if (File.Exists(jsonFilePath)) File.Delete(jsonFilePath); - File.WriteAllText(jsonFilePath, null); - card_item_list.Clear(); - SaveData.saveobject = new Saveobject(); - SaveData.saveDataFunc(); - }); - // (ui.btn_h5 as btn_web).state.selectedIndex = 1; - - if (Screen.safeArea.y != 0) - {//刘海屏 - ui.move_group1.y += Screen.safeArea.y; - } - // ui.move_group1.TweenMove(new Vector3(ui.group_.x, 17 + Screen.safeArea.y, 0), 0.3f); - - if (GameHelper.IsGiftSwitch()) - { - // ui.btn_add.gift.selectedIndex = 1; - // ui.btn_money.visible = true; - if (PlayerPrefs.GetInt("FirstReward", 0) == 0) - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FirstRewardUI_Open); - } - ui.btn_h5.visible = true; - } - if (!GameHelper.IsGiftSwitch() && (ConfigSystem.GetConfig().WVswitch == 1)) - { - ui.btn_h5.visible = true; - } - ui.fairyBatching = true; - int level = GameHelper.GetLevel(); - ui.level_text.text = "level " + level; - - if (jsonstr == null) - { - SetLeveldiff();// - InitPosList();// - CreatCard();// - } - else - { - // InitPosList(); - CreatSaveItem(); - } - RefreshCardState(true); - ui.btn_out.state.selectedIndex = 0; - ui.btn_back.state.selectedIndex = 1; - ui.btn_refresh.state.selectedIndex = 2; - ui.btn_back.SetClick(BackFunc); - ui.btn_refresh.SetClick(RefreshFunc); - ui.btn_look_ad.SetClick(LookAd); - ui.btn_h5.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); - }); - - ui.btn_back.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 1); - }); - ui.btn_out.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 0); - }); - ui.btn_refresh.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 2); - }); - ui.btn_buyslot.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open); - GameHelper.showGameUI = false; - }); - ui.btn_task.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NewTaskUI_Open); GameHelper.showGameUI = false; }); - SetItemNumber(null); - SetSlotNumber(); - SetTopCurr(); - - ui.gold.SetClick(() => - { - //uiCtrlDispatcher.Dispatch(UICtrlMsg.MainUI_Open); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Open); - GameHelper.showGameUI = false; - }); - if (SaveData.GetSaveobject().is_autopack_show_day != DateTime.Now.Day) - { - SaveData.GetSaveobject().is_autopack_show = false; - } - ; - setBtntask(); - checkGameState(); - if (!is_first_login_go_to_h5) - { - ChangeSlotState();//检测是否死亡 - } - if (SaveData.GetSaveobject().start_time == 0) SaveData.GetSaveobject().start_time = GameHelper.GetNowTime(); - - if ((SaveData.GetSaveobject().battle_pass_time + ConfigSystem.GetConfig().dataList[0].Passportrewards_CD * 24 * 3600) < GameHelper.GetNowTime()) - { - SaveData.GetSaveobject().battle_pass_time = (int)GameHelper.GetNowTime(); - GameHelper.ResetGameExp(); - SaveData.GetSaveobject().battle_pass_freelist.Clear(); - SaveData.GetSaveobject().battle_pass_paylist.Clear(); - SaveData.GetSaveobject().is_get_battlepass = false; - } - UpdataAvatar(); - if (GameHelper.IsGiftSwitch()) - { - if (PlayerPrefs.GetInt("FirstReward", 0) == 0) - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FirstRewardUI_Open); - } - } - - - if (ConfigSystem.GetConfig().PiggyBankSwitch == 0 || !GameHelper.IsGiftSwitch()) - { - ui.btn_saveingpot.visible = false; - } - ui.btn_saveingpot.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); }); - (ui.btn_saveingpot as btn_saveingpot).text_nowcash.text = SaveingPotHelper.getCashString(SaveData.GetSaveobject().saveingpot_cash); - ui.btn_failpack.SetClick(() => - { - float complte_progress = showResurgence(); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress); - }); - - - FX.Instance.SetFx((ui.btn_saveingpot as btn_saveingpot).ani_parent, Fx_Type.fx_savepot_icon, sk => - { - // cardSpine = sk; - - // NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); - // OnChangeCardFinish(null); - NAAVsa.PlayAnim(sk, "animation", true); - }, closeCallback); - DOVirtual.DelayedCall(1, () => - { - if (ConfigSystem.GetConfig().PiggyBankSwitch == 1 && GameHelper.IsGiftSwitch()) - { - if (GameHelper.GetLoginModel().new_player) - { - uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); - } - else - { - if (DateTime.Now.Day != PlayerPrefs.GetInt("pot_day", 0)) - { - uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); - PlayerPrefs.SetInt("pot_day", DateTime.Now.Day); - } - } - } - }); - - // var ske_pot = FX.Instance.SetFx((ui.btn_saveingpot as btn_saveingpot).ani_parent, Fx_Type.fx_savepot_icon, closeCallback); - // ske_pot.state.SetAnimation(0, "animation", true); - } - private void SetSaveingPotBtn(object a = null) - { - (ui.btn_saveingpot as btn_saveingpot).text_nowcash.text = SaveingPotHelper.getCashString(SaveData.GetSaveobject().saveingpot_cash); - - } - void Resurgence(object state) - { - OutFunc(true); - GameHelper.IsTemporaryEnd = false; - } - public void checkGameState(object a = null) - { - if (out_list.Count == 0)//是否通关 - { - bool all_clear = CheckSuccess(); - if (all_clear) - { - //通关成功 - float[] cash_array = GameHelper.GetRewardValue(2); - - // var temp = new { IsWin = true, cash_number = 0, rate = 2, IsLevelSuccess = true, IsH5Reward = false }; - - - DOVirtual.DelayedCall(0.75f, () => - { - - var temp = new SuccessData(); - temp.IsWin = true; - temp.cash_number = cash_array[0]; - temp.rate = (int)cash_array[1]; - temp.IsLevelSuccess = true; - temp.IsH5Reward = false; - - - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - }); - } - } - - } - private void UpdataAvatar(object obj = null) - { - btn_menu head = ui.btn_menu_ as btn_menu; - var avatarId = PreferencesMgr.Instance.PlayerAvatarId; - - EyesHarmony.SetAvatarToLoader(avatarId, head.head_loader as GLoader); - - } - void LookAd() - { - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardboxUI_Open); - GameHelper.showGameUI = false; - ui.btn_look_ad.visible = false; - } - void RefreshGame(object obj = null) - { - GameHelper.is_first_login = false; - first_reset = false; - ChangeSlotState();//检测是否死亡 - } - - - public void SetTopCurr(object a = null) - { - new_topgold btn_gold = ui.gold as new_topgold; - btn_gold.number_text.text = $"{PreferencesMgr.Instance.Currency101:N0}"; - - new_topmoney btn_money = ui.money as new_topmoney; - btn_money.number_text.text = PreferencesMgr.Instance.Currency102.ToString("0.00"); - btn_money.btn_cashout.SetClick(() => - { - var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last(); - Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count); - Debug.Log(makeupTaskData); - - makeup vo = null; - - foreach (makeup item in ConfigSystem.GetConfig().dataList) - { - if (item.id == makeupTaskData.tableId) vo = item; - } - Debug.Log(vo); - // PreferencesMgr.Instance.Currency102=99999; - // //makeupTaskData.videoCount = 50; - if (vo == null) - { - return; - } - 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; - // com_box.pb_num.value = vo.item_need - leftCash; - // pbTxt.text = - // $"{GameHelper.Get101Str((decimal)(vo.item_need - leftCash))}/{GameHelper.Get101Str((decimal)com_box.pb_num.max)}"; - GameHelper.showGameUI = false; - uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); - - }); - } - - void ReceiveRemakState(object state) - { - - if ((bool)state) - {//复活 - GameHelper.IsTemporaryEnd = false; - OutFunc(true); - } - else - {//重置 - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); - Debug.Log("99999999999999999opengame1"); - - - } - - } - void SetItemNumber(object a = null) - { - int numbers = GameHelper.GetItemNumber(0); - if (numbers == 0) - { - ui.btn_out.number_text.visible = false; - ui.btn_out.img_add.visible = true; - ui.btn_out.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 0); - GameHelper.showGameUI = false; - }); - } - else - { - ui.btn_out.number_text.text = numbers.ToString(); - ui.btn_out.number_text.visible = true; - ui.btn_out.img_add.visible = false; - ui.btn_out.SetClick(() => - { - OutFunc(); - }); - } - numbers = GameHelper.GetItemNumber(1); - if (numbers == 0) - { - ui.btn_back.number_text.visible = false; - ui.btn_back.img_add.visible = true; - ui.btn_back.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 1); - GameHelper.showGameUI = false; - }); - } - else - { - ui.btn_back.number_text.text = numbers.ToString(); - ui.btn_back.number_text.visible = true; - ui.btn_back.img_add.visible = false; - ui.btn_back.SetClick(() => - { - BackFunc(); - }); - } - numbers = GameHelper.GetItemNumber(2); - if (numbers == 0) - { - ui.btn_refresh.number_text.visible = false; - ui.btn_refresh.img_add.visible = true; - ui.btn_refresh.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 2); - GameHelper.showGameUI = false; - }); - } - else - { - ui.btn_refresh.number_text.text = numbers.ToString(); - ui.btn_refresh.number_text.visible = true; - ui.btn_refresh.img_add.visible = false; - ui.btn_refresh.SetClick(() => - { - RefreshFunc(); - }); - } - - } - void SetSlotNumber(object a = null) - { - if (!SaveData.GetSaveobject().have_slot) - { - slot_max = 7; - ui.btn_buyslot.visible = true; - } - else - { - slot_max = 8; - ui.btn_buyslot.visible = false; - } - - - } - void SetLeveldiff() - { - int level = GameHelper.GetLevel(); - ui.level_text.text = "level " + level; - - // if (level > type_array.Length) level = type_array.Length; - - // card_type_max = type_array[level - 1]; - // card_layer = layer_array[level - 1]; - // all_card_numbers = all_array[level - 1]; - - extra_max = 0; - } - private bool first_reset = true; - void ReSetGame(object a = null) - { - if (first_reset) - { - first_reset = false; - return; - } - SetLeveldiff(); - slot_list.Clear(); - out_list.Clear(); - last_card_item = null; - SaveData.GetSaveobject().all_card_numbers = 0; - SaveData.GetSaveobject().card_layer = 2; - - InitPosList(); - CreatCard(); - RefreshCardState(true); - GameHelper.SetLevelstate(3); - GameHelper.IsTemporaryEnd = false; - SaveData.GetSaveobject().clear_number = 0; - for (int i = 0; i < SaveData.GetSaveobject().usePropsNum.Length; i++) - { - SaveData.GetSaveobject().usePropsNum[i] = 0; - } - - } - void RefreshFunc() - { - int item_num = GameHelper.GetItemNumber(2); - if (item_num <= 0) return; - List temp_list = new List(); - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - - if (!card_item_list[i][j].in_slot && !card_item_list[i][j].is_out) - { - temp_list.Add(card_item_list[i][j]); - refresh_list.Add(new Vector3(card_item_list[i][j].pos_x, card_item_list[i][j].pos_y, card_item_list[i][j]._layer)); - } - } - } - for (int i = 0; i < temp_list.Count; i++) - { - card_item_list[(int)refresh_list[i].z].Remove(temp_list[i]); - } - - for (int i = 0; i < temp_list.Count; i++) - { - int index = Random.Range(0, refresh_list.Count); - temp_list[i].pos_x = refresh_list[index].x; - temp_list[i].pos_y = refresh_list[index].y; - temp_list[i]._layer = (int)refresh_list[index].z; - card_item_list[(int)refresh_list[index].z].Add(temp_list[i]); - refresh_list.RemoveAt(index); - - // GTweener tweener = temp_list[i].sheep_card.TweenMove(new Vector2(temp_list[i].pos_x, temp_list[i].pos_y), 0.2f); // 位置从当前值渐变到新的坐标 - // tweener.SetEase(EaseType.Linear); - temp_list[i].sheep_card.transform.DOLocalMove(new Vector3(temp_list[i].pos_x, temp_list[i].pos_y, 300 - temp_list[i]._layer), 0.2f); - } - - - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - int k = i; - int l = j; - var temp_ = card_item_list[k][l]; - // card_item_list[k][l].sheep_card.SetClick(() => - // { - // cardClick(temp_); - // }); - - } - } - DOVirtual.DelayedCall(0.5f, () => { RefreshCardState(); }); - GameHelper.SetItemNumber(2, item_num - 1); - SetItemNumber(); - - SaveData.GetSaveobject().usePropsNum[2]++; - - } - void OutFunc(bool isfree = false) - { - if (slot_list.Count > 0) - { - int item_num = GameHelper.GetItemNumber(0); - if (item_num <= 0 && !isfree) return; - int out_list_layer = 0; - for (int i = 0; i < out_list.Count; i++) - { - if (out_list_layer < (out_list[i].out_layer + 1)) out_list_layer = out_list[i].out_layer + 1; - } - for (int i = 0; i < 3; i++) - { - if (i < slot_list.Count) - { - out_list.Add(slot_list[i]); - slot_list[i].in_slot = false; - slot_list[i].can_click = true; - - slot_list[i].out_layer = out_list_layer; - - if (slot_list[i] == last_card_item) last_card_item = null; - - slot_list[i].sheep_card.transform.DOLocalMove(new Vector3((i - 1) * card_width_slot, -23.4f + out_list_layer * 0.5f, 300 - out_list_layer), 0.2f); - - slot_list[i].pos_x = (i - 1) * card_width_slot; - slot_list[i].pos_y = -23.4f + out_list_layer * 0.5f; - - card_item_list[slot_list[i]._layer].Remove(slot_list[i]); - if (out_list_layer >= card_item_list.Count) card_item_list.Add(new List()); - card_item_list[out_list_layer].Add(slot_list[i]); - slot_list[i]._layer = out_list_layer; - - slot_list[i].is_out = true; - } - } - for (int i = 0; i < 3; i++) - { - if (slot_list.Count > 0) slot_list.RemoveAt(0); - } - - - for (int k = 0; k < slot_list.Count; k++) - { - slot_list[k].sheep_card.transform.DOLocalMove(new Vector3(k * (card_width_slot) + bg_x, bg_y, 1), 0.2f); - } - if (!isfree) GameHelper.SetItemNumber(0, item_num - 1); - RefreshCardState(); - SetItemNumber(); - - SaveData.GetSaveobject().usePropsNum[0]++; - - } - - - } - void BackFunc() - { - if (last_card_item != null) - { - - int item_num = GameHelper.GetItemNumber(1); - if (item_num <= 0) return; - slot_list.Remove(last_card_item); - last_card_item.in_slot = false; - last_card_item.can_click = true; - ChangeSlotState(); - - if (!last_card_item.is_out) - { - last_card_item.sheep_card.transform.DOScale(new Vector3(card_scale, card_scale, 1), 0.2f); - } - last_card_item.sheep_card.transform.DOLocalMove(new Vector3(last_card_item.pos_x, last_card_item.pos_y, 300 - last_card_item._layer), 0.2f).OnComplete(() => - { - RefreshCardState(); - last_card_item = null; - }); - - for (int k = 0; k < slot_list.Count; k++) - { - slot_list[k].sheep_card.transform.DOLocalMove(new Vector3(k * (card_width_slot) + bg_x, bg_y, 1), 0.2f); - } - - GameHelper.SetItemNumber(1, item_num - 1); - SetItemNumber(); - - SaveData.GetSaveobject().usePropsNum[1]++; - - } - else - { - GameHelper.ShowTips("There are no actions that can be undone"); - } - - - } - void CardClick(object obj = null) - { - if (GameHelper.IsTemporaryEnd) - { - return; - } - - string name = (string)obj; - Card_item card_self = null; - - for (int i = 0; i < card_item_list.Count; i++) - { - if (card_item_list[i].Count == 0) continue; - for (int j = 0; j < card_item_list[i].Count; j++) - { - if (card_item_list[i][j].sheep_card.IsDestroyed() || card_item_list[i][j].sheep_card == null) continue; - if (card_item_list[i][j].sheep_card.gameObject.name == name) - { - card_self = card_item_list[i][j]; - break; - } - } - } - if (card_self == null) return; - is_resurgence = false; - if (Audio.Instance.IsOpenEffect) - { - Debug.Log("???????????yinyueeeeeeeeeeee"); - Audio.Instance.PlayDynamicEffect("ui_ButtonDefault"); - } - if (card_self.can_click && !card_self.in_slot) - { - int insert_indet = -1; - for (int i = 0; i < slot_list.Count; i++) - { - if (slot_list[i].card_type == card_self.card_type) - { - insert_indet = i + 1; - } - } - if (insert_indet < 0) insert_indet = slot_list.Count; - - slot_list.Insert(insert_indet, card_self); - card_self.in_slot = true; - card_self.can_click = false; - card_self.pos_x = card_self.sheep_card.transform.position.x; - card_self.pos_y = card_self.sheep_card.transform.position.y; - if (card_self.is_out) - { - out_list.Remove(card_self); - //card_self.is_out = false; - } - - // ui.SetChildIndex(card_self.sheep_card, ui.GetChildrenCount()); - - RefreshCardState(); - if (insert_indet < slot_list.Count) - { - for (int i = insert_indet + 1; i < slot_list.Count; i++) - { - slot_list[i].sheep_card.transform.DOLocalMove(new Vector3(i * card_width_slot + bg_x, bg_y, 1), 0.2f); - } - } - last_card_item = card_self; - ChangeSlotState(); - - // card_self.sheep_card.transform.DOMoveZ(110, 0); - card_self.sheep_card.GetComponent().sortingOrder = 1000; - card_self.sheep_card.transform.DOScale(new Vector3(card_scale * 1.2f, card_scale * 1.2f, 1), 0.1f) - .OnComplete(() => - { - card_self.sheep_card.transform.DOScale(new Vector3(card_slot_scale, card_slot_scale, 1), 0.2f); - - card_self.sheep_card.transform.DOLocalMove(new Vector3(bg_x + insert_indet * card_width_slot, bg_y, 1), 0.2f).OnComplete(() => - { - card_self.sheep_card.GetComponent().sortingOrder = 0; - }); - - - - }); - - // card_self.sheep_card.tobig.Play(() => - // { - // card_self.sheep_card.tosmall.Play(); - // GTweener tweener = card_self.sheep_card.TweenMove(new Vector2((insert_indet) * (card_width - 1) + ui.slot.x + 8, ui.slot.y + 13), 0.2f); // 位置从当前值渐变到新的坐标 - // tweener.SetEase(EaseType.Linear); // 设置缓动类型 - // if (insert_indet < slot_list.Count) - // { - // for (int i = insert_indet + 1; i < slot_list.Count; i++) - // { - // GTweener tweener1 = slot_list[i].sheep_card.TweenMove(new Vector2((i) * (card_width - 1) + ui.slot.x + 8, ui.slot.y + 13), 0.2f); // 位置从当前值渐变到新的坐标 - // tweener1.SetEase(EaseType.Linear); - // } - // } - // tweener.OnComplete(() => - // { - // changeSlotState(); - // Debug.Log("111111111111"); - // }); - // }); - - } - } - - public List GetGameConfig() - { - var conf_num = PlayerPrefs.GetInt("game_conf_num", 1); - var GameConfig = ConfigSystem.GetConfig(); - - conf_num = conf_num != GameHelper.conf_num ? conf_num : GameHelper.conf_num; - - List configData = GameConfig.game_conf[1]; - - Debug.Log($"GetGameConfig==== {conf_num}, exist== {GameConfig.game_conf.ContainsKey(conf_num)}"); - if (GameConfig.game_conf.ContainsKey(conf_num)) - { - configData = GameConfig.game_conf[conf_num]; - } - - // PlayerPrefs.SetString("game_config_data",configData); - - return configData; - } - - void InitPosList() - { - map_list.Clear(); - left_extra_list.Clear(); - right_extra_list.Clear(); - - float parent_x = 0 - (3) * card_width; - float parent_y = 0 + (2) * card_height + 7; - - - var level = GameHelper.GetLevel(); - - var GameConfig = GetGameConfig(); - - if (level > GameConfig.Count) level = GameConfig.Count; - - var stackedConf = new StackedModel - { dataList = SerializeUtil.ToObject>(GameConfig[level - 1].stacked) }; - var boardConf = new BoardModel - { dataList = SerializeUtil.ToObject>(GameConfig[level - 1].board) }; - - card_layer = boardConf.dataList.Count; - card_type_max = GameConfig[level - 1].item_type; - - Debug.Log($"boardConf.dataList.Count {boardConf.dataList.Count}"); - - if (stackedConf.dataList.Count > 0) - { - var leftData = stackedConf.dataList[0]; - for (int i = 0; i < leftData.num; i++) - { - left_extra_list.Add(new Vector2(parent_x + (leftData.site[0] - 1) * card_width + i * 0.5f, parent_y - (leftData.site[1] - 1) * card_height)); - } - - var rightData = stackedConf.dataList[1]; - for (int i = 0; i < rightData.num; i++) - { - right_extra_list.Add(new Vector2(parent_x + (rightData.site[0] - 1) * card_width - i * 0.5f, parent_y - (rightData.site[1] - 1) * card_height)); - } - int stacked_count = leftData.num >= rightData.num ? leftData.num : rightData.num; - card_layer = card_layer >= stacked_count ? card_layer : stacked_count; - } - - SaveData.GetSaveobject().card_layer = card_layer; - - var count = 0; - for (int k = boardConf.dataList.Count; k > 0; k--) - { - count++; - var oneLayer = boardConf.dataList[k - 1]; - var vector2 = oneLayer.vector2; - Debug.Log($"vector2: {JsonConvert.SerializeObject(vector2)}"); - List single_ = new List(); - - InitOffset(oneLayer.offset, out var x_offset, out var y_offset); - // x_offset=0; - // y_offset=0; - - for (int i = 0; i < vector2.Length; i++) - { - if (i >= width_max) continue; - - for (int j = 0; j < vector2[i].Length; j++) - { - if (j >= height_max) continue; - - if (vector2[i][j] != 0) - { - var nums = level == 3 && count == 5 ? -1 : 0; - single_.Add(new Vector2(parent_x + i * card_width + x_offset, - parent_y - j * card_height + y_offset)); - } - } - } - - map_list.Add(single_); - } - - int map_count = 0; - for (int i = 0; i < map_list.Count; i++) - { - map_count += map_list[i].Count; - } - Debug.Log($"map_count: {map_count}, left_extra_list: {left_extra_list.Count}, right_extra_list: {right_extra_list.Count}"); - all_card_numbers = (map_count + left_extra_list.Count + right_extra_list.Count) / 3; - Debug.Log($"all_card_numbers2:{all_card_numbers}"); - SaveData.GetSaveobject().all_card_numbers = all_card_numbers; - - } - - void InitOffset(int[] offset, out float x_offset, out float y_offset) - { - Debug.Log($"offset:{JsonConvert.SerializeObject(offset)}"); - x_offset = 0; - y_offset = 0; - if (offset.Length < 4) return; - - x_offset = offset[1] != 0 ? offset[1] : -offset[3]; - x_offset *= real_card_width / 2 - (real_card_width - card_width) / 2; - - y_offset = offset[0] != 0 ? offset[0] : -offset[2]; - y_offset *= real_card_height / 2 - (real_card_height - card_height) / 2; - - Debug.Log($"x_offset:{x_offset},y_offset:{y_offset}"); - } - - - void CreatCard() - { - - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - if (card_item_list[i][j].sheep_card != null) - { - MonoBehaviour.Destroy(card_item_list[i][j].sheep_card); - } - } - } - card_item_list = CreatAnimalCard.instance.CreatCardNew(all_card_numbers, card_type_max, card_layer, extra_max, map_list, left_extra_list, right_extra_list); - } - - int GetExtra() - { - int pos = Random.Range(0, pool_list.Count); - if (pool_list[pos].is_extra) - { - pos = GetExtra(); - } - return pos; - } - // int getMaplayer() - // { - // Debug.Log("iiiiiiiiiiiiiiiiiiii"); - // int layer = Random.Range(0, map_list.Count);//确定层数 - // if (map_list[layer].Count == 0) - // { - // for (int i = 0; i < map_list.Count; i++) - // { - // if (map_list[i].Count != 0) return i; - // } - // } - // return layer; - // } - int GetMaplayer() - { - int layer = Random.Range(0, map_list.Count);//确定层数 - if (map_list[layer].Count == 0) - { - layer = GetMaplayer(); - } - return layer; - } - private int name_index = 0; - public Camera orthoCamera; - void ad_success(object a = null) - { - - - float cash = (float)a; - - // reward_data temp = new reward_data() { start = start, end = end, change = cash, type = 111 }; - - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); - // GameHelper.addMoney(cash); - // DOVirtual.DelayedCall(1, () => - // { - // DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency101, 1, - // value => { ui.money.number_text.text = GameHelper.Get101Str((decimal)value); }); - // }); - - - // var rewardData = new RewardData(); - // var rewardSingleData = new RewardSingleData(102, (decimal)cash, RewardOrigin.Play) - // { - // startPosition = start, - // endPosition = end - // }; - - // rewardData.AddReward(rewardSingleData); - // rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - // rewardData.AddCompleted(success => - // { - // if (success) - // { - // // RefreshGold((decimal)awardNum); - - // // DOVirtual.DelayedCall(0.7f, () => - // // { - // // CtrlCloseUI(); - // // }); - // } - // }); - - - var startPot = GameHelper.GetUICenterPosition(ui.btn_look_ad); - var endPos = GameHelper.GetUICenterPosition(ui.money); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(102, (decimal)cash, RewardOrigin.Play) - { - startPosition = startPot, - endPosition = endPos, - - }; - rewardData.AddReward(rewardSingleData); - - - - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - // DOVirtual.DelayedCall(1, () => - // { - // DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1, - // value => { ui.btn_money.GetChild("text_gold").text = ((decimal)value).ToString("0.00"); }); - // }); - - - - ui.btn_look_ad.visible = false; - - - ad_numbers++; - if (ad_numbers == 3) - { - ad_times = Convert.ToInt32(GameHelper.GetNowTime()); - PlayerPrefs.SetInt("ad_time", ad_times); - } - if (ad_numbers > 3) - { - ad_numbers = 1; - } - PlayerPrefs.SetInt("ad_number", ad_numbers); - - - } - private bool is_resurgence = false; - void ChangeSlotState(object a = null) - { - float start_card = 0; - int hide_type = -1; - bool all_clear = false; - for (int i = 0; i < slot_list.Count; i++) - { - int same_numbers = 0; - for (int j = i + 1; j < slot_list.Count; j++) - { - if (slot_list[j].card_type == slot_list[i].card_type) - { - same_numbers++; - } - - if (same_numbers >= 2) - { - hide_type = slot_list[j].card_type; - break; - } - - } - } - - - if (hide_type >= 0) - { - if (Audio.Instance.IsOpenEffect) - { - Audio.Instance.PlayDynamicEffect("dissolve"); - } - int index = 0; - for (int j = 0; j < slot_list.Count; j++) - { - - if (slot_list[j].card_type == hide_type) - { - if (index == 1) - { - start_card = ui.slot.x - 50 + j * 124; - } - slot_list[j].in_slot = false; - GameObject temp = slot_list[j].sheep_card; - card_item_list[slot_list[j]._layer].Remove(slot_list[j]); - //slot_list[j].sheep_card.gameObjectName = name_index.ToString(); - - DOVirtual.DelayedCall(0.3f, () => - { - - temp.transform.DOScale(new Vector3(card_scale * 1.1f, card_scale * 1.1f, 1), 0.15f).OnComplete(() => - { - temp.transform.DOScale(new Vector3(1, 1, 1), 0.15f); - }); - temp.transform.DOLocalRotate(new Vector3(0, 0, 17), 0.15f).OnComplete(() => - { - temp.transform.DOScale(new Vector3(0, 0, 0), 0.15f).OnComplete(() => - { - // if (hide_type % 2 == 0) - // { - // CreatAnimalCard.instance.creatSpine(1, temp.transform.position); - // } - // else - // { - // CreatAnimalCard.instance.creatSpine(2, temp.transform.position); - // } - MonoBehaviour.Destroy(temp); - }); - }); - }); - - card_item_list[slot_list[j]._layer].Remove(slot_list[j]); - index++; - } - } - name_index++; - if (last_card_item != null && last_card_item.card_type == hide_type) - { - last_card_item = null; - } - slot_list.RemoveAll((Card_item a) => - a.card_type == hide_type - ); - - for (int k = 0; k < slot_list.Count; k++) - { - int l = k; - DOVirtual.DelayedCall(0.5f, () => - { - // GTweener tweener = slot_list[l].sheep_card.TweenMove(new Vector2(l * (card_width - 1) + ui.slot.x + 8, ui.slot.y + 13), 0.2f); // 位置从当前值渐变到新的坐标 - // tweener.SetEase(EaseType.Linear); // 设置缓动类型 - slot_list[l].sheep_card.transform.DOLocalMove(new Vector3(l * card_width_slot + bg_x, bg_y, 1), 0.2f); - - }); - - } - GameHelper.AddGameExp(3); - SaveData.GetSaveobject().clear_number += 3; - setBtntask(); - if (GameHelper.IsGiftSwitch() && (Random.Range(0, 100) < ConfigSystem.GetConfig().roomrewardrate) && !ui.btn_look_ad.visible) - //if (GameHelper.IsGiftSwitch() && (Random.Range(0, 100) < 100) && !ui.btn_look_ad.visible) - { - ui.btn_look_ad.visible = true; - btn_look_ad_showtime = 0; - - } - - all_clear = CheckSuccess(); - if (GameHelper.IsGiftSwitch() && !all_clear) - { - - if (hide_type >= 0 && Random.Range(0, 100) < ConfigSystem.GetConfig().Smallrewardsrate) - { - if (hide_type != 15) - {//普通小额钞票 - - - // 转换为FGUI坐标（这里需要根据您的FGUI设置进行调整） - // Vector2 fguiPosition = new Vector2(start_card, ui.slot.y + 50); - // var start = fguiPosition; - // var end = GameHelper.GetUICenterPosition(ui.money.GetChild("number_text")); - // float[] cash_array = GameHelper.GetRewardValue(0); - // AwardData temp = new AwardData() { start = start, end = end, change = cash_array[0], type = 111 }; - // DOVirtual.DelayedCall(0.5f, () => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.CoinWnd_newUI_Open, temp); }); - // GameHelper.addMoney(cash_array[0]); - // DOVirtual.DelayedCall(1.5f, () => - // { - // DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency101, 1f, - // value => { (ui.money.GetChild("number_text") as GTextField).text = GameHelper.Get101Str((decimal)value); }); - // clearSpinepool?.Invoke(); - // }); - - - Vector2 fguiPosition = new Vector2(start_card, ui.slot.y); - var start = fguiPosition; - - float[] cash_array = GameHelper.GetRewardValue(0); - - - var endPos = GameHelper.GetUICenterPosition(ui.money.GetChild("number_text")); - var rewardData = new RewardData - { - displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange - }; - var rewardSingleData = new Goda(102, (decimal)cash_array[0], RewardOrigin.Play) - { - startPosition = start, - endPosition = endPos, - - }; - rewardData.AddReward(rewardSingleData); - - // rewardData.AddCompleted(success => - // { - // if (success) - // { - // // RefreshGold(awardNum); - - // } - // }); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - - } - - - } - - if (hide_type >= 0) - { - if (hide_type == 15) - { - - // float[] cash_array = GameHelper.GetRewardValue(1); - // var temp = new { IsWin = true, cash_number = 0, rate = 2, IsLevelSuccess = false, IsH5Reward = false }; - float[] cash_array = GameHelper.GetRewardValue(1); - var temp = new SuccessData(); - temp.IsWin = true; - temp.cash_number = cash_array[0]; - temp.rate = (int)cash_array[1]; - temp.IsLevelSuccess = false; - temp.IsH5Reward = false; - - DOVirtual.DelayedCall(0.5f, () => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - clearSpinepool?.Invoke(); - }); - - - } - - } - } - } - - //Debug.Log("quanbuqingchuleeeeeeeeeeeeee" + all_clear + "----------" + out_list.Count); - - if (out_list.Count == 0) - { - - - - - if (all_clear) - { - SendLog(true); - - GameHelper.SetLevel(GameHelper.GetLevel() + 1); - //通关成功 - float[] cash_array = GameHelper.GetRewardValue(2); - - // var temp = new { IsWin = true, cash_number = 0, rate = 2, IsLevelSuccess = true, IsH5Reward = false }; - var temp = new SuccessData(); - temp.IsWin = true; - temp.cash_number = cash_array[0]; - temp.rate = (int)cash_array[1]; - temp.IsLevelSuccess = true; - temp.IsH5Reward = false; - - DOVirtual.DelayedCall(0.75f, () => - { - if (UI.Instance.IsExistUI(UIConst.LevelSuccessUI)) LevelSuccessUI.aftershow_success = true; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - }); - - return; - } - } - - if (slot_list.Count >= slot_max) - { - float complte_progress = showResurgence(); - GameHelper.IsTemporaryEnd = true; - - if (GameHelper.GetLevelstate() != 0) - { - if ((complte_progress > ((float)ConfigSystem.GetConfig().FailedGiftProgress / 100)) && !is_resurgence) - { - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress); - is_resurgence = true; - return; - } - DOVirtual.DelayedCall(0.75f, () => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RemakeUI_Open); - }); - - - // TimerHelper.mEasy.AddTimer(1.0f, () => - // { - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChoosePropUI_Open); - // }); - } - else - { - if ((complte_progress > ((float)ConfigSystem.GetConfig().FailedGiftProgress / 100)) && !is_resurgence) - { - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress); - is_resurgence = true; - return; - } - //通关失败 - float[] cash_array = GameHelper.GetRewardValue(2); - - // var temp = new { IsWin = false, cash_number = 0, IsLevelSuccess = true, IsH5Reward = false }; - var temp = new SuccessData(); - temp.IsWin = false; - temp.cash_number = cash_array[0]; - temp.IsLevelSuccess = true; - temp.IsH5Reward = false; - - DOVirtual.DelayedCall(0.75f, () => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - }); - } - if (Audio.Instance.IsOpenEffect) - { - Audio.Instance.PlayDynamicEffect("fellshort"); - } - } - - } - float showResurgence() - { - int surplus_item = 0; - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - if (card_item_list[i][j].sheep_card.IsDestroyed() || card_item_list[i][j].sheep_card == null) continue; - surplus_item++; - } - } - Debug.Log(surplus_item); - Debug.Log(SaveData.GetSaveobject().all_card_numbers * 3); - // if ((1 - (float)surplus_item / (float)(SaveData.GetSaveobject().all_card_numbers * 3))) - // { - return 1 - (float)surplus_item / (float)(SaveData.GetSaveobject().all_card_numbers * 3); - // } - - // return 0; - } - bool CheckSuccess() - { - - bool all_clear = true; - for (int i = 0; i < card_item_list.Count; i++) - { - if (!all_clear) break; - for (int j = 0; j < card_item_list[i].Count; j++) - { - - all_clear = false; - break; - - } - } - return all_clear; - - } - - - - void RefreshCardState(bool is_first = false) - { - - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - if (card_item_list[i][j].sheep_card.IsDestroyed() || card_item_list[i][j].sheep_card == null) continue; - - - bool can_click = true; - if (card_item_list[i][j].in_slot) continue; - - for (int k = i + 1; k < card_item_list.Count; k++) - { - bool is_break = false; - for (int l = 0; l < card_item_list[k].Count; l++) - { - - if (card_item_list[k][l].in_slot) continue; - var card_distance = card_item_list[k][l].is_out && card_item_list[i][j].is_out ? 0.9f : 0.2f; - // Debug.Log($"card_distance=========: {card_distance}"); - if (Vector2.Distance(new Vector2(card_item_list[k][l].pos_x, card_item_list[k][l].pos_y), - new Vector2(card_item_list[i][j].pos_x, card_item_list[i][j].pos_y)) <= (card_width - card_distance)) - { - is_break = true; - can_click = false; - break; - } - } - if (is_break) break; - } - //} - - if (is_first) - { - if (can_click) - { - // card_item_list[i][j].sheep_card.tolight_notween.Play(); - card_item_list[i][j].sheep_card.GetComponent().color = white_color; - } - else - { - // card_item_list[i][j].sheep_card.todark_notween.Play(); - card_item_list[i][j].sheep_card.GetComponent().color = dark_color; - } - } - else - { - if (card_item_list[i][j].can_click != can_click) - { - if (can_click) - { - // card_item_list[i][j].sheep_card.tolight.Play(); - SpriteRenderer temp = card_item_list[i][j].sheep_card.GetComponent(); - temp.DOColor(white_color, 0.25f); - } - else - { - // card_item_list[i][j].sheep_card.todark.Play(); - SpriteRenderer temp = card_item_list[i][j].sheep_card.GetComponent(); - temp.DOColor(dark_color, 0.25f); - - } - } - } - - - card_item_list[i][j].can_click = can_click; - } - } - List order_list = new List(); - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - card_item_list[i][j].sheep_card.GetComponent().sortingOrder = 0; - if (card_item_list[i][j].can_click && !card_item_list[i][j].in_slot && !card_item_list[i][j].is_out) - { - order_list.Add(card_item_list[i][j]); - } - } - } - order_list.Sort((x, y) => y.pos_y.CompareTo(x.pos_y)); - for (int i = 0; i < order_list.Count; i++) - { - order_list[i].sheep_card.GetComponent().sortingOrder = i; - } - - } - public Color white_color = new Color(1, 1, 1, 1); - public Color dark_color = new Color(128f / 255f, 128f / 255f, 128f / 255f, 1f); - - public void SaveJson(object a = null) - { - string save = JsonConvert.SerializeObject(card_item_list); - Debug.Log("jsveeeeeeeeeeeeeeeeeeeee" + save); - //if (File.Exists(jsonFilePath)) File.Delete(jsonFilePath); - File.WriteAllText(jsonFilePath, save); - File.WriteAllText(jsonFilePath_test, "testtt111111"); - SaveData.saveDataFunc(); - } - private static string jsonFilePath_test = Path.Combine(Application.persistentDataPath, "card_json12.json"); - void CreatSaveItem() - { - card_item_list = JsonConvert.DeserializeObject>>(jsonstr); - Debug.Log(jsonstr); - jsonstr = null; - int slot_list_index = 0; - CreatAnimalCard.instance.creatSaveCard(card_item_list); - for (int i = 0; i < card_item_list.Count; i++) - { - for (int j = 0; j < card_item_list[i].Count; j++) - { - if (card_item_list[i][j].in_slot) - { - Debug.Log("slottttttttttttttttttttt"); - slot_list.Add(card_item_list[i][j]); - slot_list_index++; - } - - if (card_item_list[i][j].is_out) - { - out_list.Add(card_item_list[i][j]); - - } - pool_list.Add(card_item_list[i][j]); - } - - } - slot_list.Sort((x, y) => x.card_type.CompareTo(y.card_type)); - for (int i = 0; i < slot_list.Count; i++) - { - slot_list[i].sheep_card.transform.position = new Vector3(i * card_width_slot + bg_x, bg_y, 101); - slot_list[i].sheep_card.GetComponent().color = new Color(1, 1, 1, 1); - - } - - } - private void LoadData() - { - - if (File.Exists(jsonFilePath)) - { - Debug.Log($"jsonFilePath========= {jsonFilePath}"); - jsonstr = File.ReadAllText(jsonFilePath); - - File.Delete(jsonFilePath); - //return JsonUtility.FromJson(json); - string jsonstr123 = File.ReadAllText(jsonFilePath_test); - Debug.Log("ppppppppppppppppppppppppp" + jsonstr123); - } - else - { - Debug.Log("Data file not found!"); - // return null; - } - } - - private void SendLog(object success) - { - // SetLeveldiff(); - Debug.Log("senddddd"); - var test = new PlayLog(); - test.level = GameHelper.GetLevel(); - test.layer = SaveData.GetSaveobject().card_layer; - test.item_type = SaveData.GetSaveobject().this_time_cardtype; - test.total_item = SaveData.GetSaveobject().all_card_numbers * 3; - test.remove_item = SaveData.GetSaveobject().clear_number; - test.pass = (bool)success; - test.begin_time = SaveData.GetSaveobject().start_time; - test.end_time = GameHelper.GetNowTime(); - test.item_costs = SaveData.GetSaveobject().usePropsNum; - - - var temp = new SettleUp(); - temp.type = 1; - temp.result = JsonConvert.SerializeObject(test); - NetworkKit.PostWithHeader("game/settleUp", temp, (isSuccess, obj) => - { - Debug.Log($"send log= {isSuccess}=========== {GameHelper.GetLoginModel().uid}"); - }); - - SaveData.GetSaveobject().clear_number = 0; - SaveData.GetSaveobject().start_time = GameHelper.GetNowTime(); - SaveData.saveDataFunc(); - - - } - - public void GetCoinAnim(decimal gold) - { - DOVirtual.DelayedCall(1.0f, () => - { - var startNum = PreferencesMgr.Instance.Currency101 - gold; - DOVirtual.Float((float)startNum, (float)GameHelper.GetGoldNumber(), 1f, - value => { ui.gold.GetChild("number_text").text = GameHelper.Get101Str((decimal)value); }); - }); - - var start = GameHelper.GetUICenterPosition(ui.point); - var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("number_text")); - - var rewardData = new RewardData(); - var rewardSingleData = new Goda(101, gold, RewardOrigin.BuyGold) - { - startPosition = start, - endPosition = end, - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly; - - rewardData.AddCompleted((isScu) => - { - - }); - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - - } - } - -} -public class SettleUp -{ - public int type; - public string result; -} - -public class Card_item -{ - public int card_type; - public float pos_x; - public float pos_y; - public int _layer; - public bool can_click = false; - public bool in_slot; - // public bool is_hide; - public bool is_out; - public bool is_gray; - public int out_layer; - [JsonIgnore] - public GameObject sheep_card; - public bool is_extra; -} -public class SuccessData -{ - public bool IsWin; - public float cash_number; - public bool IsLevelSuccess; - public bool IsH5Reward; - public int rate; - -} - -public class PlayLog -{ - public int level; - public int layer; - public int item_type; - public int total_item; - public int remove_item; - public bool pass; - public long begin_time; - public long end_time; - public int[] item_costs = new int[3]; - -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUI.cs.meta b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUI.cs.meta deleted file mode 100644 index 7a545fc..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 901f044832e634fd69e12ec14f995ac7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUICtrl.cs b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUICtrl.cs deleted file mode 100644 index 91336ec..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUICtrl.cs +++ /dev/null @@ -1,236 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; -using UnityEngine; -using AppsFlyerSDK; - -namespace BingoBrain -{ - public class SheepPlayUICtrl : BaseUICtrl - { - private SheepPlayUI ui; - private SheepPlayModel model; - - private uint openUIMsg = UICtrlMsg.SheepPlayUI_Open; - private uint closeUIMsg = UICtrlMsg.SheepPlayUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.SheepPlayModel) as SheepPlayModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new SheepPlayUI(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); - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - void pay_success(object str) - { - string type = (string)str; - string purch_number = ""; - Debug.Log("jiantinggggggggggggggggggggggg"); - if (type.StartsWith("buy_gold")) - { - int startIndex = "buy_gold".Length; - string suffix = type[startIndex..]; // 截取 "gold" 后的所有字符 - int suffix_num = int.Parse(suffix); - List list = ConfigSystem.GetConfig().dataList; - purch_number = ConfigSystem.GetConfig().dataList[suffix_num].Payment_amount.ToString(); - - //如果关闭了购买界面，则需要进行刷新金币 - if(!UI.Instance.IsExistUI(UIConst.BuygoldUI)) - { - // GameHelper.AddGoldNumber(list[suffix_num].Actual_coins); - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - ui.GetCoinAnim(list[suffix_num].Actual_coins); - } - } - else if (type == PurchasingManager.buy_one) - { - SaveData.GetSaveobject().have_slot = true; - SaveData.saveDataFunc(); - GameDispatcher.Instance.Dispatch(GameMsg.Slot_refresh); - purch_number = ConfigSystem.GetConfig().addspace.ToString(); - } - else if (type == PurchasingManager.remove_ad) - { - SaveData.GetSaveobject().is_get_removead = true; - SaveData.saveDataFunc(); - purch_number = ConfigSystem.GetConfig().dataList[1].Paid_price.ToString(); - ui?.setBtnAds(); - - //如果关闭了购买界面，则需要进行刷新金币 - if(!UI.Instance.IsExistUI(UIConst.PackrewardUI)) - { - // PreferencesMgr.Instance.Currency101 += ConfigSystem.GetConfig().dataList[1].coins_quantity; - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - ui.GetCoinAnim(ConfigSystem.GetConfig().dataList[1].coins_quantity); - - } - } - else if (type == PurchasingManager.pack_reward) - { - List list = ConfigSystem.GetConfig().dataList; - int gold_num = list[0].coins_quantity; - int back_num = list[0].props_quantity[1]; - int out_num = list[0].props_quantity[0]; - int refresh_num = list[0].props_quantity[2]; - - GameHelper.AddItemNumber(0, out_num); - GameHelper.AddItemNumber(1, back_num); - GameHelper.AddItemNumber(2, refresh_num); - SaveData.GetSaveobject().is_get_packreward = true; - SaveData.saveDataFunc(); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - purch_number = ConfigSystem.GetConfig().dataList[0].Paid_price.ToString(); - ui?.setBtnAds(); - - //如果关闭了购买界面，则需要进行刷新金币 - if(!UI.Instance.IsExistUI(UIConst.PackrewardUI)) - { - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - // PreferencesMgr.Instance.Currency101 += gold_num; - ui.GetCoinAnim(gold_num); - } - } - else if (type == PurchasingManager.battle_pass) - { - - SaveData.GetSaveobject().is_get_battlepass = true; - int gold = 0; - int out_ = 0; - int back_ = 0; - int refresh_ = 0; - List Passportrewards_list = ConfigSystem.GetConfig().dataList; - for (int i = 0; i < Passportrewards_list.Count; i++) - { - if (GameHelper.GetBattleLv_Index() > i|| (GameHelper.GetGameExp() >= Passportrewards_list[Passportrewards_list.Count-1].Eliminating_quantity)) - { - if (Passportrewards_list[i].Paid_rewards_type == 0) gold += Passportrewards_list[i].Paid_rewards_num; - else if (Passportrewards_list[i].Paid_rewards_type == 1) out_ += Passportrewards_list[i].Paid_rewards_num; - else if (Passportrewards_list[i].Paid_rewards_type == 2) back_ += Passportrewards_list[i].Paid_rewards_num; - else if (Passportrewards_list[i].Paid_rewards_type == 3) refresh_ += Passportrewards_list[i].Paid_rewards_num; - SaveData.GetSaveobject().battle_pass_paylist.Add(i + 1); - } - else break; - } - - // GameHelper.addGoldNumber(gold); - GameHelper.AddItemNumber(0, out_); - GameHelper.AddItemNumber(1, back_); - GameHelper.AddItemNumber(2, refresh_); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - SaveData.saveDataFunc(); - purch_number = ConfigSystem.GetConfig().Passportgift.ToString(); - - //如果关闭了购买界面，则需要进行刷新金币 - if(!UI.Instance.IsExistUI(UIConst.NewTaskUI)) - { - // PreferencesMgr.Instance.Currency101 += gold; - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - ui.GetCoinAnim(gold); - - } - } - else if (type == PurchasingManager.fail_pack) - { - List list = ConfigSystem.GetConfig().dataList; - purch_number = ConfigSystem.GetConfig().dataList[2].Paid_price.ToString(); - ui?.setBtnAds(); - GameDispatcher.Instance.Dispatch(GameMsg.resurgence); - - // PreferencesMgr.Instance.Currency101 += ConfigSystem.GetConfig().dataList[1].coins_quantity; - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - int back_num = list[2].props_quantity[1]; - int out_num = list[2].props_quantity[0]; - int refresh_num = list[2].props_quantity[2]; - Debug.Log("???????ttttttttt"); - //GameHelper.addGoldNumber(gold_num); - int gold_num = list[2].coins_quantity; - if (!UI.Instance.IsExistUI(UIConst.ResurgenceUI)) PreferencesMgr.Instance.Currency101 += gold_num; - GameHelper.AddItemNumber(0, out_num); - GameHelper.AddItemNumber(1, back_num); - GameHelper.AddItemNumber(2, refresh_num); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - SaveData.saveDataFunc(); - - } - else if (type == PurchasingManager.three_days_gift) - { - SaveData.GetSaveobject().is_get_ThreeDaysGift = true; - SaveData.saveDataFunc(); - purch_number = ConfigSystem.GetConfig().dataList[0].Paid_price2.ToString(); - } - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close); - - if (!GameHelper.IsAdModelOfPay() && !string.IsNullOrEmpty(purch_number) && decimal.TryParse(purch_number, out decimal revenue)) - { - // Debug.Log("付费收益上报AF----------- " + revenue.ToString()); - adCallbackInfo.Clear(); - adCallbackInfo.Add("appsflyer_id", AppsFlyer.getAppsFlyerId()); - adCallbackInfo.Add("customer_user_id", GameHelper.GetLoginModel().uid.ToString()); - adCallbackInfo.Add("af_currency", "USD"); - adCallbackInfo.Add("af_revenue", revenue.ToString()); - AppsFlyer.sendEvent("af_purchase", adCallbackInfo); - - GameHelper.sendRevenueToServer("af_purchase", "af_revenue", (int)(revenue * 10000)); - } - - } - public static Dictionary adCallbackInfo = new Dictionary(); - - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUICtrl.cs.meta deleted file mode 100644 index 6adabae..0000000 --- a/Assets/BingoBrain/ModuleUI/SheepPlay/SheepPlayUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad90dca2f6a8344fe8ce6cfd224043d1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow.meta b/Assets/BingoBrain/ModuleUI/Sheepwindow.meta deleted file mode 100644 index 7534f53..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 022763796c8184c2d9515d80f0e6930f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowCtrl.cs b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowCtrl.cs deleted file mode 100644 index b418d5a..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowCtrl.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class SheepwindowCtrl : BaseCtrl - { - public static SheepwindowCtrl Instance { get; private set; } - - private SheepwindowModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.SheepwindowModel) as SheepwindowModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowCtrl.cs.meta deleted file mode 100644 index b035857..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 58e27508a01b144eab047fc0579e3520 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowModel.cs b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowModel.cs deleted file mode 100644 index 9803f28..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - -namespace BingoBrain -{ - public class SheepwindowModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowModel.cs.meta b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowModel.cs.meta deleted file mode 100644 index f1e313a..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6f1d88ea5dfa34e1a927e5bef7f9c714 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUI.cs b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUI.cs deleted file mode 100644 index 2744945..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUI.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using FairyGUI; -using BingoBrain.Core; - -using BingoBrain; -using FGUI.G006_menu_animal; -using FGUI.Common_animal; -using NSubstitute; - -namespace BingoBrain -{ - public class SheepwindowUI : BaseUI - { - private SheepwindowUICtrl ctrl; - private SheepwindowModel model; - private FGUI.G006_menu_animal.com_sheepwindow ui; - private int state_ = 0; - - public SheepwindowUI(SheepwindowUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.SheepwindowUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "G006_menu_animal"; - uiInfo.assetName = "com_sheepwindow"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.SheepwindowModel) as SheepwindowModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - } - - protected override void OnBind() - { - ui = baseUI as FGUI.G006_menu_animal.com_sheepwindow; - } - - protected override void OnOpenBefore(object args) - { - GameHelper.showGameUI = false; - state_ = (int)args; - ui.window_state.selectedIndex = state_; - btn_tabwhite buy_btn = (ui.btn_buy) as btn_tabwhite; - buy_btn.number_text.text = ConfigSystem.GetConfig().Purchaseprops.ToString(); - buy_btn.SetClick(buyItem); - InitView(); - } - void buyItem() - { - if (state_ == 0) - { - - } - else if (state_ == 1) - { - - - } - else if (state_ == 2) - { - - - } - if (GameHelper.checkGoldNumber(ConfigSystem.GetConfig().Purchaseprops)) - { - PreferencesMgr.Instance.Currency101 -= ConfigSystem.GetConfig().Purchaseprops; - int numbers = GameHelper.GetItemNumber(state_); - numbers++; - GameHelper.SetItemNumber(state_, numbers); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - GameHelper.ShowTips("The purchase was successful", true); - CtrlCloseUI(); - } - else - { - GameHelper.ShowTips("Not enough gold"); - } - - - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - ui.btn_close.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Close); - }); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUI.cs.meta b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUI.cs.meta deleted file mode 100644 index d5adef5..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d07e071d35d5041feaf834faa7cac3a0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUICtrl.cs b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUICtrl.cs deleted file mode 100644 index 8e4ab4e..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUICtrl.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -using BingoBrain; - -namespace BingoBrain -{ - public class SheepwindowUICtrl : BaseUICtrl - { - private SheepwindowUI ui; - private SheepwindowModel model; - - private uint openUIMsg = UICtrlMsg.SheepwindowUI_Open; - private uint closeUIMsg = UICtrlMsg.SheepwindowUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.SheepwindowModel) as SheepwindowModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new SheepwindowUI(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/Sheepwindow/SheepwindowUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUICtrl.cs.meta deleted file mode 100644 index 727520b..0000000 --- a/Assets/BingoBrain/ModuleUI/Sheepwindow/SheepwindowUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b85f17625775040eb85b386d6c9c5c79 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs b/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs index f0d6cb6..af214a6 100644 --- a/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs +++ b/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs @@ -1,6 +1,7 @@ using System; using BingoBrain.Core; using BingoBrain.HotFix; +using UnityEngine; namespace BingoBrain { @@ -71,8 +72,12 @@ namespace BingoBrain ui.com_avatar.loader_flag.visible = false; if (GameHelper.IsGiftSwitch()) { - ui.visible = false; - ui.x -= 250; + // ui.visible = false; + // ui.x -= 250; + } + if (Screen.safeArea.y != 0) + { + ui.top_group.y=-90; } } diff --git a/Assets/BingoBrain/ModuleUI/Somsion/SomsionUI.cs b/Assets/BingoBrain/ModuleUI/Somsion/SomsionUI.cs index 80bf55c..3460b57 100644 --- a/Assets/BingoBrain/ModuleUI/Somsion/SomsionUI.cs +++ b/Assets/BingoBrain/ModuleUI/Somsion/SomsionUI.cs @@ -50,7 +50,7 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { - WebviewManager.Instance.SetDarkThough(false); + WebviewManager.Instance.SetDarkThough(false); Audio.Instance.PlayDynamicEffect("pop_open"); ui.list_task.itemRenderer = ItemRenderer; ui.list_task.numItems = PreferencesMgr.Instance.ActiveMissions.Count; @@ -76,7 +76,7 @@ namespace BingoBrain if (GameHelper.IsGiftSwitch()) _Singletask.gift.selectedIndex = 1; Task task = PreferencesMgr.Instance.ActiveMissions[index]; Debug.Log(JsonConvert.SerializeObject(PreferencesMgr.Instance.ActiveMissions)); - TaskList taskVO = GameHelper.GetConfig().GetData(task.Id); + TaskList taskVO = GameHelper.GetConfig().GetData(task.Id); _Singletask.text_taskname.text = taskVO.taskName.Replace("%s", taskVO.taskNum.ToString()); string val = string.Empty; if (task.RewardId == 101) @@ -102,7 +102,7 @@ namespace BingoBrain // TextureHelper.GetItemIcon(taskVO.rewardID, tx => { _Singletask.loader_reward.texture = tx; }); _Singletask.cont_collect.selectedIndex = com_Singletask.Collect_none; - + _Singletask.text_progress.text = task.Progress + "/" + task.MaxProgress; if (task.IsReward) { _Singletask.com_task_pb.TweenValue(task.MaxProgress, 0.3f); @@ -124,7 +124,10 @@ namespace BingoBrain else { _Singletask.btn_task.cont_button.selectedIndex = btn_task.Button_num; - _Singletask.btn_task.text_num.text = task.Progress + "/" + task.MaxProgress; + + // _Singletask.btn_task.text_num.text = task.Progress + "/" + task.MaxProgress; + + _Singletask.com_task_pb.TweenValue(task.Progress, 0.3f); _Singletask.btn_task.SetClick(OnClickGoPlay); } @@ -184,7 +187,7 @@ namespace BingoBrain private void OnClickGoPlay() { CtrlCloseUI(); - GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 0); + GameDispatcher.Instance.Dispatch(BingoInfo.MainTab,0); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift.meta b/Assets/BingoBrain/ModuleUI/ThreeDaysGift.meta deleted file mode 100644 index c87667a..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 15ba8bbc57b1a4f1e83d2439ef3a68bd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs deleted file mode 100644 index 4db1b68..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - - namespace BingoBrain -{ - public class ThreeDaysGiftCtrl : BaseCtrl - { - public static ThreeDaysGiftCtrl Instance { get; private set; } - - private ThreeDaysGiftModel model; - - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta deleted file mode 100644 index 71f2b9a..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2c26aef375ac148dc9b4bd8090279823 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs deleted file mode 100644 index 141eacf..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs +++ /dev/null @@ -1,39 +0,0 @@ -using BingoBrain.Core; -namespace BingoBrain -{ - public class ThreeDaysGiftModel : BaseModel - { - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - - - protected override void OnReadData() - { - } - - - protected override void WriteLocalStorage() - { - - } - - - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs.meta b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs.meta deleted file mode 100644 index aac17a8..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c2702ca6f5c254a3cbaffdc3c9a51550 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs deleted file mode 100644 index aa1630d..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs +++ /dev/null @@ -1,441 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using BingoBrain.Core; -using FairyGUI; -using FGUI.threeDaysGift; -using Spine.Unity; -using DG.Tweening; -using FGUI.Common_animal; -using System; - -namespace BingoBrain -{ - public class ThreeDaysGiftUI : BaseUI - { - private ThreeDaysGiftUICtrl ctrl; - private ThreeDaysGiftModel model; - private FGUI.threeDaysGift.com_three_days ui; - - public ThreeDaysGiftUI(ThreeDaysGiftUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.ThreeDaysGiftUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "threeDaysGift"; - uiInfo.assetName = "com_three_days"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - - } - - protected override void OnClose() - { - Hall.Instance.UpdateSecondEvent -= InitView; - GameHelper.showGameUI = true; - GameDispatcher.Instance.Dispatch(GameMsg.pack_close); - } - - protected override void OnBind() - { - ui = baseUI as FGUI.threeDaysGift.com_three_days; - } - private Action closeCallback; - protected override void OnOpenBefore(object args) - { - - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.three_days_gift_show, 1); - - list = ConfigSystem.GetConfig().dataList; - - ui.btn_close.SetClick(() => - { - GameDispatcher.Instance.Dispatch(GameMsg.ThreeDaysGiftUIClose); - CtrlCloseUI(); - }); - - ui.groups.visible = false; - - - // var ske_bg = FXManager.Instance.SetFx(ui.ani_bg, Fx_Type.fx_three_gift, ref closeCallback); - // ske_bg.state.SetAnimation(0, "3_days", false); - // ske_bg.state.Complete += (a) => - // { - // ske_bg.state.SetAnimation(0, "3_days_dj", false); - // }; - - FX.Instance.SetFx(ui.ani_bg, Fx_Type.fx_three_gift, sk => - { - NAAVsa.PlayAnim(sk, "3_days", false); - sk.state.Complete += (a) => - { - FX.Instance.SetFx(ui.ani_bg, Fx_Type.fx_three_gift, sk => - { - NAAVsa.PlayAnim(sk, "3_days_dj", false); - }, closeCallback); - }; - }, closeCallback); - - - - DOVirtual.DelayedCall(0.5f, () => - { - ui.groups.visible = true; - }); - - // var ske_btn = FXManager.Instance.SetFx(ui.ani_title, Fx_Type.fx_title_effect, ref closeCallback); - // ske_btn.state.SetAnimation(0, "animation", true); - FX.Instance.SetFx(ui.ani_title, Fx_Type.fx_title_effect, sk => - { - NAAVsa.PlayAnim(sk, "animation", true); - }, closeCallback); - InitView(); - Hall.Instance.UpdateSecondEvent += InitView; - // WebviewManager.Instance.SetDarkThough(false); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - GameDispatcher.Instance.AddListener(GameMsg.rewardMul_close, rewardMul_close); - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - GameDispatcher.Instance.RemoveListener(GameMsg.rewardMul_close, rewardMul_close); - } - #endregion - void pay_success(object str) - { - string type = (string)str; - if (type == PurchasingManager.three_days_gift) - { - - // var start = Vector2.zero; - // if (SaveData.GetSaveobject().three_gift_got_index == (int)rewardState.day1) { - // start = GameHelper.GetUICenterPosition(ui.day1.item1.lab_num); - // } else if (SaveData.GetSaveobject().three_gift_got_index == (int)rewardState.day2) { - // start = GameHelper.GetUICenterPosition(ui.day2.item1.lab_num); - // } else if (SaveData.GetSaveobject().three_gift_got_index == (int)rewardState.day3) { - // start = GameHelper.GetUICenterPosition(ui.day3.item1.lab_num); - // } - // - // var rewardData = new RewardData(); - // var end = GameHelper.GetUICenterPosition(ui.node_end); - // - // var rewardSingleData = new RewardSingleData(101, list[1].coins_quantity, RewardOrigin.AdTask) - // { - // startPosition = start, - // endPosition = end - // }; - // - // rewardData.AddReward(rewardSingleData); - // rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - // rewardData.AddCompleted(success => - // { - // // if (success) - // // { - // // RefreshGold(awardNum); - // // } - // }); - // - // GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - // // PreferencesMgr.Instance.Currency101 -= list[1].coins_quantity; - // - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Close); - // SaveData.GetSaveobject().is_get_removead = true; - // InitView(); - - ui.pay_type.selectedIndex = 2; - } - // GameDispatcher.Instance.Dispatch(GameMsg.noads_refresh); - - } - - void rewardMul_close(object str) - { - if (SaveData.GetSaveobject().three_gift_got_index == (int)rewardState.day1) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Three_days_gift_event, BuriedPointEvent.three_day1_success, 1); - } - else if (SaveData.GetSaveobject().three_gift_got_index == (int)rewardState.day2) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Three_days_gift_event, BuriedPointEvent.three_day2_success, 1); - } - else if (SaveData.GetSaveobject().three_gift_got_index == (int)rewardState.day3) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Three_days_gift_event, BuriedPointEvent.three_day3_success, 1); - } - - SaveData.GetSaveobject().three_gift_got_index++; - SaveData.GetSaveobject().last_got_three_gift_time = GameHelper.GetNowTime(); - - } - - private List list; - - - private void InitView() - { - ui.text_have.text = "Owner ADs:" + SaveData.GetSaveobject().look_ad_numbers; - ui.need_text.text = "need " + list[0].Paid_price + " ADs"; - ui.btn_buypack.GetChild("img_saveingpot").visible = false; - ui.btn_max_pack.GetChild("img_saveingpot").visible = false; - - initItem(0); - initItem(1); - initItem(2); - - btn_green btn_buypack = (ui.btn_buypack as btn_green); - GObject pack_title = ui.btn_buypack.GetChild("title"); - - if (SaveData.GetSaveobject().is_get_ThreeDaysGift) - { - ui.pay_type.selectedIndex = 2; - var isToday = GameHelper.InToday(SaveData.GetSaveobject().last_got_three_gift_time, 0, true); - int three_gift_got_index = SaveData.GetSaveobject().three_gift_got_index; - if (isToday || (three_gift_got_index > (int)rewardState.day3)) - { - ui.btn_get.grayed = true; - ui.btn_get.SetClick(() => - { - if (three_gift_got_index < (int)rewardState.day3) - { - GameHelper.ShowTips("Come back and pick it up tomorrow."); - } - }); - } - else - { - ui.btn_get.SetClick(() => - { - getReward(); - ui.btn_get.SetClick(() => { }); - }); - } - - } - else - { - if (!GameHelper.IsAdModelOfPay()) - { - ui.pay_type.selectedIndex = 1; - decimal price_pack = (decimal)list[0].Paid_price2; - ui.btn_max_pack.title = GameHelper.Get102Str(price_pack); - bool is_get = SaveData.GetSaveobject().is_get_ThreeDaysGift; - if (is_get) - { - ui.btn_max_pack.enabled = false; - ui.btn_max_pack.SetClick(() => { }); - } - else - { - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_max_pack.GetChild("img_saveingpot").visible = true; - } - ui.btn_max_pack.SetClick(() => - { - MaxPayClass maxPayData = new MaxPayClass - { - amount = (int)Math.Round(price_pack * 100), - sku = PurchasingManager.three_days_gift, - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - - - }); - } - } - else - { - ui.pay_type.selectedIndex = 0; - - bool is_get = SaveData.GetSaveobject().is_get_ThreeDaysGift; - if (is_get) - { - btn_buypack.state.selectedIndex = 0; - btn_buypack.cooldown.selectedIndex = 1; - ui.btn_buypack.grayed = true; - pack_title.text = "Cliamed"; - ui.btn_buypack.SetClick(() => - { - - }); - } - else if (SaveData.GetSaveobject().look_ad_numbers >= list[0].Paid_price) - { - btn_buypack.state.selectedIndex = 1; - btn_buypack.cooldown.selectedIndex = 0; - btn_buypack.SetClick(() => - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_AD_event, BuriedPointEvent.three_days_gift_buy_success, 1); - SaveData.GetSaveobject().look_ad_numbers -= (int)list[0].Paid_price; - GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, PurchasingManager.three_days_gift); - - // getReward(); - ui.btn_buypack.SetClick(() => { }); - }); - } - else if (SaveData.GetSaveobject().look_ad_time > GameHelper.GetNowTime()) - { - btn_buypack.state.selectedIndex = 0; - btn_buypack.cooldown.selectedIndex = 1; - pack_title.text = GameHelper.TimeFormat(SaveData.GetSaveobject().look_ad_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - btn_buypack.SetClick(() => { }); - } - else - { - btn_buypack.state.selectedIndex = 0; - btn_buypack.cooldown.selectedIndex = 0; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_buypack.GetChild("img_saveingpot").visible = true; - } - pack_title.text = "Watch AD"; - btn_buypack.SetClick(() => - { - - GameHelper.ShowVideoAd("ThreeDaysGift", (issuccess) => - { - if (issuccess) - { - SaveData.GetSaveobject().look_ad_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().exchangeCD; - InitView(); - } - }); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_AD_event, BuriedPointEvent.three_days_gift_click, 1); - }); - } - } - } - } - - private void initItem(int index) - { - com_item day = null; - if (index == 0) - { - day = ui.day1; - } - else if (index == 1) - { - day = ui.day2; - } - else if (index == 2) - { - day = ui.day3; - } - - if (SaveData.GetSaveobject().three_gift_got_index - 1 > index) - { - day.img_select.visible = true; - if (SaveData.GetSaveobject().three_gift_got_index - 1 > 2) - { - day.img_select2.visible = true; - } - } - - day.state.selectedIndex = list[index].props_quantity.Length; - - setItemUrl(day.item1.loader_, GiftType.coin); - day.item1.lab_num.text = "x" + list[index].coins_quantity; - - for (int i = 0; i < list[index].props_quantity.Length; i++) - { - item_reward item = (day.GetChild("item" + (i + 2)) as item_reward); - setItemUrl(item.loader_, (GiftType)list[index].props_type[i]); - - item.lab_num.text = "x" + list[index].props_quantity[i]; - } - } - - private void setItemUrl(GLoader loader, GiftType urltype) - { - if (urltype == GiftType.coin) loader.url = "ui://threeDaysGift/3DAYS_prs_001"; - else if (urltype == GiftType.move_out) loader.url = "ui://threeDaysGift/3DAYS_prs_002"; - else if (urltype == GiftType.refresh) loader.url = "ui://threeDaysGift/3DAYS_prs_004"; - else if (urltype == GiftType.undo) loader.url = "ui://threeDaysGift/3DAYS_prs_003"; - } - - private void getReward() - { - int index = SaveData.GetSaveobject().three_gift_got_index; - - com_item item = null; - if (index == (int)rewardState.day1) - { - item = ui.day1; - } - else if (index == (int)rewardState.day2) - { - item = ui.day2; - } - else if (index == (int)rewardState.day3) - { - item = ui.day3; - } - item.img_select.visible = true; - - - List types = new List(); - List rewards = new List(); - types.Add((int)GiftType.coin); - rewards.Add(list[index - 1].coins_quantity); - for (int i = 0; i < list[index - 1].props_quantity.Length; i++) - { - types.Add(list[index - 1].props_type[i]); // GiftType 类型 - rewards.Add(list[index - 1].props_quantity[i]); - } - GiftData data = new GiftData(); - data.type = types; - data.reward = rewards; - uiCtrlDispatcher.Dispatch(UICtrlMsg.RewardMulNewUI_Open, data); - } - } -} -enum rewardState -{ - day1 = 1, - day2, - day3 -} -public class GiftData -{ - public List type; - public List reward; - public string uiName; -} - -public enum GiftType : int -{ - coin = 101, - move_out = 0, - undo = 1, - refresh = 2, -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs.meta b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs.meta deleted file mode 100644 index 7c5660f..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 34e42e54a15e74f5fa6f4738876e5946 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs deleted file mode 100644 index 48b2531..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using BingoBrain.Core; - -namespace BingoBrain - -{ - public class ThreeDaysGiftUICtrl : BaseUICtrl - { - private ThreeDaysGiftUI ui; - private ThreeDaysGiftModel model; - - private uint openUIMsg = UICtrlMsg.ThreeDaysGiftUI_Open; - private uint closeUIMsg = UICtrlMsg.ThreeDaysGiftUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.ThreeDaysGiftModel) as ThreeDaysGiftModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new ThreeDaysGiftUI(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/ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta deleted file mode 100644 index 7a3cde0..0000000 --- a/Assets/BingoBrain/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9a66b1a98eeb44e23940d70809964ad8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/TipsView.meta b/Assets/BingoBrain/ModuleUI/TipsView.meta deleted file mode 100644 index 845d739..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cf326793fd4c540529ef61a36780bdfe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewCtrl.cs b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewCtrl.cs deleted file mode 100644 index c24d02c..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewCtrl.cs +++ /dev/null @@ -1,21 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class TipsViewCtrl : BaseCtrl - { - public static TipsViewCtrl Instance { get; private set; } - - private TipsViewModel model; - - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewCtrl.cs.meta deleted file mode 100644 index 7a0f17e..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 767bd248b821c440aa63334f468f51bc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewModel.cs b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewModel.cs deleted file mode 100644 index 7e6129d..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewModel.cs +++ /dev/null @@ -1,46 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class TipsViewModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - protected override void OnReset() - { - } - #endregion - - #region 读取数据 - protected override void OnReadData() - { - } - #endregion - - #region 本地存储 - protected override void WriteLocalStorage() - { - - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewModel.cs.meta b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewModel.cs.meta deleted file mode 100644 index 831904b..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 42ebfe016a0d8469c86ceca492205b50 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUI.cs b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUI.cs deleted file mode 100644 index aa44fb7..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUI.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using BingoBrain.Core; -using DG.Tweening; -using UnityEngine; - -namespace BingoBrain -{ - - public class TipsViewUI : BaseUI - { - private TipsViewUICtrl ctrl; - private TipsViewModel model; - private FGUI.Common_animal.com_tips ui; - - public TipsViewUI(TipsViewUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.TipsViewUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "Common_animal"; - uiInfo.assetName = "com_tips"; - uiInfo.layerType = UILayerType.Loading; - } - - protected override void OnInit() - { - } - - protected override void OnClose() - { - ui?.FadeOut(); - } - - protected override void OnBind() - { - ui = baseUI as FGUI.Common_animal.com_tips; - } - - protected override void OnOpenBefore(object args) - { - if (args != null ) { - InitView((Action) args); - } - } - - protected override void OnOpen(object args) - { - ui?.FadeIn(); - } - - protected override void AddListener() - { - } - - protected override void RemoveListener() - { - } - - private void InitView(Action callback) - { - - ui.btn_relog.SetClick(()=>{ - - callback?.Invoke(); - CtrlCloseUI(); - }); - } - - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUI.cs.meta b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUI.cs.meta deleted file mode 100644 index 28ecbf5..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 803c9383b740b4c41896d633fbc2aded -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUICtrl.cs b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUICtrl.cs deleted file mode 100644 index 7d889a1..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUICtrl.cs +++ /dev/null @@ -1,62 +0,0 @@ -using BingoBrain.Core; - -namespace BingoBrain -{ - public class TipsViewUICtrl : BaseUICtrl - { - private TipsViewUI ui; - private TipsViewModel model; - - private uint openUIMsg = UICtrlMsg.TipsViewUI_Open; - private uint closeUIMsg = UICtrlMsg.TipsViewUI_Close; - - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new TipsViewUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - - ui = null; - } - - 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); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUICtrl.cs.meta deleted file mode 100644 index 0f93630..0000000 --- a/Assets/BingoBrain/ModuleUI/TipsView/TipsViewUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0c1d5b79c70fd497c92c61ff6bba0350 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/Preferences/PreferencesMgr_AutoCreator.cs b/Assets/BingoBrain/Preferences/PreferencesMgr_AutoCreator.cs index ada3501..06d0bfe 100644 --- a/Assets/BingoBrain/Preferences/PreferencesMgr_AutoCreator.cs +++ b/Assets/BingoBrain/Preferences/PreferencesMgr_AutoCreator.cs @@ -559,12 +559,12 @@ namespace BingoBrain dataDispatcher.Dispatch(PreferencesMsg.coinMakeupTaskH5Time); } } - public void SaveCoinMakeupTaskHistory() - { - AddToAutoDelaySaveList(PreferencesField.coinMakeupTaskHistory, CoinMakeupTaskHistory); - PreferencesDispatcher.Instance.Dispatch(PreferencesMsg.coinMakeupTaskHistory); - dataDispatcher.Dispatch(PreferencesMsg.coinMakeupTaskHistory); - } + // public void SaveCoinMakeupTaskHistory() + // { + // // AddToAutoDelaySaveList(PreferencesField.coinMakeupTaskHistory, CoinMakeupTaskHistory); + // PreferencesDispatcher.Instance.Dispatch(PreferencesMsg.coinMakeupTaskHistory); + // dataDispatcher.Dispatch(PreferencesMsg.coinMakeupTaskHistory); + // } public string short_name; public string long_name; diff --git a/Assets/BingoBrain/Register/BingoBoard.cs b/Assets/BingoBrain/Register/BingoBoard.cs index 430313d..c6b3a66 100644 --- a/Assets/BingoBrain/Register/BingoBoard.cs +++ b/Assets/BingoBrain/Register/BingoBoard.cs @@ -26,8 +26,8 @@ namespace BingoBrain private static void SetFont() { var uiManager = UI.Instance; - uiManager.RegisterDefaultFont("KHMERUIB"); - uiManager.RegisterFont("KHMERUIB"); + uiManager.RegisterDefaultFont("days_new"); + uiManager.RegisterFont("days_new"); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/Register/UIManagerBoard.cs b/Assets/BingoBrain/Register/UIManagerBoard.cs index 90e94e6..bc082ea 100644 --- a/Assets/BingoBrain/Register/UIManagerBoard.cs +++ b/Assets/BingoBrain/Register/UIManagerBoard.cs @@ -11,7 +11,6 @@ namespace BingoBrain FGUI.ABigImg.ABigImgBinder.BindAll(); FGUI.JLoading.JLoadingBinder.BindAll(); FGUI.JRewardPop.JRewardPopBinder.BindAll(); - FGUI.JLogin.JLoginBinder.BindAll(); FGUI.JBingoPlay.JBingoPlayBinder.BindAll(); FGUI.JMain.JMainBinder.BindAll(); FGUI.JTask.JTaskBinder.BindAll(); @@ -26,20 +25,10 @@ namespace BingoBrain FGUI.JMask.JMaskBinder.BindAll(); FGUI.JNetIdle.JNetIdleBinder.BindAll(); FGUI.JPrivacy.JPrivacyBinder.BindAll(); - FGUI.G004_webview.G004_webviewBinder.BindAll(); - FGUI.G007_makeup.G007_makeupBinder.BindAll(); FGUI.G002_login.G002_loginBinder.BindAll(); - FGUI.Common_animal.Common_animalBinder.BindAll(); - FGUI.G003_play_animal.G003_play_animalBinder.BindAll(); - FGUI.G006_menu_animal.G006_menu_animalBinder.BindAll(); - FGUI.G008_reward_animal.G008_reward_animalBinder.BindAll(); - FGUI.G009_video_animal.G009_video_animalBinder.BindAll(); - FGUI.G012_openReward_animal.G012_openReward_animalBinder.BindAll(); - FGUI.SaveingPot.SaveingPotBinder.BindAll(); - FGUI.failpack.failpackBinder.BindAll(); + FGUI.tixian.tixianBinder.BindAll(); + FGUI.Common_01.Common_01Binder.BindAll(); FGUI.bkg_jilu.bkg_jiluBinder.BindAll(); - FGUI.threeDaysGift.threeDaysGiftBinder.BindAll(); - FGUI.bkg_reward_new.bkg_reward_newBinder.BindAll(); } public static void AutoRegisterCommonPackages() @@ -48,8 +37,7 @@ namespace BingoBrain commonPackages.Add("ACommon"); commonPackages.Add("ABigImg"); - commonPackages.Add("Common_animal"); - + commonPackages.Add("Common_01"); UI.Instance.RegisterCommonPackages(commonPackages); } } diff --git a/Assets/BingoBrain/System/Game/BingoDataSystem.cs b/Assets/BingoBrain/System/Game/BingoDataSystem.cs index 7c451cc..5f3a8a8 100644 --- a/Assets/BingoBrain/System/Game/BingoDataSystem.cs +++ b/Assets/BingoBrain/System/Game/BingoDataSystem.cs @@ -54,7 +54,7 @@ namespace BingoBrain return; } -Debug.Log("????????????????????????3"); + Debug.Log("????????????????????????3"); var lastId = -1; var isRepeat = PreferencesMgr.Instance.MakeupTaskHistory.Count >= makeupVOModel.dataList.Count; @@ -90,7 +90,9 @@ Debug.Log("????????????????????????3"); makeupTaskData.orderID = GetRandomNum(8); PreferencesMgr.Instance.MakeupTaskHistory.Add(makeupTaskData); - makeupTaskData.SetStatus(MakeupTaskStatus.None); + + if ((GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().ExchangeProcessMode == 1) || (!GameHelper.isRDExchangeMode() && SaveData.GetSaveobject().CHProcessMode == 1)) makeupTaskData.SetStatus(MakeupTaskStatus.Level); + else makeupTaskData.SetStatus(MakeupTaskStatus.None); PreferencesMgr.Instance.SaveMakeupTaskHistory(); PreferencesMgr.Instance.MakeupTaskH5Time = 0; @@ -101,7 +103,7 @@ Debug.Log("????????????????????????3"); } public static void CheckMakeupTaskData() { - Debug.Log("????????????????????????1"); + Debug.Log("????????????????????????1"); if (!GameHelper.IsGiftSwitch()) { return; @@ -367,31 +369,31 @@ Debug.Log("????????????????????????3"); } } - if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0) - { - var taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); - if (taskData.status == MakeupTaskStatus.Task) - { - var cardRedeemNewModel = ConfigSystem.GetConfig(); - var makeupVo = cardRedeemNewModel.dataList.FirstOrDefault(card => card.id == taskData.tableId); - if (makeupVo != null && taskData.videoCount < makeupVo.fee_need) - { - taskData.videoCount++; - PreferencesMgr.Instance.SaveCoinMakeupTaskHistory(); - } - } - } - if (SaveData.GetSaveobject().saveingpot_history.Count > 0) + // if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0) + // { + // var taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); + // if (taskData.status == MakeupTaskStatus.Task) + // { + // var cardRedeemNewModel = ConfigSystem.GetConfig(); + // var makeupVo = cardRedeemNewModel.dataList.FirstOrDefault(card => card.id == taskData.tableId); + // if (makeupVo != null && taskData.videoCount < makeupVo.fee_need) + // { + // taskData.videoCount++; + // PreferencesMgr.Instance.SaveCoinMakeupTaskHistory(); + // } + // } + // } + if (SaveData.GetSaveobject().saveingpot_history.Count > 0) { SaveingPotHelper.TestingClearTime(); CheckSpeedUpTaskData(2); SaveingPotClass taskData = SaveData.GetSaveobject().saveingpot_history.Last(); makeup_2 makeupVo = ConfigSystem.GetConfig().GetData(taskData.tableId); - SaveData.GetSaveobject().saveingpot_cash += makeupVo.ADIncrease; - GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot); + SaveData.GetSaveobject().saveingpot_ch += makeupVo.ADIncrease; + // GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot); if (ConfigSystem.GetConfig().PiggyBankSwitch == 1 && GameHelper.IsGiftSwitch()) { - if ((SaveData.GetSaveobject().saveingpot_cash > taskData.amount) && (!taskData.auto_show) && !UI.Instance.IsExistUI(UIConst.H5UI)) + if ((SaveData.GetSaveobject().saveingpot_ch > taskData.amount) && (!taskData.auto_show) && !UI.Instance.IsExistUI(UIConst.H5UI)) { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SaveingPotUI_Open); @@ -428,31 +430,31 @@ Debug.Log("????????????????????????3"); return; } //if (PreferencesMgr.Instance.CoinMakeupTaskHistory == null) PreferencesMgr.Instance.CoinMakeupTaskHistory = new List(); - MakeupTaskData taskData = null; - if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count != 0) taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); - if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0 || taskData.status == MakeupTaskStatus.Inline) - { - AddCoinMakeupTaskData(); - } - else - { - foreach (var makeuptaskData in PreferencesMgr.Instance.CoinMakeupTaskHistory) - { - if (makeuptaskData.status == MakeupTaskStatus.Inline - && makeuptaskData.inlineNum > GameHelper.GetCommonModel().inlineMin) - { - makeuptaskData.inlineNum -= UnityEngine.Random.Range( - GameHelper.GetCommonModel().inlineLoginDown[0], - GameHelper.GetCommonModel().inlineLoginDown[1]); - if (makeuptaskData.inlineNum < GameHelper.GetCommonModel().inlineMin) - { - makeuptaskData.inlineNum = GameHelper.GetCommonModel().inlineMin; - } - } - } + // MakeupTaskData taskData = null; + // if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count != 0) taskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); + // if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0 || taskData.status == MakeupTaskStatus.Inline) + // { + // AddCoinMakeupTaskData(); + // } + // else + // { + // foreach (var makeuptaskData in PreferencesMgr.Instance.CoinMakeupTaskHistory) + // { + // if (makeuptaskData.status == MakeupTaskStatus.Inline + // && makeuptaskData.inlineNum > GameHelper.GetCommonModel().inlineMin) + // { + // makeuptaskData.inlineNum -= UnityEngine.Random.Range( + // GameHelper.GetCommonModel().inlineLoginDown[0], + // GameHelper.GetCommonModel().inlineLoginDown[1]); + // if (makeuptaskData.inlineNum < GameHelper.GetCommonModel().inlineMin) + // { + // makeuptaskData.inlineNum = GameHelper.GetCommonModel().inlineMin; + // } + // } + // } - PreferencesMgr.Instance.SaveCoinMakeupTaskHistory(); - } + // PreferencesMgr.Instance.SaveCoinMakeupTaskHistory(); + // } } public static void AddCoinMakeupTaskData() { @@ -465,46 +467,46 @@ Debug.Log("????????????????????????3"); var lastId = -1; - if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0) - { - var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); + // if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count > 0) + // { + // var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last(); - if (makeupTaskData.status == MakeupTaskStatus.None - || makeupTaskData.status == MakeupTaskStatus.Task) - { - return; - } + // if (makeupTaskData.status == MakeupTaskStatus.None + // || makeupTaskData.status == MakeupTaskStatus.Task) + // { + // return; + // } - lastId = makeupTaskData.tableId; - } + // lastId = makeupTaskData.tableId; + // } - var lastVoId = cardRedeemNewVOModel.dataList.Last().id; - if (lastId == lastVoId) - { - lastId = lastVoId - 1; - } + // var lastVoId = cardRedeemNewVOModel.dataList.Last().id; + // if (lastId == lastVoId) + // { + // lastId = lastVoId - 1; + // } - foreach (var makeupVo in cardRedeemNewVOModel.dataList) - { - if (makeupVo.id > lastId) - { - var makeupTaskData = new MakeupTaskData(); - //makeupTaskData.makeupTaskType = MakeupTaskType.Coin; - makeupTaskData.tableId = makeupVo.id; - makeupTaskData.id = PreferencesMgr.Instance.CoinMakeupTaskHistory.Count + 1; - makeupTaskData.is_gold = true; - // makeupTaskData.amountStr = GameHelper.GetMoneyStr(makeupVo); - //makeupTaskData.orderID = GameHelper.GetRandomNum(8); + // foreach (var makeupVo in cardRedeemNewVOModel.dataList) + // { + // if (makeupVo.id > lastId) + // { + // var makeupTaskData = new MakeupTaskData(); + // //makeupTaskData.makeupTaskType = MakeupTaskType.Coin; + // makeupTaskData.tableId = makeupVo.id; + // makeupTaskData.id = PreferencesMgr.Instance.CoinMakeupTaskHistory.Count + 1; + // makeupTaskData.is_gold = true; + // // makeupTaskData.amountStr = GameHelper.GetMoneyStr(makeupVo); + // //makeupTaskData.orderID = GameHelper.GetRandomNum(8); - PreferencesMgr.Instance.CoinMakeupTaskHistory.Add(makeupTaskData); - makeupTaskData.SetStatus(MakeupTaskStatus.None); - PreferencesMgr.Instance.SaveCoinMakeupTaskHistory(); + // PreferencesMgr.Instance.CoinMakeupTaskHistory.Add(makeupTaskData); + // makeupTaskData.SetStatus(MakeupTaskStatus.None); + // PreferencesMgr.Instance.SaveCoinMakeupTaskHistory(); - PreferencesMgr.Instance.CoinMakeupTaskH5Time = 0; - break; - } - } + // PreferencesMgr.Instance.CoinMakeupTaskH5Time = 0; + // break; + // } + // } } private void CheckSpeedUpTaskData(int type = 1) { diff --git a/Assets/BingoBrain/System/Game/BingoSystem.cs b/Assets/BingoBrain/System/Game/BingoSystem.cs index 0d27323..6aaad91 100644 --- a/Assets/BingoBrain/System/Game/BingoSystem.cs +++ b/Assets/BingoBrain/System/Game/BingoSystem.cs @@ -156,7 +156,8 @@ namespace BingoBrain UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); if (GameHelper.IsGiftSwitch() && Random.Range(0, 100) < ConfigSystem.GetConfig().backhallrate) { - BingoHalldUI.Instance.OnClickHall(); + // BingoHalldUI.Instance.OnClickHall(); + BingoHalldUI.Instance.OnClickMainTab(); } else { diff --git a/Assets/BingoBrain/System/Game/JsonSystem.cs b/Assets/BingoBrain/System/Game/JsonSystem.cs index 77328af..97f8df4 100644 --- a/Assets/BingoBrain/System/Game/JsonSystem.cs +++ b/Assets/BingoBrain/System/Game/JsonSystem.cs @@ -98,7 +98,7 @@ namespace BingoBrain // Debug.Log("kkkkkkkkkkkkkkkkkkkkkk" + needDownloadConfigFile); // Debug.Log("kkkkkkkkkkkkkkkkkkkkkk" + savedCfgName); - if (needDownloadConfigFile) + if (false) { IsfvKit.StartCoroutine(CachKit.GetTextFromUrl($"{NetworkKit.CDNUrl}config/{CDNConfigFileName}", configFileName, (content) => @@ -137,6 +137,7 @@ namespace BingoBrain private void ParseConfig(string json) { + Debug.Log(json); if (json == null) { return; @@ -289,10 +290,14 @@ namespace BingoBrain GetGameConfig(dictionary); GetGameConfig(dictionary); GetGameConfig(dictionary); + + GetGameConfig(dictionary);//兑换 + Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig().dataList)); exBrPoolModel.config_name_list = ConfigSystem.GetConfig().dataList[0].user_name.Split(",").ToList(); exBrPoolModel.config_money_list = ConfigSystem.GetConfig().dataList[0].amount.Split(",").ToList(); exBrPoolModel_2.config_name_list = ConfigSystem.GetConfig().dataList[0].user_name.Split(",").ToList(); exBrPoolModel_2.config_money_list = ConfigSystem.GetConfig().dataList[0].amount.Split(",").ToList(); + // exBrPoolModel.getFaqData(); if (PreferencesMgr.Instance.ActiveMissions != null) { @@ -329,7 +334,13 @@ namespace BingoBrain } } - + Debug.Log(SaveData.GetSaveobject()); + if (SaveData.GetSaveobject().ExchangeProcessMode < 0) + { + SaveData.GetSaveobject().ExchangeModeToggle = ConfigSystem.GetConfig().ExchangeModeToggle; + SaveData.GetSaveobject().ExchangeProcessMode = ConfigSystem.GetConfig().ExchangeProcessMode; + SaveData.GetSaveobject().CHProcessMode = ConfigSystem.GetConfig().CHProcessMode; + } // Debug.Log("888888888888888888"); } diff --git a/Assets/BingoBrain/System/Game/TuSystem.cs b/Assets/BingoBrain/System/Game/TuSystem.cs index 079b4c9..fcc84e5 100644 --- a/Assets/BingoBrain/System/Game/TuSystem.cs +++ b/Assets/BingoBrain/System/Game/TuSystem.cs @@ -44,7 +44,7 @@ namespace BingoBrain } else { - GameHelper.Toast("outTicket", true); + // GameHelper.Toast("outTicket", true); } break; diff --git a/Assets/BingoBrain/System/Game/UsaSystem.cs b/Assets/BingoBrain/System/Game/UsaSystem.cs index 566a62b..a766bba 100644 --- a/Assets/BingoBrain/System/Game/UsaSystem.cs +++ b/Assets/BingoBrain/System/Game/UsaSystem.cs @@ -41,13 +41,13 @@ public class UsaSystem : BaseSystem if (!GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.GodPleUI_Open, rewardData); else { - var temp = new SuccessData(); - temp.IsWin = true; - temp.cash_number = (float)rewardData.rewardDataList[0].value; - temp.rate = (int)GameHelper.GetRewardValue(2)[1]; - temp.IsLevelSuccess = false; - temp.IsH5Reward = true; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); + // var temp = new SuccessData(); + // temp.IsWin = true; + // temp.cash_number = (float)rewardData.rewardDataList[0].value; + // temp.rate = (int)GameHelper.GetRewardValue(2)[1]; + // temp.IsLevelSuccess = false; + // temp.IsH5Reward = true; + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); } } else diff --git a/Assets/BingoSun/BrigdeIOS.cs b/Assets/BingoSun/BrigdeIOS.cs index df81c9c..a7fa6fe 100644 --- a/Assets/BingoSun/BrigdeIOS.cs +++ b/Assets/BingoSun/BrigdeIOS.cs @@ -55,6 +55,8 @@ public class BrigdeIOS public static extern void setRewardBtnTag(bool flag); [DllImport("__Internal")] public static extern void SetOffset(int offset_y, int offset_y2); + [DllImport("__Internal")] + public static extern void copyText(string text); } diff --git a/Assets/BingoSun/Plugins/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs b/Assets/BingoSun/Plugins/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs index d46b1c6..bc14a2c 100644 --- a/Assets/BingoSun/Plugins/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs +++ b/Assets/BingoSun/Plugins/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs @@ -57,7 +57,7 @@ namespace Spine.Unity.Editor { #endif public float defaultScale = DEFAULT_DEFAULT_SCALE; - internal const float DEFAULT_DEFAULT_MIX = 0.2f; + internal const float DEFAULT_DEFAULT_MIX = 0f; public float defaultMix = DEFAULT_DEFAULT_MIX; internal const string DEFAULT_DEFAULT_SHADER = "Spine/Skeleton"; diff --git a/Assets/BingoSun/Scripts/AppsFlyerObjectScript1.cs b/Assets/BingoSun/Scripts/AppsFlyerObjectScript1.cs index 8908562..2c6600a 100644 --- a/Assets/BingoSun/Scripts/AppsFlyerObjectScript1.cs +++ b/Assets/BingoSun/Scripts/AppsFlyerObjectScript1.cs @@ -7,6 +7,7 @@ using BingoBrain; using BingoBrain.Core; using System; using DG.Tweening; +using BingoBrain.HotFix; public class AppsFlyerObjectScript1 : MonoBehaviour, IAppsFlyerConversionData { @@ -46,7 +47,7 @@ public class AppsFlyerObjectScript1 : MonoBehaviour, IAppsFlyerConversionData { if (GameHelper.IsConnect()) { - GameDispatcher.Instance.Dispatch(GameMsg.Network_reconnection); + GameDispatcher.Instance.Dispatch(BingoInfo.Network_reconnection); } IsfvKit.StopCoroutine(m_Coroutine); diff --git a/Assets/BingoSun/Scripts/Keril/BingoBea.cs b/Assets/BingoSun/Scripts/Keril/BingoBea.cs index 88450c2..c0bbc72 100644 --- a/Assets/BingoSun/Scripts/Keril/BingoBea.cs +++ b/Assets/BingoSun/Scripts/Keril/BingoBea.cs @@ -42,6 +42,7 @@ public string attribution = "organic"; { // LastFocusFlaseTime = DateTimeBoardk.Instance.GetServerCurrTimestamp(); AppDispatcher.Instance.Dispatch(CsjInfoC.App_Focus_False, focus); + SaveData.saveDataFunc(); } } public override void Init() diff --git a/Assets/BingoSun/Scripts/LoginSystem.cs b/Assets/BingoSun/Scripts/LoginSystem.cs index ab71f85..2343621 100644 --- a/Assets/BingoSun/Scripts/LoginSystem.cs +++ b/Assets/BingoSun/Scripts/LoginSystem.cs @@ -38,15 +38,15 @@ public class LoginSystem : BaseSystem private void AddListener() { - NetworkDispatcher.Instance.AddListener(NetworkMsg.Login, OnRequestLogin); - NetworkDispatcher.Instance.AddListener(NetworkMsg.Reconnect, OnResponseReconnect); + // NetworkDispatcher.Instance.AddListener(NetworkMsg.Login, OnRequestLogin); + // NetworkDispatcher.Instance.AddListener(NetworkMsg.Reconnect, OnResponseReconnect); } private void RemoveListener() { - NetworkDispatcher.Instance.RemoveListener(NetworkMsg.Login, OnRequestLogin); + // NetworkDispatcher.Instance.RemoveListener(NetworkMsg.Login, OnRequestLogin); - NetworkDispatcher.Instance.RemoveListener(NetworkMsg.Reconnect, OnResponseReconnect); + // NetworkDispatcher.Instance.RemoveListener(NetworkMsg.Reconnect, OnResponseReconnect); } @@ -65,81 +65,81 @@ public class LoginSystem : BaseSystem Debug.Log(SystemInfo.deviceUniqueIdentifier); GameHelper.PostFunnelLogin("loginSend"); Debug.Log(JsonConvert.SerializeObject(requestLoginData)); - NetworkKit.Post("login", requestLoginData, (isSuccess, loginData) => - { + //zhushi // NetworkKit.Post("login", requestLoginData, (isSuccess, loginData) => + // { - if (isSuccess) - { - var loginModel = GameHelper.GetLoginModel(); - loginModel.cdn_url = loginData.cdn_url; - loginModel.setting = loginData.setting; - loginModel.play_data = loginData.play_data; - loginModel.token = loginData.token; - loginModel.uid = loginData.uid; - loginModel.country = loginData.country; - loginModel.expires_at = loginData.expires_at; - loginModel.is_magic = loginData.is_magic; - loginModel.invite_code = loginData.invite_code; - loginModel.invite_url = loginData.invite_url; - loginModel.last_login_time = loginData.last_login_time; - loginModel.login_time = loginData.login_time; - loginModel.reg_time = loginData.reg_time; - loginModel.new_player = loginData.new_player; - loginModel.debug_log = loginData.debug_log; - loginModel.enwp = loginData.enwp; + // if (isSuccess) + // { + // var loginModel = GameHelper.GetLoginModel(); + // loginModel.cdn_url = loginData.cdn_url; + // loginModel.setting = loginData.setting; + // loginModel.play_data = loginData.play_data; + // loginModel.token = loginData.token; + // loginModel.uid = loginData.uid; + // loginModel.country = loginData.country; + // loginModel.expires_at = loginData.expires_at; + // loginModel.is_magic = loginData.is_magic; + // loginModel.invite_code = loginData.invite_code; + // loginModel.invite_url = loginData.invite_url; + // loginModel.last_login_time = loginData.last_login_time; + // loginModel.login_time = loginData.login_time; + // loginModel.reg_time = loginData.reg_time; + // loginModel.new_player = loginData.new_player; + // loginModel.debug_log = loginData.debug_log; + // loginModel.enwp = loginData.enwp; - loginModel.preferences = new Preferences(); - NetworkKit.CDNUrl = $"{loginData.cdn_url}/"; - NetworkKit.SetCacheToken(loginData.token); - //RequestHeart(); - DateTimeBoardk.Instance.SetServerCurrTimestamp(loginData.login_time); - Sequence mLoopSequence = DOTween.Sequence(); - mLoopSequence.AppendCallback(() => - { - RequestHeart(); + // loginModel.preferences = new Preferences(); + // NetworkKit.CDNUrl = $"{loginData.cdn_url}/"; + // NetworkKit.SetCacheToken(loginData.token); + // //RequestHeart(); + // DateTimeBoardk.Instance.SetServerCurrTimestamp(loginData.login_time); + // Sequence mLoopSequence = DOTween.Sequence(); + // mLoopSequence.AppendCallback(() => + // { + // RequestHeart(); - }).AppendInterval(60).SetLoops(-1); - //TimerHelper.UnscaleGeneral.AddLoopTimer(60, (timer) => { RequestHeart(); }); - //NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetPlayData); - //UICtrlDispatcher.Instance.Dispatch(SkinInfo.EnterBingoUI_Open); - PreferencesMgr.Instance.PlayerName = loginData.invite_code; - NetworkDispatcher.Instance.Dispatch(ExternalInfo.GetConfig); - MaxADKit.Init(); - GameHelper.PostFunnelLogin("loginRecv", true); - if (GameHelper.IsGiftSwitch()) - { - GameObject.Find("MainCameraRoot").SetActive(false); - } - else{ - GameObject.Find("sheep_parent").SetActive(false); - } - } - else - { - //UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetLoadingUI_Close); - Debug.Log("登陆请求失败"); - GameHelper.PostFunnelLogin("loginRecv", false); + // }).AppendInterval(60).SetLoops(-1); + // //TimerHelper.UnscaleGeneral.AddLoopTimer(60, (timer) => { RequestHeart(); }); + // //NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetPlayData); + // //UICtrlDispatcher.Instance.Dispatch(SkinInfo.EnterBingoUI_Open); + // PreferencesMgr.Instance.PlayerName = loginData.invite_code; + // NetworkDispatcher.Instance.Dispatch(ExternalInfo.GetConfig); + // MaxADKit.Init(); + // GameHelper.PostFunnelLogin("loginRecv", true); + // if (GameHelper.IsGiftSwitch()) + // { + // GameObject.Find("MainCameraRoot").SetActive(false); + // } + // else{ + // GameObject.Find("sheep_parent").SetActive(false); + // } + // } + // else + // { + // //UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.NetLoadingUI_Close); + // Debug.Log("登陆请求失败"); + // GameHelper.PostFunnelLogin("loginRecv", false); - float times = loginCount == 0 ? 0 : 5f; + // float times = loginCount == 0 ? 0 : 5f; - DOVirtual.DelayedCall(times,()=>{ - if (loginCount < LoginCountLimit) { - loginCount++; - RequestLogin(); + // DOVirtual.DelayedCall(times,()=>{ + // if (loginCount < LoginCountLimit) { + // loginCount++; + // RequestLogin(); - } else { - loginCount = 0; - Action _OnFail = () => - { - NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login); - }; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.TipsViewUI_Open, _OnFail); - } - }); - } - }); + // } else { + // loginCount = 0; + // Action _OnFail = () => + // { + // NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login); + // }; + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.TipsViewUI_Open, _OnFail); + // } + // }); + // } + // }); } diff --git a/Assets/BingoSun/Scripts/MaxPayManager.cs b/Assets/BingoSun/Scripts/MaxPayManager.cs deleted file mode 100644 index 7d00be9..0000000 --- a/Assets/BingoSun/Scripts/MaxPayManager.cs +++ /dev/null @@ -1,550 +0,0 @@ -using UnityEngine; -using BingoBrain; -using DG.Tweening; -using Newtonsoft.Json; -using System.Collections.Generic; -using System.Collections; -using UnityEngine.UI; -using System.Linq; -using System; -using BingoBrain.Core; -using BingoBrain; -using BingoBrain.HotFix; - - -public class MaxPayManager -{ - public static readonly MaxPayManager Instance = new MaxPayManager(); - - public static bool isPay = false; - - // public static Dictionary statusDictionary = new(); - MaxPayManager() - { - - } - - public static string buy_one = "com.sugar.space.24.99"; - // public static string buy_gold_1 = "com.sugar.shop.1.99"; - // public static string buy_gold_2 = "com.sugar.shop.3.99"; - // public static string buy_gold_3 = "com.sugar.shop.9.99"; - // public static string buy_gold_4 = "com.sugar.shop.19.99"; - - public static string remove_ad = "com.sugar.remove.2.99"; - public static string battle_pass = "com.sugar.pass.9.99"; - public static string pack_reward = "com.sugar.reward.1.99"; - public static string fail_pack = "com.sugar.fail_pack"; - public string three_days_gift = "com.bingo.3daygift1.1.99"; - public void Buy(MaxPayClass _data) - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Open); - StopPayCoroutine(); - SaveData.GetSaveobject().max_pay_object = _data; - MaxPay(_data); - } - - /// - /// 发起第三发支付 - /// - public void MaxPay(MaxPayClass data_) - { - // Debug.Log($"[UNITY] Purchase;;;;;;{JsonConvert.SerializeObject(data_)}"); - - //is debug test--------测试代码 - if (Application.identifier != NetworkMsg.Identifier) - // if (Application.identifier == NetworkMsg.Identifier) - { - MaxPayClass paydata = data_; - SaveData.pay_time = Time.time; - - if (data_.sku == buy_one) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.buy_one_click, 1); - } - else if (data_.sku == remove_ad) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.remove_ad_click, 1); - } - else if (data_.sku == pack_reward) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.pack_click, 1); - } - else if (data_.sku.StartsWith("buy_gold")) - { - int startIndex = "buy_gold".Length; - string suffix = paydata.sku[startIndex..]; // 截取 "gold" 后的所有字符 - string eventClickName = $"gold_click_{suffix}"; - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, eventClickName, 1); - - } - else if (data_.sku == battle_pass) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.pass_click, 1); - } - else if (data_.sku == fail_pack) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.fail_click, 1); - } - else if (data_.sku == three_days_gift) - { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.three_days_gift_click, 1); - } - PayerData test = new PayerData() - { - amount = data_.amount, - }; - - //max 支付订单创建 - NetworkKit.PostWithHeader("shop/maxPayIn", test, (isSuccess, obj) => - { - if (isSuccess) - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close); - - Debug.Log($"max 支付订单创建:{JsonConvert.SerializeObject(obj)}"); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PixPayUI_Open, obj); - SaveData.GetSaveobject().max_pay_object.innerOrderId = obj.order_id; - paydata.status = 1; - SavePayData(obj.order_id, paydata); - isPay = true; - OpenBrowser.OpenURL(obj.pay_url); - - } - }); - - } - else - { - // GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, data_.sku); - } - } - - public void SavePayData(string orderId, MaxPayClass payData) - { - // Debug.Log($"max 支付 SavePayData: orderId={orderId} status={payData}"); - // 加载已保存的支付数据 - var payDataJson = PlayerPrefs.GetString("three_pay_data", "{}"); - var statusDictionary = JsonConvert.DeserializeObject>(payDataJson); - - // Debug.Log($"max 支付 statusDictionary {statusDictionary}"); - // 判断是否已有相同的 orderId - if (statusDictionary.ContainsKey(orderId)) - { - // Debug.Log($"max 支付 statusDictionary 已存在 orderId {orderId}"); - // 更新现有条目的状态 - statusDictionary[orderId] = payData; - } - else - { - // 添加新的条目 - // Debug.Log($"max 支付 statusDictionary 不存在 orderId {orderId}"); - statusDictionary.Add(orderId, payData); - } - - // 保存更新后的数据 - PlayerPrefs.SetString("three_pay_data", JsonConvert.SerializeObject(statusDictionary)); - // Debug.Log($"max 支付 three_pay_data {JsonConvert.SerializeObject(statusDictionary)}"); - - } - - public MaxPayClass GetPayData(string orderId) - { - var payDataJson = PlayerPrefs.GetString("three_pay_data", "{}"); - var statusDictionary = JsonConvert.DeserializeObject>(payDataJson); - - if (statusDictionary.ContainsKey(orderId)) - { - return statusDictionary[orderId]; - } - - return null; - } - - public bool GetPayStatus() - { - bool isCheck = false; - - var payDataJson = PlayerPrefs.GetString("three_pay_data", "{}"); - var statusDictionary = JsonConvert.DeserializeObject>(payDataJson); - if (statusDictionary == null) return false; - foreach (var entry in statusDictionary) - { - if (entry.Value.status == 1) - { - isCheck = true; - break; - } - } - - return isCheck; - } - - private int PayStatus = -1; - - private Coroutine PayCoroutine; - public IEnumerator ProcessPayData() - { - var payDataJson = PlayerPrefs.GetString("three_pay_data", "{}"); - var statusDictionary = JsonConvert.DeserializeObject>(payDataJson); - - foreach (var entry in statusDictionary.OrderByDescending(pair => pair.Key)) - { - // Debug.Log($"max 支付 ProcessPayData0======{entry.Key} status:{entry.Value}"); - if (entry.Value.status == 1) - { - bool keepRequesting = true; - - while (keepRequesting) - { - // 发起请求 - PaySuccess(entry.Key); - yield return new WaitForSeconds(5f); - // Debug.Log($"max 支付 ProcessPayData1======{entry.Key} status:{PayStatus}"); - if (PayStatus == 1) - { - // 如果返回值为1，则等待5秒后再次请求 - - } - else - { - // 如果返回值不为1，则停止循环 - PayStatus = -1; - keepRequesting = false; - } - - yield return null; // 等待本次请求完成 - - } - } - } - } - - public void StopPayCoroutine() - { - if (PayCoroutine != null) - { - IsfvKit.StopCoroutine(PayCoroutine); - } - } - - public void PaySuccess() - { - Debug.Log("max 支付 StartCoroutine------"); - PayCoroutine = IsfvKit.StartCoroutine(ProcessPayData()); - } - public void PaySuccess(string orderId) - { - var test = new maxOrder(); - test.order_id = orderId; - //max 支付订单查询 - NetworkKit.PostWithHeader("shop/maxPayOrderQuery", test, (isSuccess, obj) => - { - Debug.Log($"max 支付订单查询: id= {orderId} is succ={isSuccess}"); - if (isSuccess) - { - Debug.Log($"max 支付订单查询: 成功,statu====: {obj.status}"); - // Debug.Log($"max 支付订单查询: {JsonConvert.SerializeObject(obj)}"); - PayStatus = obj.status; - - //1:支付中,需要定时查询 - if (obj.status == 1) - { - var paydata = GetPayData(orderId); - if (paydata != null) - { - paydata.status = 1; - SavePayData(obj.order_id, paydata); - } - - // reCreatPur(); - } - //2:支付成功,发奖 - else if (obj.status == 2) - { - var paydata = GetPayData(orderId); - if (paydata != null) - { - paydata.status = 2; - SavePayData(obj.order_id, paydata); - } - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close); - - bool isOpen = false; - if (paydata.sku == buy_one) - { - isOpen = HandleSku(paydata.sku, UIConst.BuyslotUI, BuriedPointEvent.buy_one_open, BuriedPointEvent.buy_one_success); - } - else if (paydata.sku == remove_ad) - { - isOpen = HandleSku(paydata.sku, UIConst.PackrewardUI, BuriedPointEvent.remove_ad_open, BuriedPointEvent.remove_ad_success); - } - else if (paydata.sku == pack_reward) - { - isOpen = HandleSku(paydata.sku, UIConst.PackrewardUI, BuriedPointEvent.pack_open, BuriedPointEvent.pack_success); - } - else if (paydata.sku.StartsWith("buy_gold")) - { - int startIndex = "buy_gold".Length; - string suffix = paydata.sku[startIndex..]; // 截取 "gold" 后的所有字符 - string eventOpenName = $"gold_open_{suffix}"; - string eventSuccessName = $"gold_success_{suffix}"; - - isOpen = HandleSku(paydata.sku, UIConst.BuygoldUI, eventOpenName, eventSuccessName); - - } - else if (paydata.sku == battle_pass) - { - isOpen = HandleSku(paydata.sku, UIConst.NewTaskUI, BuriedPointEvent.pass_open, BuriedPointEvent.pass_success); - } - else if (paydata.sku == fail_pack) - { - isOpen = HandleSku(paydata.sku, UIConst.PackrewardUI, BuriedPointEvent.fail_show, BuriedPointEvent.fail_buy_success); ; - } - else if (paydata.sku == three_days_gift) - { - isOpen = HandleSku(paydata.sku, UIConst.ThreeDaysGiftUI, BuriedPointEvent.three_days_gift_show, BuriedPointEvent.three_days_gift_buy_success); - } - else - { - // 处理未知的 sku 值 - Debug.LogError($"Unknown SKU: {paydata.sku}"); - throw new ArgumentException("Unknown SKU"); - } - - // if (isOpen) { - GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, paydata.sku); - // } else { - // GetPayPrice(paydata); - // } - SaveingPotClass taskData = SaveData.GetSaveobject().saveingpot_history.Last(); - makeup_2 makeupVo = ConfigSystem.GetConfig().GetData(taskData.tableId); - SaveData.GetSaveobject().saveingpot_cash += ((float)paydata.amount) / 100 * makeupVo.PayIncrease; ; - if (ConfigSystem.GetConfig().PiggyBankSwitch == 1 && GameHelper.IsGiftSwitch()) - { - if ((SaveData.GetSaveobject().saveingpot_cash > taskData.amount) && (!taskData.auto_show) && !UI.Instance.IsExistUI(UIConst.H5UI)) - { - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SaveingPotUI_Open); - taskData.auto_show = true; - } - } - GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot); - DOVirtual.DelayedCall(1, () => - { - SaveData.GetSaveobject().max_pay_object = null; - var paydata = GetPayData(orderId); - if (paydata != null) - { - paydata.status = 4; - SavePayData(obj.order_id, paydata); - } - - }); - } - //3:支付失败,已领奖或者支付失败,或者查询次数达到上限 - else if (obj.status == 3) - { - var paydata = GetPayData(orderId); - if (paydata != null) - { - paydata.status = 3; - SavePayData(obj.order_id, paydata); - } - OnPayFailed(orderId); - } - //4:已发货,服务端记录已经发过奖,若客户端未发奖可发奖 - else - { - DOVirtual.DelayedCall(1, () => - { - var paydata = GetPayData(orderId); - if (paydata != null) - { - paydata.status = 4; - SavePayData(obj.order_id, paydata); - } - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close); - SaveData.GetSaveobject().max_pay_object = null; - GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, paydata.sku); - - - }); - } - } - else - { - // Debug.Log("max 支付 验证订单失败"); - // Debug.Log($"max 支付 验证订单失败: {JsonConvert.SerializeObject(obj)}"); - //验证订单失败 - // reCreatPur(); - // status = -1; - PayStatus = -1; - } - }); - - } - - bool HandleSku(string sku, string uiConst, string openEvent, string successEvent) - { - bool isOpen; - try - { - isOpen = CheckIsOpen(uiConst); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, openEvent, 1); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, successEvent, 1); - } - catch (Exception ex) - { - // 记录异常信息 - Debug.LogError($"Error handling SKU {sku}: {ex.Message}"); - // 可以选择重新抛出异常或进行其他处理 - throw; - } - - return isOpen; - } - - public void reCreatPur()//重新验证订单 - { - // Debug.Log($"max 支付 reCreatPur 重新验证订单: pay_object_data===: {JsonConvert.SerializeObject(SaveData.GetSaveobject().max_pay_object)}"); - - // if (SaveData.GetSaveobject().max_pay_object != null) - // { - // CrazyAsyKit.StartCoroutine(ProcessPayData()); - // } - } - - public void OnPayFailed(string orderId) - { - var paydata = GetPayData(orderId); - - if (paydata == null) - { - return; - } - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close); - // Debug.LogWarning("OnPurchaseFailedproduct:" + product.transactionID + " failureReason:" + failureReason); - - - DOVirtual.DelayedCall(1, () => - { - SaveData.GetSaveobject().max_pay_object = null; - }); - } - - - private bool CheckIsOpen(string name) - { - var isOpen = UI.Instance.IsExistUI(name); - - return isOpen; - } - - //适用这个方法领奖，说明购买界面已经关闭 - private void GetPayPrice(MaxPayClass paydata) - { - decimal rewardNum = 0; - if (paydata.sku == buy_one) - { - SaveData.GetSaveobject().have_slot = true; - } - else if (paydata.sku == remove_ad) - { - var list = ConfigSystem.GetConfig().dataList; - if (list.Count > 0) - { - rewardNum = list[1].coins_quantity; - } - - //标记已经购买过 - SaveData.GetSaveobject().is_get_packreward = true; - - } - else if (paydata.sku == pack_reward) - { - var list = ConfigSystem.GetConfig().dataList; - if (list.Count > 0) - { - rewardNum = list[0].coins_quantity; - } - //标记已经购买过 - SaveData.GetSaveobject().is_get_removead = true; - } - else if (paydata.sku.StartsWith("buy_gold")) - { - int startIndex = "buy_gold".Length; - string suffix = paydata.sku[startIndex..]; // 截取 "gold" 后的所有字符 - rewardNum = GetGoldRewradNum(int.Parse(suffix)); - } - else if (paydata.sku == battle_pass) - { - //标记已经购买过 - SaveData.GetSaveobject().is_get_battlepass = true; - } - if (rewardNum > 0) - { - GetPayReward(rewardNum); - } - } - - private static decimal GetGoldRewradNum(int index) - { - decimal rewardNum = 0; - var list = ConfigSystem.GetConfig().dataList; - if (list.Count > 0 && list.Count > index) - { - rewardNum = list[index].Actual_coins; - } - - return rewardNum; - } - - private void GetPayReward(decimal goldNum) - { - if (goldNum == 0) return; - - var start = new Vector2(540, 960); - var rewardData = new RewardData(); - var rewardSingleData = new Goda(101, goldNum, RewardOrigin.AdTask) - { - startPosition = start, - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - - GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); - } -} - -public class maxOrder -{ - public string order_id; - -} - -public class MaxPayClass -{ - public string innerOrderId; - public int amount; - public string sku; - public string currency = "USD"; - public int status; -} - -public class PayerData -{ - public string name; - public string tel; - public string email; - public int amount; -} - -//orderState 是返回对象的类型 -public class orderState -{ - public string order_id; - public int status; -} \ No newline at end of file diff --git a/Assets/BingoSun/Scripts/MaxPayManager.cs.meta b/Assets/BingoSun/Scripts/MaxPayManager.cs.meta deleted file mode 100644 index bdf91e3..0000000 --- a/Assets/BingoSun/Scripts/MaxPayManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2666fefcd878c49c8937ca7b17b328f6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoSun/Scripts/NetworkKit.cs b/Assets/BingoSun/Scripts/NetworkKit.cs index 55ad79f..91b9220 100644 --- a/Assets/BingoSun/Scripts/NetworkKit.cs +++ b/Assets/BingoSun/Scripts/NetworkKit.cs @@ -39,10 +39,10 @@ public class NetworkKit var requestJson = SerializeUtil.ToJsonIndented(requestData); var url2 = url; -#if BingoBrainRelease +// #if BingoBrainRelease url2 = Base64Kit.Encode(url); requestJson = Base64Kit.Encode(requestJson); -#endif +// #endif var bytes = Encoding.UTF8.GetBytes(requestJson); var url1 = BingoBrain.Network.domainUrl + url2; //Debug.Log($"Url: {url1}"); @@ -69,14 +69,14 @@ public class NetworkKit else { var receiveContent = loginRequest.downloadHandler.text; -#if BingoBrainRelease +// #if BingoBrainRelease if (!receiveContent.IsNullOrWhiteSpace()) { receiveContent = receiveContent.Substring(0, receiveContent.Length - 1); receiveContent = receiveContent.Substring(1); receiveContent = Base64Kit.Decode(receiveContent); } -#endif +// #endif //Debug.Log(url + "--------" + loginRequest.downloadHandler.text); //Debug.Log(url + "--------" + receiveContent); @@ -242,12 +242,12 @@ public class NetworkKit buriedPointObject.@event = eventname; buriedPointObject.property = eventproperty; buriedPointObject.n = integer; - PostWithHeader("/event/incrN", buriedPointObject, (isSuccess, obj) => - { - // Debug.Log(isSuccess); - // Debug.Log(eventproperty); - //Debug.Log(JsonUtility.ToJson(obj)); - }); + // PostWithHeader("/event/incrN", buriedPointObject, (isSuccess, obj) => + // { + // // Debug.Log(isSuccess); + // // Debug.Log(eventproperty); + // //Debug.Log(JsonUtility.ToJson(obj)); + // });zhushi } public static BuriedPointObject buriedPointObject = new BuriedPointObject(); diff --git a/Assets/BingoSun/Scripts/SDK/MaxADKit.cs b/Assets/BingoSun/Scripts/SDK/MaxADKit.cs index 2487543..7da8a61 100644 --- a/Assets/BingoSun/Scripts/SDK/MaxADKit.cs +++ b/Assets/BingoSun/Scripts/SDK/MaxADKit.cs @@ -10,12 +10,12 @@ namespace BingoBrain.Core public class MaxADKit { public static string SDKKey = - "oXM0CzVDi7P1HstOpKvFMInPMOzpQ9uA6t3x75q5f5wQvsEy9vuiiiM94ZJCJSV7PcZGroSSInQCTGsu04QEiE"; + "LHx_tPFslZpTTiIPABmS24T7Ev1QEVOUVOzirpkxLUuTwJTVZGCKAk9L3Tm3FwuM5LxHK3q1EIbAemJB5sNpX2"; - public static string interstitialADUnitID = "21affa11ba855911"; + public static string interstitialADUnitID = "af1076054c8eb56f"; - public static string rewardedADUnitID = "a9798351db2bf7e5"; + public static string rewardedADUnitID = "d79c2aa7b6ad055d"; private const float RevenueThreshold = 0.1f; diff --git a/Assets/BingoSun/Scripts/UnityManager/UI.cs b/Assets/BingoSun/Scripts/UnityManager/UI.cs index af418d3..d5430fd 100644 --- a/Assets/BingoSun/Scripts/UnityManager/UI.cs +++ b/Assets/BingoSun/Scripts/UnityManager/UI.cs @@ -380,6 +380,7 @@ namespace BingoBrain.Core // { BetKit.Instance.LoadAsset("FGUI", $"{packageName}_fui.bytes", textAsset => { + Debug.Log(packageName); UIPackage.AddPackage(textAsset.bytes, packageName, delegate(string s, string extension, Type type, out DestroyMethod destroyMethod) { diff --git a/Assets/BingoSun/Scripts/WebviewManager.cs b/Assets/BingoSun/Scripts/WebviewManager.cs index 1b1336e..b7357f3 100644 --- a/Assets/BingoSun/Scripts/WebviewManager.cs +++ b/Assets/BingoSun/Scripts/WebviewManager.cs @@ -532,7 +532,7 @@ namespace DontConfuse if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask)) { - GameDispatcher.Instance.Dispatch(GameMsg.card_click, hit.collider.gameObject.name); + // GameDispatcher.Instance.Dispatch(GameMsg.card_click, hit.collider.gameObject.name); } } @@ -555,149 +555,149 @@ namespace DontConfuse // if (gameUrlInfo == null) return; //TODO: show invisible h5 - var Dailyrefresh_reamain = 0; - var last_time = PlayerPrefs.GetInt("Dayreftimes", 0); - DateTime newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); - newDate = newDate.AddSeconds(GameHelper.GetNowTime(true)); - var newDays = newDate.Day; + // var Dailyrefresh_reamain = 0; + // var last_time = PlayerPrefs.GetInt("Dayreftimes", 0); + // DateTime newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); + // newDate = newDate.AddSeconds(GameHelper.GetNowTime(true)); + // var newDays = newDate.Day; - if (last_time == newDays) - { - Dailyrefresh_reamain = ConfigSystem.GetConfig().Dailyrefreshtimes - - PlayerPrefs.GetInt("Dailyrefreshnum", 0); - } - else - { - PlayerPrefs.SetInt("Dailyrefreshnum", 0); - Dailyrefresh_reamain = ConfigSystem.GetConfig().Dailyrefreshtimes; - PlayerPrefs.SetInt("Dayreftimes", newDays); - } + // if (last_time == newDays) + // { + // Dailyrefresh_reamain = ConfigSystem.GetConfig().Dailyrefreshtimes - + // PlayerPrefs.GetInt("Dailyrefreshnum", 0); + // } + // else + // { + // PlayerPrefs.SetInt("Dailyrefreshnum", 0); + // Dailyrefresh_reamain = ConfigSystem.GetConfig().Dailyrefreshtimes; + // PlayerPrefs.SetInt("Dayreftimes", newDays); + // } - int dark_last_time = PlayerPrefs.GetInt("dark_refreshDay", 0); + // int dark_last_time = PlayerPrefs.GetInt("dark_refreshDay", 0); - DateTime dark_newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); - dark_newDate = dark_newDate.AddSeconds(GameHelper.GetNowTime(true)); - var dark_newDays = dark_newDate.Day; + // DateTime dark_newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); + // dark_newDate = dark_newDate.AddSeconds(GameHelper.GetNowTime(true)); + // var dark_newDays = dark_newDate.Day; - string darkWVDailyrefreshtimes_str = ""; + // string darkWVDailyrefreshtimes_str = ""; - if (SaveData.GetSaveobject().dark_Dayref == null) - { - SaveData.GetSaveobject().dark_Dayref = new int[2]; - } + // if (SaveData.GetSaveobject().dark_Dayref == null) + // { + // SaveData.GetSaveobject().dark_Dayref = new int[2]; + // } - if (dark_last_time == dark_newDays) - { - // dark_Dailyrefresh_reamain = ConfigSystem.GetConfig().darkWVDailyrefreshtimes[Int32.Parse(webview_index) - 1] - - // PlayerPrefs.GetInt("dark_Dayref", 0); - for (int i = 0; i < ConfigSystem.GetConfig().darkWVDailyrefreshtimes.Length; i++) - { + // if (dark_last_time == dark_newDays) + // { + // // dark_Dailyrefresh_reamain = ConfigSystem.GetConfig().darkWVDailyrefreshtimes[Int32.Parse(webview_index) - 1] - + // // PlayerPrefs.GetInt("dark_Dayref", 0); + // for (int i = 0; i < ConfigSystem.GetConfig().darkWVDailyrefreshtimes.Length; i++) + // { - if (i != 0) darkWVDailyrefreshtimes_str += "|"; - darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig().darkWVDailyrefreshtimes[i] - SaveData.GetSaveobject().dark_Dayref[i]; + // if (i != 0) darkWVDailyrefreshtimes_str += "|"; + // darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig().darkWVDailyrefreshtimes[i] - SaveData.GetSaveobject().dark_Dayref[i]; - } - } - else - { - // PlayerPrefs.SetInt("dark_Dayref", 0); - for (int i = 0; i < SaveData.GetSaveobject().dark_Dayref.Length; i++) - { - SaveData.GetSaveobject().dark_Dayref[i] = 0; - } - SaveData.saveDataFunc(); - // dark_Dailyrefresh_reamain = ConfigSystem.GetConfig().darkWVDailyrefreshtimes[Int32.Parse(webview_index)]; + // } + // } + // else + // { + // // PlayerPrefs.SetInt("dark_Dayref", 0); + // for (int i = 0; i < SaveData.GetSaveobject().dark_Dayref.Length; i++) + // { + // SaveData.GetSaveobject().dark_Dayref[i] = 0; + // } + // SaveData.saveDataFunc(); + // // dark_Dailyrefresh_reamain = ConfigSystem.GetConfig().darkWVDailyrefreshtimes[Int32.Parse(webview_index)]; - for (int i = 0; i < ConfigSystem.GetConfig().darkWVDailyrefreshtimes.Length; i++) - { + // for (int i = 0; i < ConfigSystem.GetConfig().darkWVDailyrefreshtimes.Length; i++) + // { - if (i != 0) darkWVDailyrefreshtimes_str += "|"; - darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig().darkWVDailyrefreshtimes[i]; + // if (i != 0) darkWVDailyrefreshtimes_str += "|"; + // darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig().darkWVDailyrefreshtimes[i]; - } + // } - PlayerPrefs.SetInt("dark_refreshDay", dark_newDays); - } + // PlayerPrefs.SetInt("dark_refreshDay", dark_newDays); + // } - // var last_login_time = PlayerPrefs.GetInt("last_login_time", 0);//获取上次登录日期 - // PlayerPrefs.SetInt("last_login_time", newDays); + // // var last_login_time = PlayerPrefs.GetInt("last_login_time", 0);//获取上次登录日期 + // // PlayerPrefs.SetInt("last_login_time", newDays); - string light_str = ""; - string dark_str = ""; + // string light_str = ""; + // string dark_str = ""; - for (int i = 0; i < ConfigSystem.light_weblist.Count; i++) - { - int can_refresh_numbners = 0; - // if (last_login_time==newDays) - // { - // can_refresh_numbners=ConfigSystem.light_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.light_weblist[i].webLink, 0); - // if (can_refresh_numbners < 0) can_refresh_numbners = 0; - // } - // else - // { - can_refresh_numbners = ConfigSystem.light_weblist[i].refreshMax; - //if (can_refresh_numbners < 0) can_refresh_numbners = 9999999; - // PlayerPrefs.SetInt(ConfigSystem.light_weblist[i].webLink, 0); - // } + // for (int i = 0; i < ConfigSystem.light_weblist.Count; i++) + // { + // int can_refresh_numbners = 0; + // // if (last_login_time==newDays) + // // { + // // can_refresh_numbners=ConfigSystem.light_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.light_weblist[i].webLink, 0); + // // if (can_refresh_numbners < 0) can_refresh_numbners = 0; + // // } + // // else + // // { + // can_refresh_numbners = ConfigSystem.light_weblist[i].refreshMax; + // //if (can_refresh_numbners < 0) can_refresh_numbners = 9999999; + // // PlayerPrefs.SetInt(ConfigSystem.light_weblist[i].webLink, 0); + // // } - if (i != 0) - { - light_str += "|"; - } + // if (i != 0) + // { + // light_str += "|"; + // } - light_str += ConfigSystem.light_weblist[i].webLink + "#" + ConfigSystem.light_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.light_weblist[i].darkWebTimesCT; ; - } - for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) - { - int can_refresh_numbners = 0; - // if (last_login_time==newDays) - // { - // can_refresh_numbners=ConfigSystem.dark_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.dark_weblist[i].webLink, 0); - // if (can_refresh_numbners < 0) can_refresh_numbners = 0; - // } - // else - // { - can_refresh_numbners = ConfigSystem.dark_weblist[i].refreshMax; - //if (can_refresh_numbners < 0) can_refresh_numbners = 9999999; - // PlayerPrefs.SetInt(ConfigSystem.dark_weblist[i].webLink, 0); - // } + // light_str += ConfigSystem.light_weblist[i].webLink + "#" + ConfigSystem.light_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.light_weblist[i].darkWebTimesCT; ; + // } + // for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) + // { + // int can_refresh_numbners = 0; + // // if (last_login_time==newDays) + // // { + // // can_refresh_numbners=ConfigSystem.dark_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.dark_weblist[i].webLink, 0); + // // if (can_refresh_numbners < 0) can_refresh_numbners = 0; + // // } + // // else + // // { + // can_refresh_numbners = ConfigSystem.dark_weblist[i].refreshMax; + // //if (can_refresh_numbners < 0) can_refresh_numbners = 9999999; + // // PlayerPrefs.SetInt(ConfigSystem.dark_weblist[i].webLink, 0); + // // } - if (i != 0) - { - dark_str += "|"; - } + // if (i != 0) + // { + // dark_str += "|"; + // } - dark_str += ConfigSystem.dark_weblist[i].webLink + "#" + ConfigSystem.dark_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.dark_weblist[i].darkWebTimesCT + "#" + ConfigSystem.dark_weblist[i].wvType; - } + // dark_str += ConfigSystem.dark_weblist[i].webLink + "#" + ConfigSystem.dark_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.dark_weblist[i].darkWebTimesCT + "#" + ConfigSystem.dark_weblist[i].wvType; + // } - string darkWVRefreshtime_str = ""; + // string darkWVRefreshtime_str = ""; - for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime.Length; i++) - { - if (i != 0) darkWVRefreshtime_str += "|"; - darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime[i].ToString(); - } - for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime2.Length; i++) - { - darkWVRefreshtime_str += "|"; - darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime2[i].ToString(); - } + // for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime.Length; i++) + // { + // if (i != 0) darkWVRefreshtime_str += "|"; + // darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime[i].ToString(); + // } + // for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime2.Length; i++) + // { + // darkWVRefreshtime_str += "|"; + // darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime2[i].ToString(); + // } - Debug.Log("--------------------------------"); + // Debug.Log("--------------------------------"); - string add_time = ConfigSystem.GetConfig().WVClickCTAddTime1[0] + "|" + - ConfigSystem.GetConfig().WVClickCTAddTime1[1] + "|" + ConfigSystem.GetConfig().WVClickCTAddTime2[0] + "|" + ConfigSystem.GetConfig().WVClickCTAddTime2[1]; + // string add_time = ConfigSystem.GetConfig().WVClickCTAddTime1[0] + "|" + + // ConfigSystem.GetConfig().WVClickCTAddTime1[1] + "|" + ConfigSystem.GetConfig().WVClickCTAddTime2[0] + "|" + ConfigSystem.GetConfig().WVClickCTAddTime2[1]; - Debug.Log(add_time); - WebviewManager.Instance.addH5Field(ConfigSystem.GetConfig().flyCtRate, ConfigSystem.GetConfig().otherH5switch, - ConfigSystem.GetConfig().H5Refreshtime, Dailyrefresh_reamain, ConfigSystem.GetConfig().darkThoughProbability - , darkWVRefreshtime_str, darkWVDailyrefreshtimes_str, dark_str, light_str, GameHelper.IsGiftSwitch(), ConfigSystem.web_through_str, add_time); + // Debug.Log(add_time); + // WebviewManager.Instance.addH5Field(ConfigSystem.GetConfig().flyCtRate, ConfigSystem.GetConfig().otherH5switch, + // ConfigSystem.GetConfig().H5Refreshtime, Dailyrefresh_reamain, ConfigSystem.GetConfig().darkThoughProbability + // , darkWVRefreshtime_str, darkWVDailyrefreshtimes_str, dark_str, light_str, GameHelper.IsGiftSwitch(), ConfigSystem.web_through_str, add_time); // WebviewManager.Instance.OpenWebView(gameUrlInfo.webLink); //WebviewManager.Instance.setFlyCtRate(ConfigSystem.GetConfig().flyCtRate); diff --git a/Assets/Editor/PostProcessBuild.cs b/Assets/Editor/PostProcessBuild.cs index a21cda3..fb712c7 100644 --- a/Assets/Editor/PostProcessBuild.cs +++ b/Assets/Editor/PostProcessBuild.cs @@ -12,22 +12,22 @@ public class PostProcessBuild : IPostprocessBuildWithReport public void OnPostprocessBuild(UnityEditor.Build.Reporting.BuildReport report) { // 检查是否为 iOS 平台构建 - if (report.summary.platform == BuildTarget.iOS) - { - string projectPath = report.summary.outputPath; - string customControllerPath = "Assets/Editor/UnityAppController.mm"; // 自定义文件的路径 - string destinationPath = Path.Combine(projectPath, "Classes/UnityAppController.mm"); + // if (report.summary.platform == BuildTarget.iOS) + // { + // string projectPath = report.summary.outputPath; + // string customControllerPath = "Assets/Editor/UnityAppController.mm"; // 自定义文件的路径 + // string destinationPath = Path.Combine(projectPath, "Classes/UnityAppController.mm"); - if (File.Exists(customControllerPath)) - { - // 复制文件到 Xcode 项目中 - File.Copy(customControllerPath, destinationPath, overwrite: true); - Debug.Log("Custom UnityAppController.mm has been copied to Xcode project."); - } - else - { - Debug.LogError("Custom UnityAppController.mm file not found at " + customControllerPath); - } - } + // if (File.Exists(customControllerPath)) + // { + // // 复制文件到 Xcode 项目中 + // File.Copy(customControllerPath, destinationPath, overwrite: true); + // Debug.Log("Custom UnityAppController.mm has been copied to Xcode project."); + // } + // else + // { + // Debug.LogError("Custom UnityAppController.mm file not found at " + customControllerPath); + // } + // } } } \ No newline at end of file diff --git a/Assets/Editor/ScriptableObjectData/SpineSettings.asset b/Assets/Editor/ScriptableObjectData/SpineSettings.asset index 9b70e3a..dc8f990 100644 --- a/Assets/Editor/ScriptableObjectData/SpineSettings.asset +++ b/Assets/Editor/ScriptableObjectData/SpineSettings.asset @@ -19,9 +19,13 @@ MonoBehaviour: defaultInstantiateLoop: 1 showHierarchyIcons: 1 setTextureImporterSettings: 1 - textureSettingsReference: Assets/Jarvis/Plugins/Spine/Editor/spine-unity/Editor/ImporterPresets/PMATexturePreset.preset + textureSettingsReference: Assets/BingoSun/Plugins/Spine/Editor/spine-unity/Editor/ImporterPresets/PMATexturePreset.preset + blendModeMaterialMultiply: {fileID: 0} + blendModeMaterialScreen: {fileID: 0} + blendModeMaterialAdditive: {fileID: 0} atlasTxtImportWarning: 1 textureImporterWarning: 1 + componentMaterialWarning: 1 autoReloadSceneSkeletons: 1 handleScale: 1 mecanimEventIncludeFolderName: 1 diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182.meta b/Assets/ExternalDependencyManager/Editor/1.2.182.meta deleted file mode 100644 index 10817e9..0000000 --- a/Assets/ExternalDependencyManager/Editor/1.2.182.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6bcff75beb1c54c12be4cefb0b0482e5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb b/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb deleted file mode 100644 index ce3b2b6..0000000 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb and /dev/null differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb b/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb deleted file mode 100644 index 6af81c7..0000000 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb and /dev/null differ diff --git a/Assets/BingoBrain/FGUI/Package/G003_play_animal.meta b/Assets/ExternalDependencyManager/Editor/1.2.186.meta similarity index 77% rename from Assets/BingoBrain/FGUI/Package/G003_play_animal.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186.meta index d5424b5..e20f74a 100644 --- a/Assets/BingoBrain/FGUI/Package/G003_play_animal.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 32bbccf07c8d644d992810a916df68ee +guid: 4d777acff45264bfa805da30991be34f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll similarity index 60% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll index 0b15851..3003055 100644 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta similarity index 81% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta index 39bf8db..26d1b45 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 3429646f5d4949efa347230fa86778b7 +guid: e2d7ea0845de4cf984265d2a444b7aa4 labels: - gvh -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} @@ -14,7 +14,7 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: Any: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb new file mode 100644 index 0000000..493d3b2 Binary files /dev/null and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta similarity index 60% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta index 8aabdd7..ac203f5 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 51b6f287d0d540049f299c19a2f62321 +guid: baf24db2bf904e729e7796721c09e8ad labels: - gvh - gvh_rename_to_disable -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb - gvhp_targets-editor DefaultImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll similarity index 71% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll index d9a77eb..645d5cd 100644 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta similarity index 84% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta index 68071ee..05ebd81 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 5b1a2b9a8d0748609fa3195265844d21 +guid: fa49a85d4ba140a0ae21528ed12d174c labels: - gvh -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb new file mode 100644 index 0000000..c6eaef4 Binary files /dev/null and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta similarity index 60% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta index cd9a498..86a7d87 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 50924eb6369047da88d4803f207075b7 +guid: d13c8602d5e14e43b0e92459754c4315 labels: - gvh - gvh_rename_to_disable -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb - gvhp_targets-editor DefaultImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll similarity index 99% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll index 3c92ed5..a4a6590 100644 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta similarity index 84% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta index b531847..0cc442e 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 4026c19ba8ec495f93f5919b5f2934ee +guid: d8bb10c56a0147bc855a6296778e025e labels: - gvh -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb similarity index 98% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb index 0870f75..884ce21 100644 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta similarity index 62% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta index 47ebe5e..bf635cb 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: fda6a96d9a064226b6cea47e6eef3d16 +guid: a695eb9f64fe49569a2db0c4246c877d labels: - gvh - gvh_rename_to_disable -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb - gvhp_targets-editor DefaultImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll similarity index 74% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll index 53c60b2..8562ef3 100644 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta similarity index 84% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta index 8001971..f325e22 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 025280fbe75c450fbdf7c5fc7ecc8860 +guid: 5980a684c61d42fbb6b74e2eb3477016 labels: - gvh -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb similarity index 63% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb index 00ed433..ed8cc97 100644 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb and b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb.meta b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta similarity index 61% rename from Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb.meta rename to Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta index b176c8c..9d29d58 100644 --- a/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 5f7e0d6d612a4e18be5161653a63d2f0 +guid: 9f56badf3ca84753b00163c3b632d4e5 labels: - gvh - gvh_rename_to_disable -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb - gvhp_targets-editor DefaultImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md index eef4da0..e1294a3 100644 --- a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md +++ b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -1,3 +1,22 @@ +# Version 1.2.186 - May 19, 2025 +* iOS Resolver - Set `validateReferences` to off by default, + to prevent errors when running without iOS Support installed. + Fixes #412 and #622 + +# Version 1.2.185 - Feb 3, 2025 +* Android Resolver - Reverse conditional checker for `packaging` keyword in maintemplate based on android gradle plugin version. Fixes #715 + +# Version 1.2.184 - Jan 28, 2025 +* Android Resolver - Update and resolve `packaging` keyword in maintemplate + based on android gradle plugin version. + Fixes #715 + +# Version 1.2.183 - Sep 18, 2024 +* Android Resolver - Handle package paths that don't include a version hash, + which is no longer present with Unity 6. Fixes #697 +* Android Resolver - Handle packages referenced using local file paths. + Fixes #701 + # Version 1.2.182 - Aug 2, 2024 * General - Check for gradle version instead of Unity version when determining the template files to modify. diff --git a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index 2adfcdc..03b6181 100644 --- a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b699fc553a294dbcad96ff0365038f6a +guid: aba4ee01c6d145f7bf2d944d892f709a labels: - gvh -- gvh_version-1.2.182 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md timeCreated: 1584567712 licenseType: Pro diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll index ac732a7..12c150e 100644 Binary files a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index f007e6e..b43088d 100644 --- a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 61128ff4560e43ddb606dc203efe7799 +guid: f7632a50b10045458c53a5ddf7b6d238 labels: - gvh -- gvh_version-1.2.182 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvhp_targets-editor timeCreated: 1480838400 diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb index 217ac51..7dd02af 100644 Binary files a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb and b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb differ diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index 73c66db..d4a34e0 100644 --- a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta +++ b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: ef0c2c4976ca4593860e7d5871a226bf +guid: 57f5a82a79ab4b098f09326c8f3c73a6 labels: - gvh -- gvh_version-1.2.182 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb timeCreated: 1538009133 licenseType: Pro diff --git a/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 811edab..1f7d009 100644 --- a/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b91d7551a5d9453e914e5295af46195e +guid: ae8b2bc8d1ac4ad48f0ab2b2e7ac75fb labels: - gvh -- gvh_version-1.2.182 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE timeCreated: 1584567712 licenseType: Pro diff --git a/Assets/ExternalDependencyManager/Editor/README.md b/Assets/ExternalDependencyManager/Editor/README.md index 3a7a5a2..a9aafe9 100644 --- a/Assets/ExternalDependencyManager/Editor/README.md +++ b/Assets/ExternalDependencyManager/Editor/README.md @@ -72,6 +72,12 @@ EDM4U is available on openupm add com.google.external-dependency-manager ``` +### Install via git URL +1. Open Package Manager +2. Click on the + icon on the top left corner of the "Package Manager" screen +3. Click on "Install package from git url..." +4. Paste: https://github.com/googlesamples/unity-jar-resolver.git?path=upm + ### Install via Google APIs for Unity EDM4U is available both in UPM and legacy `.unitypackage` formats on diff --git a/Assets/ExternalDependencyManager/Editor/README.md.meta b/Assets/ExternalDependencyManager/Editor/README.md.meta index 1246827..4887a04 100644 --- a/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: ee2d63ed1abf409b893e36120a404f03 +guid: 77919e84cef8419ab4b725fc16e83d52 labels: - gvh -- gvh_version-1.2.182 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md timeCreated: 1584567712 licenseType: Pro diff --git a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt deleted file mode 100644 index d1496bc..0000000 --- a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md diff --git a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt new file mode 100644 index 0000000..81c97ed --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt @@ -0,0 +1,13 @@ +Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md diff --git a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt.meta b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta similarity index 75% rename from Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt.meta rename to Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta index caa5f7c..dca3f95 100644 --- a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt.meta +++ b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: d602686ba68d4bfea020d161c28431a9 +guid: c9a3138961c74d99b7046b783112fceb labels: - gvh - gvh_manifest -- gvh_version-1.2.182 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt - gvhp_manifestname-0External Dependency Manager - gvhp_manifestname-play-services-resolver timeCreated: 1474401009 diff --git a/Assets/Plugins/MaxSdk.meta b/Assets/MaxSdk.meta similarity index 77% rename from Assets/Plugins/MaxSdk.meta rename to Assets/MaxSdk.meta index e0028e9..deb2425 100644 --- a/Assets/Plugins/MaxSdk.meta +++ b/Assets/MaxSdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5843a8a292706e94bbff7579cce8bf8f +guid: 8503576f402ce4567ae6a41a7b163bf8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/BingoBrain/FGUI/Package/G004_webview.meta b/Assets/MaxSdk/AppLovin.meta similarity index 77% rename from Assets/BingoBrain/FGUI/Package/G004_webview.meta rename to Assets/MaxSdk/AppLovin.meta index 90c6c2e..c4d4557 100644 --- a/Assets/BingoBrain/FGUI/Package/G004_webview.meta +++ b/Assets/MaxSdk/AppLovin.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afc4607eb7cf34c14b6d28feb02de32d +guid: 738dc7c1e26d74cc28bc270ff0230c56 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/MaxSdk/AppLovin/Editor.meta b/Assets/MaxSdk/AppLovin/Editor.meta new file mode 100644 index 0000000..b8bdb2a --- /dev/null +++ b/Assets/MaxSdk/AppLovin/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54935f01f62b4440eaad8d66dbd443d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/AppLovin/Editor/Dependencies.xml b/Assets/MaxSdk/AppLovin/Editor/Dependencies.xml similarity index 55% rename from Assets/Plugins/MaxSdk/AppLovin/Editor/Dependencies.xml rename to Assets/MaxSdk/AppLovin/Editor/Dependencies.xml index 2d7a1d3..69625d2 100644 --- a/Assets/Plugins/MaxSdk/AppLovin/Editor/Dependencies.xml +++ b/Assets/MaxSdk/AppLovin/Editor/Dependencies.xml @@ -1,9 +1,9 @@ - + - + diff --git a/Assets/Plugins/MaxSdk/AppLovin/Editor/Dependencies.xml.meta b/Assets/MaxSdk/AppLovin/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/AppLovin/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/AppLovin/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/AppLovin/Plugins.meta b/Assets/MaxSdk/AppLovin/Plugins.meta new file mode 100644 index 0000000..749c97b --- /dev/null +++ b/Assets/MaxSdk/AppLovin/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc98ba868385845f39fc705dceecb5fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MaxSdk/AppLovin/Plugins/Android.meta b/Assets/MaxSdk/AppLovin/Plugins/Android.meta new file mode 100644 index 0000000..1724b0b --- /dev/null +++ b/Assets/MaxSdk/AppLovin/Plugins/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f600f2d0884a4115826e2e163d3192d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar b/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar new file mode 100644 index 0000000..9600e02 Binary files /dev/null and b/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar differ diff --git a/Assets/Plugins/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar.meta b/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar.meta similarity index 100% rename from Assets/Plugins/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar.meta rename to Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar.meta diff --git a/Assets/MaxSdk/AppLovin/Plugins/iOS.meta b/Assets/MaxSdk/AppLovin/Plugins/iOS.meta new file mode 100644 index 0000000..96315c0 --- /dev/null +++ b/Assets/MaxSdk/AppLovin/Plugins/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0ad142c34d304feba59d0319c677a43 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h similarity index 87% rename from Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h rename to Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h index debdd3c..117c7fd 100644 --- a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h +++ b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h @@ -14,8 +14,8 @@ typedef void (*ALUnityBackgroundCallback)(const char* args); - (void)initializeSdkWithConfiguration:(ALSdkInitializationConfiguration *)initConfig andCompletionHandler:(ALSdkInitializationCompletionHandler)completionHandler; -- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier atPosition:(nullable NSString *)bannerPosition; -- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier x:(CGFloat)xOffset y:(CGFloat)yOffset; +- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier atPosition:(nullable NSString *)bannerPosition isAdaptive:(BOOL)isAdaptive; +- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier x:(CGFloat)xOffset y:(CGFloat)yOffset isAdaptive:(BOOL)isAdaptive; - (void)loadBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier; - (void)setBannerBackgroundColorForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier hexColorCode:(nullable NSString *)hexColorCode; - (void)setBannerPlacement:(nullable NSString *)placement forAdUnitIdentifier:(nullable NSString *)adUnitIdentifier; @@ -67,18 +67,9 @@ typedef void (*ALUnityBackgroundCallback)(const char* args); - (void)setRewardedAdExtraParameterForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier key:(nullable NSString *)key value:(nullable NSString *)value; - (void)setRewardedAdLocalExtraParameterForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier key:(nullable NSString *)key value:(nullable id)value; -- (void)loadRewardedInterstitialAdWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier; -- (BOOL)isRewardedInterstitialAdReadyWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier; -- (void)showRewardedInterstitialAdWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier placement:(nullable NSString *)placement customData:(nullable NSString *)customData; -- (void)setRewardedInterstitialAdExtraParameterForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier key:(nullable NSString *)key value:(nullable NSString *)value; -- (void)setRewardedInterstitialAdLocalExtraParameterForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier key:(nullable NSString *)key value:(nullable id)value; - // Event Tracking - (void)trackEvent:(nullable NSString *)event parameters:(nullable NSString *)parameters; -// Ad Info -- (NSString *)adInfoForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier; - // Ad Value - (NSString *)adValueForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier withKey:(nullable NSString *)key; diff --git a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h.meta b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h.meta similarity index 100% rename from Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h.meta rename to Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.h.meta diff --git a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m similarity index 93% rename from Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m rename to Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m index e724123..a7bd666 100644 --- a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m +++ b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m @@ -42,7 +42,7 @@ extern "C" { } #endif -@interface MAUnityAdManager() +@interface MAUnityAdManager() // Parent Fields @property (nonatomic, weak) ALSdk *sdk; @@ -51,7 +51,6 @@ extern "C" { @property (nonatomic, strong) NSMutableDictionary *interstitials; @property (nonatomic, strong) NSMutableDictionary *appOpenAds; @property (nonatomic, strong) NSMutableDictionary *rewardedAds; -@property (nonatomic, strong) NSMutableDictionary *rewardedInterstitialAds; // AdView Fields @property (nonatomic, strong) NSMutableDictionary *adViews; @@ -67,6 +66,7 @@ extern "C" { @property (nonatomic, strong) NSMutableArray *adUnitIdentifiersToShowAfterCreate; @property (nonatomic, strong) NSMutableSet *disabledAdaptiveBannerAdUnitIdentifiers; @property (nonatomic, strong) NSMutableSet *disabledAutoRefreshAdViewAdUnitIdentifiers; +@property (nonatomic, strong) NSMutableSet *ignoreSafeAreaLandscapeAdUnitIdentifiers; @property (nonatomic, strong) UIView *safeAreaBackground; @property (nonatomic, strong, nullable) UIColor *publisherBannerBackgroundColor; @@ -112,7 +112,6 @@ static ALUnityBackgroundCallback backgroundCallback; self.interstitials = [NSMutableDictionary dictionaryWithCapacity: 2]; self.appOpenAds = [NSMutableDictionary dictionaryWithCapacity: 2]; self.rewardedAds = [NSMutableDictionary dictionaryWithCapacity: 2]; - self.rewardedInterstitialAds = [NSMutableDictionary dictionaryWithCapacity: 2]; self.adViews = [NSMutableDictionary dictionaryWithCapacity: 2]; self.adViewAdFormats = [NSMutableDictionary dictionaryWithCapacity: 2]; self.adViewPositions = [NSMutableDictionary dictionaryWithCapacity: 2]; @@ -126,6 +125,7 @@ static ALUnityBackgroundCallback backgroundCallback; self.adUnitIdentifiersToShowAfterCreate = [NSMutableArray arrayWithCapacity: 2]; self.disabledAdaptiveBannerAdUnitIdentifiers = [NSMutableSet setWithCapacity: 2]; self.disabledAutoRefreshAdViewAdUnitIdentifiers = [NSMutableSet setWithCapacity: 2]; + self.ignoreSafeAreaLandscapeAdUnitIdentifiers = [NSMutableSet setWithCapacity: 2]; self.adInfoDict = [NSMutableDictionary dictionary]; self.adInfoDictLock = [[NSObject alloc] init]; @@ -225,14 +225,14 @@ static ALUnityBackgroundCallback backgroundCallback; #pragma mark - Banners -- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier atPosition:(nullable NSString *)bannerPosition +- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier atPosition:(nullable NSString *)bannerPosition isAdaptive:(BOOL)isAdaptive { - [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: [self adViewAdFormatForAdUnitIdentifier: adUnitIdentifier] atPosition: bannerPosition withOffset: CGPointZero]; + [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: [self adViewAdFormatForAdUnitIdentifier: adUnitIdentifier] atPosition: bannerPosition withOffset: CGPointZero isAdaptive: isAdaptive]; } -- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier x:(CGFloat)xOffset y:(CGFloat)yOffset +- (void)createBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier x:(CGFloat)xOffset y:(CGFloat)yOffset isAdaptive:(BOOL)isAdaptive { - [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: [self adViewAdFormatForAdUnitIdentifier: adUnitIdentifier] atPosition: DEFAULT_AD_VIEW_POSITION withOffset: CGPointMake(xOffset, yOffset)]; + [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: [self adViewAdFormatForAdUnitIdentifier: adUnitIdentifier] atPosition: DEFAULT_AD_VIEW_POSITION withOffset: CGPointMake(xOffset, yOffset) isAdaptive: isAdaptive]; } - (void)loadBannerWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier @@ -325,12 +325,12 @@ static ALUnityBackgroundCallback backgroundCallback; - (void)createMRecWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier atPosition:(nullable NSString *)mrecPosition { - [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec atPosition: mrecPosition withOffset: CGPointZero]; + [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec atPosition: mrecPosition withOffset: CGPointZero isAdaptive: NO]; } - (void)createMRecWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier x:(CGFloat)xOffset y:(CGFloat)yOffset { - [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec atPosition: DEFAULT_AD_VIEW_POSITION withOffset: CGPointMake(xOffset, yOffset)]; + [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec atPosition: DEFAULT_AD_VIEW_POSITION withOffset: CGPointMake(xOffset, yOffset) isAdaptive: NO]; } - (void)loadMRecWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier @@ -518,44 +518,6 @@ static ALUnityBackgroundCallback backgroundCallback; [rewardedAd setLocalExtraParameterForKey: key value: value]; } -#pragma mark - Rewarded Interstitials - -- (void)loadRewardedInterstitialAdWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier -{ - MARewardedInterstitialAd *rewardedInterstitialAd = [self retrieveRewardedInterstitialAdForAdUnitIdentifier: adUnitIdentifier]; - [rewardedInterstitialAd loadAd]; -} - -- (BOOL)isRewardedInterstitialAdReadyWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier -{ - MARewardedInterstitialAd *rewardedInterstitialAd = [self retrieveRewardedInterstitialAdForAdUnitIdentifier: adUnitIdentifier]; - return [rewardedInterstitialAd isReady]; -} - -- (void)showRewardedInterstitialAdWithAdUnitIdentifier:(nullable NSString *)adUnitIdentifier placement:(nullable NSString *)placement customData:(nullable NSString *)customData -{ - MARewardedInterstitialAd *rewardedInterstitialAd = [self retrieveRewardedInterstitialAdForAdUnitIdentifier: adUnitIdentifier]; - [rewardedInterstitialAd showAdForPlacement: placement customData: customData]; -} - -- (void)setRewardedInterstitialAdExtraParameterForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier key:(nullable NSString *)key value:(nullable NSString *)value -{ - MARewardedInterstitialAd *rewardedInterstitialAd = [self retrieveRewardedInterstitialAdForAdUnitIdentifier: adUnitIdentifier]; - [rewardedInterstitialAd setExtraParameterForKey: key value: value]; -} - -- (void)setRewardedInterstitialAdLocalExtraParameterForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier key:(nullable NSString *)key value:(nullable id)value -{ - if ( !key ) - { - [self log: @"Failed to set local extra parameter: No key specified"]; - return; - } - - MARewardedInterstitialAd *rewardedInterstitialAd = [self retrieveRewardedInterstitialAdForAdUnitIdentifier: adUnitIdentifier]; - [rewardedInterstitialAd setLocalExtraParameterForKey: key value: value]; -} - #pragma mark - Event Tracking - (void)trackEvent:(nullable NSString *)event parameters:(nullable NSString *)parameters @@ -566,16 +528,6 @@ static ALUnityBackgroundCallback backgroundCallback; #pragma mark - Ad Info -- (NSString *)adInfoForAdUnitIdentifier:(nullable NSString *)adUnitIdentifier -{ - if ( ![adUnitIdentifier al_isValidString] ) return @""; - - MAAd *ad = [self adWithAdUnitIdentifier: adUnitIdentifier]; - if ( !ad ) return @""; - - return [MAUnityAdManager serializeParameters: [self adInfoForAd: ad]]; -} - - (NSDictionary *)adInfoForAd:(MAAd *)ad { return @{@"adUnitId" : ad.adUnitIdentifier, @@ -627,6 +579,7 @@ static ALUnityBackgroundCallback backgroundCallback; networkInfoObject[@"adapterClassName"] = response.mediatedNetwork.adapterClassName; networkInfoObject[@"adapterVersion"] = response.mediatedNetwork.adapterVersion; networkInfoObject[@"sdkVersion"] = response.mediatedNetwork.sdkVersion; + networkInfoObject[@"initializationStatus"] = @(response.mediatedNetwork.initializationStatus); networkResponseDict[@"mediatedNetwork"] = networkInfoObject; } @@ -705,10 +658,6 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnRewardedAdLoadedEvent"; } - else if ( MAAdFormat.rewardedInterstitial == adFormat ) - { - name = @"OnRewardedInterstitialAdLoadedEvent"; - } else { [self logInvalidAdFormat: adFormat]; @@ -762,10 +711,6 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnRewardedAdLoadFailedEvent"; } - else if ( self.rewardedInterstitialAds[adUnitIdentifier] ) - { - name = @"OnRewardedInterstitialAdLoadFailedEvent"; - } else { [self log: @"invalid adUnitId from %@", [NSThread callStackSymbols]]; @@ -813,10 +758,6 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnRewardedAdClickedEvent"; } - else if ( MAAdFormat.rewardedInterstitial == adFormat ) - { - name = @"OnRewardedInterstitialAdClickedEvent"; - } else { [self logInvalidAdFormat: adFormat]; @@ -850,14 +791,10 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnAppOpenAdDisplayedEvent"; } - else if ( MAAdFormat.rewarded == adFormat ) + else // rewarded { name = @"OnRewardedAdDisplayedEvent"; } - else // rewarded inters - { - name = @"OnRewardedInterstitialAdDisplayedEvent"; - } NSDictionary *args = [self defaultAdEventParametersForName: name withAd: ad]; [self forwardUnityEventWithArgs: args]; @@ -881,14 +818,10 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnAppOpenAdFailedToDisplayEvent"; } - else if ( MAAdFormat.rewarded == adFormat ) + else // rewarded { name = @"OnRewardedAdFailedToDisplayEvent"; } - else // rewarded inters - { - name = @"OnRewardedInterstitialAdFailedToDisplayEvent"; - } NSMutableDictionary *args = [self defaultAdEventParametersForName: name withAd: ad]; args[@"errorCode"] = [@(error.code) stringValue]; @@ -932,14 +865,10 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnAppOpenAdHiddenEvent"; } - else if ( MAAdFormat.rewarded == adFormat ) + else // rewarded { name = @"OnRewardedAdHiddenEvent"; } - else // rewarded inters - { - name = @"OnRewardedInterstitialAdHiddenEvent"; - } NSDictionary *args = [self defaultAdEventParametersForName: name withAd: ad]; [self forwardUnityEventWithArgs: args]; @@ -1022,7 +951,7 @@ static ALUnityBackgroundCallback backgroundCallback; dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ MAAdFormat *adFormat = ad.format; - if ( adFormat != MAAdFormat.rewarded && adFormat != MAAdFormat.rewardedInterstitial ) + if ( adFormat != MAAdFormat.rewarded ) { [self logInvalidAdFormat: adFormat]; return; @@ -1031,10 +960,8 @@ static ALUnityBackgroundCallback backgroundCallback; NSString *rewardLabel = reward ? reward.label : @""; NSInteger rewardAmountInt = reward ? reward.amount : 0; NSString *rewardAmount = [@(rewardAmountInt) stringValue]; - - NSString *name = (adFormat == MAAdFormat.rewarded) ? @"OnRewardedAdReceivedRewardEvent" : @"OnRewardedInterstitialAdReceivedRewardEvent"; - - + NSString *name = @"OnRewardedAdReceivedRewardEvent"; + NSMutableDictionary *args = [self defaultAdEventParametersForName: name withAd: ad]; args[@"rewardLabel"] = rewardLabel; args[@"rewardAmount"] = rewardAmount; @@ -1068,10 +995,6 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnRewardedAdRevenuePaidEvent"; } - else if ( MAAdFormat.rewardedInterstitial == adFormat ) - { - name = @"OnRewardedInterstitialAdRevenuePaidEvent"; - } else { [self logInvalidAdFormat: adFormat]; @@ -1084,6 +1007,43 @@ static ALUnityBackgroundCallback backgroundCallback; }); } +- (void)didReloadExpiredAd:(MAAd *)expiredAd withNewAd:(MAAd *)newAd; +{ + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + + NSString *name; + MAAdFormat *adFormat = newAd.format; + if ( MAAdFormat.interstitial == adFormat ) + { + name = @"OnExpiredInterstitialAdReloadedEvent"; + } + else if ( MAAdFormat.appOpen == adFormat ) + { + name = @"OnExpiredAppOpenAdReloadedEvent"; + } + else if ( MAAdFormat.rewarded == adFormat ) + { + name = @"OnExpiredRewardedAdReloadedEvent "; + } + else + { + [self logInvalidAdFormat: adFormat]; + return; + } + + @synchronized ( self.adInfoDictLock ) + { + self.adInfoDict[newAd.adUnitIdentifier] = newAd; + } + + NSMutableDictionary *args = [NSMutableDictionary dictionary]; + args[@"expiredAdInfo"] = [self adInfoForAd: expiredAd]; + args[@"newAdInfo"] = [self adInfoForAd: newAd]; + args[@"name"] = name; + [self forwardUnityEventWithArgs: args]; + }); +} + - (void)didGenerateCreativeIdentifier:(NSString *)creativeIdentifier forAd:(MAAd *)ad { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ @@ -1106,10 +1066,6 @@ static ALUnityBackgroundCallback backgroundCallback; { name = @"OnRewardedAdReviewCreativeIdGeneratedEvent"; } - else if ( MAAdFormat.rewardedInterstitial == adFormat ) - { - name = @"OnRewardedInterstitialAdReviewCreativeIdGeneratedEvent"; - } else { [self logInvalidAdFormat: adFormat]; @@ -1135,7 +1091,7 @@ static ALUnityBackgroundCallback backgroundCallback; #pragma mark - Internal Methods -- (void)createAdViewWithAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat atPosition:(NSString *)adViewPosition withOffset:(CGPoint)offset +- (void)createAdViewWithAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat atPosition:(NSString *)adViewPosition withOffset:(CGPoint)offset isAdaptive:(BOOL)isAdaptive { max_unity_dispatch_on_main_thread(^{ [self log: @"Creating %@ with ad unit identifier \"%@\" and position: \"%@\"", adFormat, adUnitIdentifier, adViewPosition]; @@ -1146,7 +1102,7 @@ static ALUnityBackgroundCallback backgroundCallback; } // Retrieve ad view from the map - MAAdView *adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat atPosition: adViewPosition withOffset: offset]; + MAAdView *adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat atPosition: adViewPosition withOffset: offset isAdaptive: isAdaptive]; adView.hidden = YES; self.safeAreaBackground.hidden = YES; @@ -1156,16 +1112,6 @@ static ALUnityBackgroundCallback backgroundCallback; NSDictionary *extraParameters = self.adViewExtraParametersToSetAfterCreate[adUnitIdentifier]; - // Enable adaptive banners by default for banners and leaders. - if ( [adFormat isBannerOrLeaderAd] ) - { - // Check if there is already a pending setting for adaptive banners. If not, enable them. - if ( !extraParameters[@"adaptive_banner"] ) - { - [adView setExtraParameterForKey: @"adaptive_banner" value: @"true"]; - } - } - // Handle initial extra parameters if publisher sets it before creating ad view if ( extraParameters ) { @@ -1432,6 +1378,8 @@ static ALUnityBackgroundCallback backgroundCallback; } else if ( [@"adaptive_banner" isEqualToString: key] ) { + [self log: @"Setting adaptive banners via extra parameters is deprecated and will be removed in a future plugin version. Use the CreateBanner(adUnitIdentifier, AdViewConfiguration) API to properly configure adaptive banners."]; + BOOL shouldUseAdaptiveBanner = [NSNumber al_numberWithString: value].boolValue; if ( shouldUseAdaptiveBanner ) { @@ -1444,6 +1392,18 @@ static ALUnityBackgroundCallback backgroundCallback; [self positionAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat]; } + else if ( [@"ignore_safe_area_landscape" isEqualToString: key] && [NSNumber al_numberWithString: value].boolValue ) + { + [self.ignoreSafeAreaLandscapeAdUnitIdentifiers addObject: adUnitIdentifier]; + [self positionAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat]; + } + } + + if ( [adFormat isAdViewAd] && [@"clips_to_bounds" isEqualToString: key] ) + { + BOOL clipsToBounds = [NSNumber al_numberWithString: value].boolValue; + MAAdView *view = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat]; + view.clipsToBounds = clipsToBounds; } } @@ -1573,10 +1533,11 @@ static ALUnityBackgroundCallback backgroundCallback; MAInterstitialAd *result = self.interstitials[adUnitIdentifier]; if ( !result ) { - result = [[MAInterstitialAd alloc] initWithAdUnitIdentifier: adUnitIdentifier sdk: self.sdk]; + result = [[MAInterstitialAd alloc] initWithAdUnitIdentifier: adUnitIdentifier]; result.delegate = self; result.revenueDelegate = self; result.adReviewDelegate = self; + result.expirationDelegate = self; self.interstitials[adUnitIdentifier] = result; } @@ -1589,9 +1550,10 @@ static ALUnityBackgroundCallback backgroundCallback; MAAppOpenAd *result = self.appOpenAds[adUnitIdentifier]; if ( !result ) { - result = [[MAAppOpenAd alloc] initWithAdUnitIdentifier: adUnitIdentifier sdk: self.sdk]; + result = [[MAAppOpenAd alloc] initWithAdUnitIdentifier: adUnitIdentifier]; result.delegate = self; result.revenueDelegate = self; + result.expirationDelegate = self; self.appOpenAds[adUnitIdentifier] = result; } @@ -1604,10 +1566,11 @@ static ALUnityBackgroundCallback backgroundCallback; MARewardedAd *result = self.rewardedAds[adUnitIdentifier]; if ( !result ) { - result = [MARewardedAd sharedWithAdUnitIdentifier: adUnitIdentifier sdk: self.sdk]; + result = [MARewardedAd sharedWithAdUnitIdentifier: adUnitIdentifier]; result.delegate = self; result.revenueDelegate = self; result.adReviewDelegate = self; + result.expirationDelegate = self; self.rewardedAds[adUnitIdentifier] = result; } @@ -1615,34 +1578,35 @@ static ALUnityBackgroundCallback backgroundCallback; return result; } -- (MARewardedInterstitialAd *)retrieveRewardedInterstitialAdForAdUnitIdentifier:(NSString *)adUnitIdentifier -{ - MARewardedInterstitialAd *result = self.rewardedInterstitialAds[adUnitIdentifier]; - if ( !result ) - { - result = [[MARewardedInterstitialAd alloc] initWithAdUnitIdentifier: adUnitIdentifier sdk: self.sdk]; - result.delegate = self; - result.revenueDelegate = self; - result.adReviewDelegate = self; - - self.rewardedInterstitialAds[adUnitIdentifier] = result; - } - - return result; -} - - (MAAdView *)retrieveAdViewForAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat { - return [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat atPosition: nil withOffset: CGPointZero]; + return [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat atPosition: nil withOffset: CGPointZero isAdaptive: YES]; } -- (MAAdView *)retrieveAdViewForAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat atPosition:(NSString *)adViewPosition withOffset:(CGPoint)offset +- (MAAdView *)retrieveAdViewForAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat atPosition:(NSString *)adViewPosition withOffset:(CGPoint)offset isAdaptive:(BOOL)isAdaptive { MAAdView *result = self.adViews[adUnitIdentifier]; if ( !result && adViewPosition ) - { - result = [[MAAdView alloc] initWithAdUnitIdentifier: adUnitIdentifier adFormat: adFormat sdk: self.sdk]; + { + MAAdViewConfiguration *config = [MAAdViewConfiguration configurationWithBuilderBlock:^(MAAdViewConfigurationBuilder *builder) { + + // Set adaptive type only for banner ads. If adaptive is enabled, use ANCHORED; otherwise, fall back to NONE. + if ( [adFormat isBannerOrLeaderAd] ) + { + if ( isAdaptive ) + { + builder.adaptiveType = MAAdViewAdaptiveTypeAnchored; + } + else + { + builder.adaptiveType = MAAdViewAdaptiveTypeNone; + [self.disabledAdaptiveBannerAdUnitIdentifiers addObject:adUnitIdentifier]; + } + } + }]; + // There is a Unity bug where if an empty UIView is on screen with user interaction enabled, and a user interacts with it, it just passes the events to random parts of the screen. + result = [[MAAdView alloc] initWithAdUnitIdentifier:adUnitIdentifier adFormat:adFormat configuration:config]; result.userInteractionEnabled = NO; result.translatesAutoresizingMaskIntoConstraints = NO; result.delegate = self; @@ -1739,6 +1703,8 @@ static ALUnityBackgroundCallback backgroundCallback; NSMutableArray *constraints = [NSMutableArray arrayWithObject: [adView.heightAnchor constraintEqualToConstant: adViewSize.height]]; UILayoutGuide *layoutGuide = superview.safeAreaLayoutGuide; + BOOL shouldIgnoreSafeArea = [self shouldIgnoreSafeAreaForAdUnitIdentifier: adUnitIdentifier]; + NSLayoutAnchor *topAnchor = shouldIgnoreSafeArea ? superview.topAnchor : layoutGuide.topAnchor; if ( [adViewPosition isEqual: @"top_center"] || [adViewPosition isEqual: @"bottom_center"] ) { @@ -1769,7 +1735,7 @@ static ALUnityBackgroundCallback backgroundCallback; if ( [adViewPosition isEqual: @"top_center"] ) { - [constraints addObjectsFromArray: @[[adView.topAnchor constraintEqualToAnchor: layoutGuide.topAnchor], + [constraints addObjectsFromArray: @[[adView.topAnchor constraintEqualToAnchor: topAnchor], [self.safeAreaBackground.topAnchor constraintEqualToAnchor: superview.topAnchor], [self.safeAreaBackground.bottomAnchor constraintEqualToAnchor: adView.topAnchor]]]; } @@ -1789,7 +1755,7 @@ static ALUnityBackgroundCallback backgroundCallback; if ( [adViewPosition isEqual: @"top_center"] ) { - [constraints addObjectsFromArray: @[[adView.topAnchor constraintEqualToAnchor: layoutGuide.topAnchor], + [constraints addObjectsFromArray: @[[adView.topAnchor constraintEqualToAnchor: topAnchor], [self.safeAreaBackground.topAnchor constraintEqualToAnchor: superview.topAnchor], [self.safeAreaBackground.bottomAnchor constraintEqualToAnchor: adView.topAnchor]]]; } @@ -1811,7 +1777,7 @@ static ALUnityBackgroundCallback backgroundCallback; if ( [adViewPosition isEqual: @"top_center"] ) { - [constraints addObject: [adView.topAnchor constraintEqualToAnchor: layoutGuide.topAnchor]]; + [constraints addObject: [adView.topAnchor constraintEqualToAnchor: topAnchor]]; } else // BottomCenter { @@ -1928,11 +1894,11 @@ static ALUnityBackgroundCallback backgroundCallback; if ( [adViewPosition isEqual: @"top_left"] ) { [constraints addObjectsFromArray: @[[adView.leftAnchor constraintEqualToAnchor: superview.leftAnchor constant: adViewOffset.x], - [adView.topAnchor constraintEqualToAnchor: layoutGuide.topAnchor constant: adViewOffset.y]]]; + [adView.topAnchor constraintEqualToAnchor: topAnchor constant: adViewOffset.y]]]; } else if ( [adViewPosition isEqual: @"top_right"] ) { - [constraints addObjectsFromArray: @[[adView.topAnchor constraintEqualToAnchor: layoutGuide.topAnchor], + [constraints addObjectsFromArray: @[[adView.topAnchor constraintEqualToAnchor: topAnchor], [adView.rightAnchor constraintEqualToAnchor: superview.rightAnchor]]]; } else if ( [adViewPosition isEqual: @"centered"] ) @@ -2087,4 +2053,15 @@ static ALUnityBackgroundCallback backgroundCallback; } } +#pragma mark - Helper + +- (BOOL)shouldIgnoreSafeAreaForAdUnitIdentifier:(NSString *)adUnitIdentifier +{ + if ( ![self.ignoreSafeAreaLandscapeAdUnitIdentifiers containsObject: adUnitIdentifier] ) return NO; + + // We should use the superview instead of layout guide if the application's orientation is landscape and the extra parameter is set + UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation; + return orientation == UIInterfaceOrientationLandscapeRight || orientation == UIInterfaceOrientationLandscapeLeft; +} + @end diff --git a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m.meta b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m.meta similarity index 100% rename from Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m.meta rename to Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityAdManager.m.meta diff --git a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm similarity index 78% rename from Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm rename to Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm index 0ec08fd..b717fae 100644 --- a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm +++ b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm @@ -8,7 +8,7 @@ #import "MAUnityAdManager.h" -#define VERSION @"8.0.1" +#define VERSION @"8.6.2" #define NSSTRING(_X) ( (_X != NULL) ? [NSString stringWithCString: _X encoding: NSStringEncodingConversionAllowLossy].al_stringByTrimmingWhitespace : nil) @interface NSString (ALUtils) @@ -41,8 +41,8 @@ extern "C" // Helper method to create C string copy static const char * cStringCopy(NSString *string); // Helper method to log errors - void logUninitializedAccessError(const char *callingMethod); - void e(NSString *message); + void max_unity_log_uninitialized_access_error(const char *callingMethod); + void max_unity_log_error(NSString *message); ALSdk *getSdk() { @@ -190,13 +190,14 @@ extern "C" NSArray *availableMediatedNetworks = [getSdk() availableMediatedNetworks]; // Create array of serialized network strings - NSMutableArray *> *serializedNetworks = [NSMutableArray arrayWithCapacity: availableMediatedNetworks.count]; + NSMutableArray *> *serializedNetworks = [NSMutableArray arrayWithCapacity: availableMediatedNetworks.count]; for ( MAMediatedNetworkInfo *mediatedNetwork in availableMediatedNetworks ) { - NSDictionary *mediatedNetworkDictionary = @{@"name" : mediatedNetwork.name, - @"adapterClassName" : mediatedNetwork.adapterClassName, - @"adapterVersion" : mediatedNetwork.adapterVersion, - @"sdkVersion" : mediatedNetwork.sdkVersion}; + NSDictionary *mediatedNetworkDictionary = @{@"name" : mediatedNetwork.name, + @"adapterClassName" : mediatedNetwork.adapterClassName, + @"adapterVersion" : mediatedNetwork.adapterVersion, + @"sdkVersion" : mediatedNetwork.sdkVersion, + @"initializationStatus" : @(mediatedNetwork.initializationStatus)}; [serializedNetworks addObject: mediatedNetworkDictionary]; } @@ -208,7 +209,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - e(@"Failed to show mediation debugger - please ensure the AppLovin MAX Unity Plugin has been initialized by calling 'MaxSdk.InitializeSdk();'!"); + max_unity_log_error(@"Failed to show mediation debugger - please ensure the AppLovin MAX Unity Plugin has been initialized by calling 'MaxSdk.InitializeSdk();'!"); return; } @@ -219,20 +220,13 @@ extern "C" { if ( !_initializeSdkCalled ) { - e(@"Failed to show creative debugger - please ensure the AppLovin MAX Unity Plugin has been initialized by calling 'MaxSdk.InitializeSdk();'!"); + max_unity_log_error(@"Failed to show creative debugger - please ensure the AppLovin MAX Unity Plugin has been initialized by calling 'MaxSdk.InitializeSdk();'!"); return; } [getSdk() showCreativeDebugger]; } - int _MaxConsentDialogState() - { - if ( !_isSdkInitialized ) return ALConsentDialogStateUnknown; - - return (int) getSdk().configuration.consentDialogState; - } - void _MaxSetUserId(const char *userId) { getSdk().settings.userIdentifier = NSSTRING(userId); @@ -242,7 +236,7 @@ extern "C" { if ( _initializeSdkCalled ) { - e(@"Segment collection must be set before MAX SDK is initialized"); + max_unity_log_error(@"Segment collection must be set before MAX SDK is initialized"); return; } @@ -253,7 +247,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxGetSdkConfiguration"); + max_unity_log_uninitialized_access_error("_MaxGetSdkConfiguration"); return cStringCopy(@""); } @@ -299,33 +293,33 @@ extern "C" return [ALPrivacySettings isDoNotSellSet]; } - void _MaxCreateBanner(const char *adUnitIdentifier, const char *bannerPosition) + void _MaxCreateBanner(const char *adUnitIdentifier, const char *bannerPosition, bool isAdaptive) { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxCreateBanner"); + max_unity_log_uninitialized_access_error("_MaxCreateBanner"); return; } - [getAdManager() createBannerWithAdUnitIdentifier: NSSTRING(adUnitIdentifier) atPosition: NSSTRING(bannerPosition)]; + [getAdManager() createBannerWithAdUnitIdentifier: NSSTRING(adUnitIdentifier) atPosition: NSSTRING(bannerPosition) isAdaptive: isAdaptive]; } - void _MaxCreateBannerXY(const char *adUnitIdentifier, const float x, const float y) + void _MaxCreateBannerXY(const char *adUnitIdentifier, const float x, const float y, bool isAdaptive) { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxCreateBannerXY"); + max_unity_log_uninitialized_access_error("_MaxCreateBannerXY"); return; } - [getAdManager() createBannerWithAdUnitIdentifier: NSSTRING(adUnitIdentifier) x: x y: y]; + [getAdManager() createBannerWithAdUnitIdentifier: NSSTRING(adUnitIdentifier) x: x y: y isAdaptive: isAdaptive]; } void _MaxLoadBanner(const char *adUnitIdentifier) { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxLoadBanner"); + max_unity_log_uninitialized_access_error("_MaxLoadBanner"); return; } @@ -336,7 +330,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetBannerBackgroundColor"); + max_unity_log_uninitialized_access_error("_MaxSetBannerBackgroundColor"); return; } @@ -347,7 +341,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetBannerPlacement"); + max_unity_log_uninitialized_access_error("_MaxSetBannerPlacement"); return; } @@ -358,7 +352,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxStartBannerAutoRefresh"); + max_unity_log_uninitialized_access_error("_MaxStartBannerAutoRefresh"); return; } @@ -369,7 +363,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxStopBannerAutoRefresh"); + max_unity_log_uninitialized_access_error("_MaxStopBannerAutoRefresh"); return; } @@ -380,7 +374,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetBannerExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetBannerExtraParameter"); return; } @@ -393,7 +387,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetBannerLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetBannerLocalExtraParameter"); return; } @@ -406,7 +400,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetBannerLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetBannerLocalExtraParameter"); return; } @@ -420,7 +414,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetBannerCustomData"); + max_unity_log_uninitialized_access_error("_MaxSetBannerCustomData"); return; } @@ -431,7 +425,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetBannerWidth"); + max_unity_log_uninitialized_access_error("_MaxSetBannerWidth"); return; } @@ -442,7 +436,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxUpdateBannerPosition"); + max_unity_log_uninitialized_access_error("_MaxUpdateBannerPosition"); return; } @@ -453,7 +447,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxUpdateBannerPositionXY"); + max_unity_log_uninitialized_access_error("_MaxUpdateBannerPositionXY"); return; } @@ -464,7 +458,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxShowBanner"); + max_unity_log_uninitialized_access_error("_MaxShowBanner"); return; } @@ -475,7 +469,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxDestroyBanner"); + max_unity_log_uninitialized_access_error("_MaxDestroyBanner"); return; } @@ -486,7 +480,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxHideBanner"); + max_unity_log_uninitialized_access_error("_MaxHideBanner"); return; } @@ -497,7 +491,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxGetBannerLayout"); + max_unity_log_uninitialized_access_error("_MaxGetBannerLayout"); return cStringCopy(@""); } @@ -508,7 +502,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxCreateMRec"); + max_unity_log_uninitialized_access_error("_MaxCreateMRec"); return; } @@ -519,7 +513,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxCreateMRecXY"); + max_unity_log_uninitialized_access_error("_MaxCreateMRecXY"); return; } @@ -530,7 +524,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxLoadMRec"); + max_unity_log_uninitialized_access_error("_MaxLoadMRec"); return; } @@ -541,7 +535,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetMRecPlacement"); + max_unity_log_uninitialized_access_error("_MaxSetMRecPlacement"); return; } @@ -552,7 +546,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxStartMRecAutoRefresh"); + max_unity_log_uninitialized_access_error("_MaxStartMRecAutoRefresh"); return; } @@ -563,7 +557,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxStopMRecAutoRefresh"); + max_unity_log_uninitialized_access_error("_MaxStopMRecAutoRefresh"); return; } @@ -574,7 +568,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxUpdateMRecPosition"); + max_unity_log_uninitialized_access_error("_MaxUpdateMRecPosition"); return; } @@ -585,7 +579,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxUpdateMRecPositionXY"); + max_unity_log_uninitialized_access_error("_MaxUpdateMRecPositionXY"); return; } @@ -596,7 +590,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxShowMRec"); + max_unity_log_uninitialized_access_error("_MaxShowMRec"); return; } @@ -607,7 +601,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxDestroyMRec"); + max_unity_log_uninitialized_access_error("_MaxDestroyMRec"); return; } @@ -618,7 +612,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxHideMRec"); + max_unity_log_uninitialized_access_error("_MaxHideMRec"); return; } @@ -629,7 +623,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetMRecExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetMRecExtraParameter"); return; } @@ -642,7 +636,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetMRecLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetMRecLocalExtraParameter"); return; } @@ -655,7 +649,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetMRecLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetMRecLocalExtraParameter"); return; } @@ -669,7 +663,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetMRecCustomData"); + max_unity_log_uninitialized_access_error("_MaxSetMRecCustomData"); return; } @@ -680,7 +674,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxGetMRecLayout"); + max_unity_log_uninitialized_access_error("_MaxGetMRecLayout"); return cStringCopy(@""); } @@ -691,7 +685,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxLoadInterstitial"); + max_unity_log_uninitialized_access_error("_MaxLoadInterstitial"); return; } @@ -702,7 +696,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetInterstitialExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetInterstitialExtraParameter"); return; } @@ -715,7 +709,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetInterstitialLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetInterstitialLocalExtraParameter"); return; } @@ -728,7 +722,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetInterstitialLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetInterstitialLocalExtraParameter"); return; } @@ -742,7 +736,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxIsInterstitialReady"); + max_unity_log_uninitialized_access_error("_MaxIsInterstitialReady"); return false; } @@ -753,7 +747,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxShowInterstitial"); + max_unity_log_uninitialized_access_error("_MaxShowInterstitial"); return; } @@ -764,7 +758,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxLoadAppOpenAd"); + max_unity_log_uninitialized_access_error("_MaxLoadAppOpenAd"); return; } @@ -775,7 +769,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetAppOpenAdExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetAppOpenAdExtraParameter"); return; } @@ -788,7 +782,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetAppOpenAdLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetAppOpenAdLocalExtraParameter"); return; } @@ -801,7 +795,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetAppOpenAdLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetAppOpenAdLocalExtraParameter"); return; } @@ -815,7 +809,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxIsAppOpenAdReady"); + max_unity_log_uninitialized_access_error("_MaxIsAppOpenAdReady"); return false; } @@ -826,7 +820,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxShowAppOpenAd"); + max_unity_log_uninitialized_access_error("_MaxShowAppOpenAd"); return; } @@ -837,7 +831,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxLoadRewardedAd"); + max_unity_log_uninitialized_access_error("_MaxLoadRewardedAd"); return; } @@ -848,7 +842,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetRewardedAdExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetRewardedAdExtraParameter"); return; } @@ -861,7 +855,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetRewardedAdLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetRewardedAdLocalExtraParameter"); return; } @@ -874,7 +868,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxSetRewardedAdLocalExtraParameter"); + max_unity_log_uninitialized_access_error("_MaxSetRewardedAdLocalExtraParameter"); return; } @@ -888,7 +882,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxIsRewardedAdReady"); + max_unity_log_uninitialized_access_error("_MaxIsRewardedAdReady"); return false; } @@ -899,91 +893,18 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxShowRewardedAd"); + max_unity_log_uninitialized_access_error("_MaxShowRewardedAd"); return; } [getAdManager() showRewardedAdWithAdUnitIdentifier: NSSTRING(adUnitIdentifier) placement: NSSTRING(placement) customData: NSSTRING(customData)]; } - void _MaxLoadRewardedInterstitialAd(const char *adUnitIdentifier) - { - if ( !_initializeSdkCalled ) - { - logUninitializedAccessError("_MaxLoadRewardedInterstitialAd"); - return; - } - - [getAdManager() loadRewardedInterstitialAdWithAdUnitIdentifier: NSSTRING(adUnitIdentifier)]; - } - - void _MaxSetRewardedInterstitialAdExtraParameter(const char *adUnitIdentifier, const char *key, const char *value) - { - if ( !_initializeSdkCalled ) - { - logUninitializedAccessError("_MaxSetRewardedInterstitialAdExtraParameter"); - return; - } - - [getAdManager() setRewardedInterstitialAdExtraParameterForAdUnitIdentifier: NSSTRING(adUnitIdentifier) - key: NSSTRING(key) - value: NSSTRING(value)]; - } - - void _MaxSetRewardedInterstitialAdLocalExtraParameter(const char *adUnitIdentifier, const char *key, MAUnityRef value) - { - if ( !_initializeSdkCalled ) - { - logUninitializedAccessError("_MaxSetRewardedInterstitialAdLocalExtraParameter"); - return; - } - - [getAdManager() setRewardedInterstitialAdLocalExtraParameterForAdUnitIdentifier: NSSTRING(adUnitIdentifier) - key: NSSTRING(key) - value: (__bridge id)value]; - } - - void _MaxSetRewardedInterstitialAdLocalExtraParameterJSON(const char *adUnitIdentifier, const char *key, const char *json) - { - if ( !_initializeSdkCalled ) - { - logUninitializedAccessError("_MaxSetRewardedInterstitialAdLocalExtraParameter"); - return; - } - - id value = getLocalExtraParameterValue(json); - [getAdManager() setRewardedInterstitialAdLocalExtraParameterForAdUnitIdentifier: NSSTRING(adUnitIdentifier) - key: NSSTRING(key) - value: value]; - } - - bool _MaxIsRewardedInterstitialAdReady(const char *adUnitIdentifier) - { - if ( !_initializeSdkCalled ) - { - logUninitializedAccessError("_MaxIsRewardedInterstitialAdReady"); - return false; - } - - return [getAdManager() isRewardedInterstitialAdReadyWithAdUnitIdentifier: NSSTRING(adUnitIdentifier)]; - } - - void _MaxShowRewardedInterstitialAd(const char *adUnitIdentifier, const char *placement, const char *customData) - { - if ( !_initializeSdkCalled ) - { - logUninitializedAccessError("_MaxShowRewardedInterstitialAd"); - return; - } - - [getAdManager() showRewardedInterstitialAdWithAdUnitIdentifier: NSSTRING(adUnitIdentifier) placement: NSSTRING(placement) customData: NSSTRING(customData)]; - } - void _MaxTrackEvent(const char *event, const char *parameters) { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxTrackEvent"); + max_unity_log_uninitialized_access_error("_MaxTrackEvent"); return; } @@ -1045,11 +966,6 @@ extern "C" return [UIScreen.mainScreen nativeScale]; } - const char * _MaxGetAdInfo(const char *adUnitIdentifier) - { - return cStringCopy([getAdManager() adInfoForAdUnitIdentifier: NSSTRING(adUnitIdentifier)]); - } - const char * _MaxGetAdValue(const char *adUnitIdentifier, const char *key) { return cStringCopy([getAdManager() adValueForAdUnitIdentifier: NSSTRING(adUnitIdentifier) withKey: NSSTRING(key)]); @@ -1069,7 +985,7 @@ extern "C" { if ( _initializeSdkCalled ) { - e(@"Test device advertising IDs must be set before MAX SDK is initialized"); + max_unity_log_error(@"Test device advertising IDs must be set before MAX SDK is initialized"); return; } @@ -1086,7 +1002,7 @@ extern "C" { if ( _initializeSdkCalled ) { - e(@"Exception handler must be enabled/disabled before MAX SDK is initialized"); + max_unity_log_error(@"Exception handler must be enabled/disabled before MAX SDK is initialized"); return; } @@ -1099,7 +1015,7 @@ extern "C" if ( ![stringKey al_isValidString] ) { NSString *message = [NSString stringWithFormat:@"Failed to set extra parameter for nil or empty key: %@", stringKey]; - e(message); + max_unity_log_error(message); return; } @@ -1124,7 +1040,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxShowCmpForExistingUser"); + max_unity_log_uninitialized_access_error("_MaxShowCmpForExistingUser"); return; } @@ -1135,7 +1051,7 @@ extern "C" { if ( !_initializeSdkCalled ) { - logUninitializedAccessError("_MaxHasSupportedCmp"); + max_unity_log_uninitialized_access_error("_MaxHasSupportedCmp"); return false; } @@ -1147,13 +1063,13 @@ extern "C" return [MAUnityAdManager adaptiveBannerHeightForWidth: width]; } - void logUninitializedAccessError(const char *callingMethod) + void max_unity_log_uninitialized_access_error(const char *callingMethod) { NSString *message = [NSString stringWithFormat:@"Failed to execute: %s - please ensure the AppLovin MAX Unity Plugin has been initialized by calling 'MaxSdk.InitializeSdk();'!", callingMethod]; - e(message); + max_unity_log_error(message); } - void e(NSString *message) + void max_unity_log_error(NSString *message) { if (_disableAllLogs) return; diff --git a/Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm.meta b/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm.meta similarity index 100% rename from Assets/Plugins/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm.meta rename to Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm.meta diff --git a/Assets/Plugins/MaxSdk/CHANGELOG.md b/Assets/MaxSdk/CHANGELOG.md similarity index 61% rename from Assets/Plugins/MaxSdk/CHANGELOG.md rename to Assets/MaxSdk/CHANGELOG.md index 6153543..906f42b 100644 --- a/Assets/Plugins/MaxSdk/CHANGELOG.md +++ b/Assets/MaxSdk/CHANGELOG.md @@ -1,3 +1,3 @@ # AppLovin MAX Unity Plugin -To get the latest changes, see the [AppLovin MAX Unity Changelog](https://developers.applovin.com/en/max/unity/changelog). +To get the latest changes, see the [AppLovin MAX Unity Changelog](https://support.axon.ai/en/max/unity/changelog). diff --git a/Assets/Plugins/MaxSdk/CHANGELOG.md.meta b/Assets/MaxSdk/CHANGELOG.md.meta similarity index 100% rename from Assets/Plugins/MaxSdk/CHANGELOG.md.meta rename to Assets/MaxSdk/CHANGELOG.md.meta diff --git a/Assets/Plugins/MaxSdk/Mediation.meta b/Assets/MaxSdk/Mediation.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation.meta rename to Assets/MaxSdk/Mediation.meta diff --git a/Assets/MaxSdk/Mediation/BidMachine.meta b/Assets/MaxSdk/Mediation/BidMachine.meta new file mode 100644 index 0000000..d545268 --- /dev/null +++ b/Assets/MaxSdk/Mediation/BidMachine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd0367b017d574746a0e382ae11016f3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/AppLovin/Editor.meta b/Assets/MaxSdk/Mediation/BidMachine/Editor.meta similarity index 61% rename from Assets/Plugins/MaxSdk/AppLovin/Editor.meta rename to Assets/MaxSdk/Mediation/BidMachine/Editor.meta index 5293e1f..0f3541e 100644 --- a/Assets/Plugins/MaxSdk/AppLovin/Editor.meta +++ b/Assets/MaxSdk/Mediation/BidMachine/Editor.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: fe11ee64f53a3444488df87d514453f2 +guid: 527c65004f8c84edbb4c14b8a2a04c5d labels: - al_max -- al_max_export_path-MaxSdk/AppLovin/Editor +- al_max_export_path-MaxSdk/Mediation/BidMachine/Editor folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/MaxSdk/Mediation/BidMachine/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/BidMachine/Editor/Dependencies.xml new file mode 100644 index 0000000..d8031c2 --- /dev/null +++ b/Assets/MaxSdk/Mediation/BidMachine/Editor/Dependencies.xml @@ -0,0 +1,13 @@ + + + + + + https://artifactory.bidmachine.io/bidmachine + + + + + + + diff --git a/Assets/Plugins/MaxSdk/Mediation/Google/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/BidMachine/Editor/Dependencies.xml.meta similarity index 54% rename from Assets/Plugins/MaxSdk/Mediation/Google/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/BidMachine/Editor/Dependencies.xml.meta index 36bef72..81f22af 100644 --- a/Assets/Plugins/MaxSdk/Mediation/Google/Editor/Dependencies.xml.meta +++ b/Assets/MaxSdk/Mediation/BidMachine/Editor/Dependencies.xml.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 053b810d3594744e38b6fd0fa378fb57 +guid: 98a383532dccb495aa31190874842cbe labels: - al_max -- al_max_export_path-MaxSdk/Mediation/Google/Editor/Dependencies.xml +- al_max_export_path-MaxSdk/Mediation/BidMachine/Editor/Dependencies.xml TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/MaxSdk/Mediation/BigoAds.meta b/Assets/MaxSdk/Mediation/BigoAds.meta new file mode 100644 index 0000000..d1bf328 --- /dev/null +++ b/Assets/MaxSdk/Mediation/BigoAds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0231e11a6865432f82d7e5840771420 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor.meta b/Assets/MaxSdk/Mediation/BigoAds/Editor.meta similarity index 83% rename from Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor.meta rename to Assets/MaxSdk/Mediation/BigoAds/Editor.meta index f39517f..39a3140 100644 --- a/Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor.meta +++ b/Assets/MaxSdk/Mediation/BigoAds/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e326e4426964c4a458f8c34c89439533 +guid: 1235281c630214a8999b2185ceba6388 labels: - al_max - al_max_export_path-MaxSdk/Mediation/BigoAds/Editor diff --git a/Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml similarity index 90% rename from Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml index fe507b1..20c4d32 100644 --- a/Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml @@ -1,9 +1,9 @@ - + - + diff --git a/Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/ByteDance.meta b/Assets/MaxSdk/Mediation/ByteDance.meta new file mode 100644 index 0000000..1aacfa1 --- /dev/null +++ b/Assets/MaxSdk/Mediation/ByteDance.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa5d4776de6aa4aa181645b6ae49b251 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/ByteDance/Editor.meta b/Assets/MaxSdk/Mediation/ByteDance/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/ByteDance/Editor.meta rename to Assets/MaxSdk/Mediation/ByteDance/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml similarity index 92% rename from Assets/Plugins/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml index 441e7b3..5efb952 100644 --- a/Assets/Plugins/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml @@ -1,13 +1,13 @@ - + https://artifact.bytedance.com/repository/pangle - + diff --git a/Assets/Plugins/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/Chartboost.meta b/Assets/MaxSdk/Mediation/Chartboost.meta new file mode 100644 index 0000000..2ed1683 --- /dev/null +++ b/Assets/MaxSdk/Mediation/Chartboost.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d205a165a4d894ac9b6feaf7c1e4421f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/Chartboost/Editor.meta b/Assets/MaxSdk/Mediation/Chartboost/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Chartboost/Editor.meta rename to Assets/MaxSdk/Mediation/Chartboost/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml similarity index 93% rename from Assets/Plugins/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml index ba1e2cb..d3c7e14 100644 --- a/Assets/Plugins/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml @@ -1,7 +1,7 @@ - + https://cboost.jfrog.io/artifactory/chartboost-ads/ @@ -9,6 +9,6 @@ - + diff --git a/Assets/Plugins/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/Facebook.meta b/Assets/MaxSdk/Mediation/Facebook.meta new file mode 100644 index 0000000..ced2194 --- /dev/null +++ b/Assets/MaxSdk/Mediation/Facebook.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1bec255069bf4cfda6fcf830e5d0008 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/Facebook/Editor.meta b/Assets/MaxSdk/Mediation/Facebook/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Facebook/Editor.meta rename to Assets/MaxSdk/Mediation/Facebook/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml similarity index 95% rename from Assets/Plugins/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml index b303ae6..e455c3e 100644 --- a/Assets/Plugins/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml @@ -5,9 +5,9 @@ Since FAN SDK depends on older versions of a few support and play service versions `com.applovin.mediation:facebook-adapter:x.y.z.a` resolves to `com.applovin.mediation:facebook-adapter:+` which pulls down the beta versions of FAN SDK. Note that forcing the adapter is enough to stop Jar Resolver from pulling the latest FAN SDK. --> - + - + diff --git a/Assets/Plugins/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/Fyber.meta b/Assets/MaxSdk/Mediation/Fyber.meta new file mode 100644 index 0000000..34bc169 --- /dev/null +++ b/Assets/MaxSdk/Mediation/Fyber.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6caa0828d8a77446b9e088bbf4859bc4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/Fyber/Editor.meta b/Assets/MaxSdk/Mediation/Fyber/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Fyber/Editor.meta rename to Assets/MaxSdk/Mediation/Fyber/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml similarity index 92% rename from Assets/Plugins/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml index 96b6827..907fae4 100644 --- a/Assets/Plugins/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml @@ -1,9 +1,9 @@ - + - + diff --git a/Assets/Plugins/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/InMobi.meta b/Assets/MaxSdk/Mediation/InMobi.meta new file mode 100644 index 0000000..2809ba5 --- /dev/null +++ b/Assets/MaxSdk/Mediation/InMobi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57e6d5a4754a8481582c9fadc90f18d9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/InMobi/Editor.meta b/Assets/MaxSdk/Mediation/InMobi/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/InMobi/Editor.meta rename to Assets/MaxSdk/Mediation/InMobi/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml similarity index 94% rename from Assets/Plugins/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml index 17f006f..b23b96b 100644 --- a/Assets/Plugins/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml @@ -1,12 +1,12 @@ - + - + diff --git a/Assets/Plugins/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/IronSource.meta b/Assets/MaxSdk/Mediation/IronSource.meta new file mode 100644 index 0000000..e2cc7a2 --- /dev/null +++ b/Assets/MaxSdk/Mediation/IronSource.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0cb55de9565ed45af9b4b43609be274c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/IronSource/Editor.meta b/Assets/MaxSdk/Mediation/IronSource/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/IronSource/Editor.meta rename to Assets/MaxSdk/Mediation/IronSource/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml similarity index 59% rename from Assets/Plugins/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml index ee5c72b..2720e1e 100644 --- a/Assets/Plugins/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml @@ -1,13 +1,10 @@ - - - https://android-sdk.is.com/ - - + + - + diff --git a/Assets/Plugins/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/MediationAdapters.txt b/Assets/MaxSdk/Mediation/MediationAdapters.txt similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/MediationAdapters.txt rename to Assets/MaxSdk/Mediation/MediationAdapters.txt diff --git a/Assets/Plugins/MaxSdk/Mediation/MediationAdapters.txt.meta b/Assets/MaxSdk/Mediation/MediationAdapters.txt.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/MediationAdapters.txt.meta rename to Assets/MaxSdk/Mediation/MediationAdapters.txt.meta diff --git a/Assets/MaxSdk/Mediation/Mintegral.meta b/Assets/MaxSdk/Mediation/Mintegral.meta new file mode 100644 index 0000000..c1fe47f --- /dev/null +++ b/Assets/MaxSdk/Mediation/Mintegral.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2627919922358489da3adf1a5ac1b269 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/Mintegral/Editor.meta b/Assets/MaxSdk/Mediation/Mintegral/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Mintegral/Editor.meta rename to Assets/MaxSdk/Mediation/Mintegral/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml similarity index 93% rename from Assets/Plugins/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml index 360f038..0c4d22b 100644 --- a/Assets/Plugins/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml @@ -1,7 +1,7 @@ - + https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea @@ -9,6 +9,6 @@ - + diff --git a/Assets/Plugins/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/UnityAds.meta b/Assets/MaxSdk/Mediation/UnityAds.meta new file mode 100644 index 0000000..c67a175 --- /dev/null +++ b/Assets/MaxSdk/Mediation/UnityAds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de8dd244651464d549e42e9a133cddd9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/UnityAds/Editor.meta b/Assets/MaxSdk/Mediation/UnityAds/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/UnityAds/Editor.meta rename to Assets/MaxSdk/Mediation/UnityAds/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml similarity index 89% rename from Assets/Plugins/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml index b237050..9c84de3 100644 --- a/Assets/Plugins/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml @@ -1,9 +1,9 @@ - + - + diff --git a/Assets/Plugins/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Mediation/Vungle.meta b/Assets/MaxSdk/Mediation/Vungle.meta new file mode 100644 index 0000000..c7326f6 --- /dev/null +++ b/Assets/MaxSdk/Mediation/Vungle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01ffe4f16ac2e4d06aa6b12ef4336c5a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Mediation/Vungle/Editor.meta b/Assets/MaxSdk/Mediation/Vungle/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Vungle/Editor.meta rename to Assets/MaxSdk/Mediation/Vungle/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml b/Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml similarity index 90% rename from Assets/Plugins/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml rename to Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml index 9a89b3c..947695c 100644 --- a/Assets/Plugins/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml +++ b/Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml @@ -1,9 +1,9 @@ - + - + diff --git a/Assets/Plugins/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml.meta b/Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml.meta rename to Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml.meta diff --git a/Assets/MaxSdk/Prefabs.meta b/Assets/MaxSdk/Prefabs.meta new file mode 100644 index 0000000..76624d0 --- /dev/null +++ b/Assets/MaxSdk/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2404c2e2c38a244e6a62106324aed571 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Prefabs/BannerBottom.prefab b/Assets/MaxSdk/Prefabs/BannerBottom.prefab similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/BannerBottom.prefab rename to Assets/MaxSdk/Prefabs/BannerBottom.prefab diff --git a/Assets/Plugins/MaxSdk/Prefabs/BannerBottom.prefab.meta b/Assets/MaxSdk/Prefabs/BannerBottom.prefab.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/BannerBottom.prefab.meta rename to Assets/MaxSdk/Prefabs/BannerBottom.prefab.meta diff --git a/Assets/Plugins/MaxSdk/Prefabs/BannerTop.prefab b/Assets/MaxSdk/Prefabs/BannerTop.prefab similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/BannerTop.prefab rename to Assets/MaxSdk/Prefabs/BannerTop.prefab diff --git a/Assets/Plugins/MaxSdk/Prefabs/BannerTop.prefab.meta b/Assets/MaxSdk/Prefabs/BannerTop.prefab.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/BannerTop.prefab.meta rename to Assets/MaxSdk/Prefabs/BannerTop.prefab.meta diff --git a/Assets/Plugins/MaxSdk/Prefabs/Interstitial.prefab b/Assets/MaxSdk/Prefabs/Interstitial.prefab similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/Interstitial.prefab rename to Assets/MaxSdk/Prefabs/Interstitial.prefab diff --git a/Assets/Plugins/MaxSdk/Prefabs/Interstitial.prefab.meta b/Assets/MaxSdk/Prefabs/Interstitial.prefab.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/Interstitial.prefab.meta rename to Assets/MaxSdk/Prefabs/Interstitial.prefab.meta diff --git a/Assets/Plugins/MaxSdk/Prefabs/Rewarded.prefab b/Assets/MaxSdk/Prefabs/Rewarded.prefab similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/Rewarded.prefab rename to Assets/MaxSdk/Prefabs/Rewarded.prefab diff --git a/Assets/Plugins/MaxSdk/Prefabs/Rewarded.prefab.meta b/Assets/MaxSdk/Prefabs/Rewarded.prefab.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Prefabs/Rewarded.prefab.meta rename to Assets/MaxSdk/Prefabs/Rewarded.prefab.meta diff --git a/Assets/MaxSdk/Resources.meta b/Assets/MaxSdk/Resources.meta new file mode 100644 index 0000000..c459e5d --- /dev/null +++ b/Assets/MaxSdk/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8d61d2a8a3dc44c3807075b30d28a21 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Resources/AppLovinSettings.asset b/Assets/MaxSdk/Resources/AppLovinSettings.asset similarity index 70% rename from Assets/Plugins/MaxSdk/Resources/AppLovinSettings.asset rename to Assets/MaxSdk/Resources/AppLovinSettings.asset index 9a01936..395044e 100644 --- a/Assets/Plugins/MaxSdk/Resources/AppLovinSettings.asset +++ b/Assets/MaxSdk/Resources/AppLovinSettings.asset @@ -13,10 +13,8 @@ MonoBehaviour: m_Name: AppLovinSettings m_EditorClassIdentifier: qualityServiceEnabled: 1 - sdkKey: 75hlabNGMSxe5WTSn2H_oK5IE_PJ0CBxXO1AL2SNc-An4qrOCLeSm_P5O8ThGrTTgVGJHUZhIb3g0-EpkJvOS4 - setAttributionReportEndpoint: 1 - addApsSkAdNetworkIds: 0 + sdkKey: LHx_tPFslZpTTiIPABmS24T7Ev1QEVOUVOzirpkxLUuTwJTVZGCKAk9L3Tm3FwuM5LxHK3q1EIbAemJB5sNpX2 customGradleVersionUrl: customGradleToolsVersion: adMobAndroidAppId: - adMobIosAppId: ca-app-pub-7983545592378569~4982292615 + adMobIosAppId: diff --git a/Assets/Plugins/MaxSdk/Resources/AppLovinSettings.asset.meta b/Assets/MaxSdk/Resources/AppLovinSettings.asset.meta similarity index 56% rename from Assets/Plugins/MaxSdk/Resources/AppLovinSettings.asset.meta rename to Assets/MaxSdk/Resources/AppLovinSettings.asset.meta index 22ec977..229a499 100644 --- a/Assets/Plugins/MaxSdk/Resources/AppLovinSettings.asset.meta +++ b/Assets/MaxSdk/Resources/AppLovinSettings.asset.meta @@ -1,8 +1,5 @@ fileFormatVersion: 2 -guid: 69c0df399eee6a94dadd5302d50bdba2 -labels: -- al_max -- al_max_export_path-MaxSdk/Resources/AppLovinSettings.asset +guid: 7092af7cb57455b4f848c91e440ff8e6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/MaxSdk/Resources/Images.meta b/Assets/MaxSdk/Resources/Images.meta new file mode 100644 index 0000000..15304e8 --- /dev/null +++ b/Assets/MaxSdk/Resources/Images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6dae693226ab4e0fb1ffd0bac8ed527 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Resources/Images/alert_icon.png b/Assets/MaxSdk/Resources/Images/error_icon.png similarity index 100% rename from Assets/Plugins/MaxSdk/Resources/Images/alert_icon.png rename to Assets/MaxSdk/Resources/Images/error_icon.png diff --git a/Assets/Plugins/MaxSdk/Resources/Images/alert_icon.png.meta b/Assets/MaxSdk/Resources/Images/error_icon.png.meta similarity index 97% rename from Assets/Plugins/MaxSdk/Resources/Images/alert_icon.png.meta rename to Assets/MaxSdk/Resources/Images/error_icon.png.meta index 634d290..9d58299 100644 --- a/Assets/Plugins/MaxSdk/Resources/Images/alert_icon.png.meta +++ b/Assets/MaxSdk/Resources/Images/error_icon.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 572fee4574afa4f6dbf2846e0c152fe8 labels: - al_max -- al_max_export_path-MaxSdk/Resources/Images/alert_icon.png +- al_max_export_path-MaxSdk/Resources/Images/error_icon.png TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/MaxSdk/Resources/Images/info_icon.png b/Assets/MaxSdk/Resources/Images/info_icon.png new file mode 100644 index 0000000..a0b19e8 Binary files /dev/null and b/Assets/MaxSdk/Resources/Images/info_icon.png differ diff --git a/Assets/MaxSdk/Resources/Images/info_icon.png.meta b/Assets/MaxSdk/Resources/Images/info_icon.png.meta new file mode 100644 index 0000000..273c8fb --- /dev/null +++ b/Assets/MaxSdk/Resources/Images/info_icon.png.meta @@ -0,0 +1,95 @@ +fileFormatVersion: 2 +guid: 036a0d1eebcb7467ba676e6cb67c7872 +labels: +- al_max +- al_max_export_path-MaxSdk/Resources/Images/info_icon.png +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Resources/Images/uninstall_icon.png b/Assets/MaxSdk/Resources/Images/uninstall_icon.png similarity index 100% rename from Assets/Plugins/MaxSdk/Resources/Images/uninstall_icon.png rename to Assets/MaxSdk/Resources/Images/uninstall_icon.png diff --git a/Assets/Plugins/MaxSdk/Resources/Images/uninstall_icon.png.meta b/Assets/MaxSdk/Resources/Images/uninstall_icon.png.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Resources/Images/uninstall_icon.png.meta rename to Assets/MaxSdk/Resources/Images/uninstall_icon.png.meta diff --git a/Assets/Plugins/MaxSdk/Resources/Images/warning_icon.png b/Assets/MaxSdk/Resources/Images/warning_icon.png similarity index 100% rename from Assets/Plugins/MaxSdk/Resources/Images/warning_icon.png rename to Assets/MaxSdk/Resources/Images/warning_icon.png diff --git a/Assets/Plugins/MaxSdk/Resources/Images/warning_icon.png.meta b/Assets/MaxSdk/Resources/Images/warning_icon.png.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Resources/Images/warning_icon.png.meta rename to Assets/MaxSdk/Resources/Images/warning_icon.png.meta diff --git a/Assets/MaxSdk/Scripts.meta b/Assets/MaxSdk/Scripts.meta new file mode 100644 index 0000000..b761201 --- /dev/null +++ b/Assets/MaxSdk/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44d5fe5a063924114b6d7a13e4bebb04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager.meta b/Assets/MaxSdk/Scripts/IntegrationManager.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager.meta rename to Assets/MaxSdk/Scripts/IntegrationManager.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs similarity index 98% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs index 08e543c..922518e 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs @@ -16,7 +16,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// Handles auto updates for AppLovin MAX plugin. /// - public class AppLovinAutoUpdater + public static class AppLovinAutoUpdater { public const string KeyAutoUpdateEnabled = "com.applovin.auto_update_enabled"; private const string KeyLastUpdateCheckTime = "com.applovin.last_update_check_time_v2"; // Updated to v2 to force adapter version checks in plugin version 3.1.10. @@ -97,7 +97,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor if (option == 0) // Download { MaxSdkLogger.UserDebug("Downloading plugin..."); - AppLovinIntegrationManager.downloadPluginProgressCallback = AppLovinIntegrationManagerWindow.OnDownloadPluginProgress; AppLovinEditorCoroutine.StartCoroutine(AppLovinIntegrationManager.Instance.DownloadPlugin(data.AppLovinMax)); } else if (option == 1) // Not Now diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinAutoUpdater.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs similarity index 98% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs index c9cd21f..28cb496 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs @@ -18,7 +18,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// TODO: Currently only supports shell (Linux). Add support for Windows machines. /// - public class AppLovinCommandLine + public static class AppLovinCommandLine { /// /// Result obtained by running a command line command. diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinCommandLine.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinEditorCoroutine.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs similarity index 90% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs index b15f60d..7c1cdc8 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs @@ -6,10 +6,8 @@ // Copyright © 2019 AppLovin. All rights reserved. // -using AppLovinMax.Scripts.IntegrationManager.Editor; using System.Collections.Generic; using System.IO; -using System.Linq; using UnityEditor; namespace AppLovinMax.Scripts.IntegrationManager.Editor @@ -74,11 +72,22 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor "MaxSdk/Version.md", "MaxSdk/Version.md.meta", - // TODO: Add MaxTargetingData and MaxUserSegment when the plugin has enough traction. + // The alert_icon.png has been renamed to error_icon.png. + "MaxSdk/Resources/Images/alert_icon.png", + "MaxSdk/Resources/Images/alert_icon.png.meta", + + // `TargetingData` has been removed and we no longer set `UserSegment` through the Unity Plugin. + "MaxSdk/Scripts/MaxUserSegment.cs", + "MaxSdk/Scripts/MaxUserSegment.cs.meta", + "MaxSdk/Scripts/MaxTargetingData.cs", + "MaxSdk/Scripts/MaxTargetingData.cs.meta" }; static AppLovinInitialize() { + // Don't run obsolete file cleanup logic when entering play mode. + if (EditorApplication.isPlayingOrWillChangePlaymode) return; + #if UNITY_IOS // Check that the publisher is targeting iOS 9.0+ if (!PlayerSettings.iOS.targetOSVersionString.StartsWith("9.") && !PlayerSettings.iOS.targetOSVersionString.StartsWith("1")) diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInitialize.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs similarity index 68% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs index 1f4c940..236b952 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs @@ -8,9 +8,8 @@ using System; using System.Collections; -using System.Collections.Generic; using System.IO; -using System.Linq; +using AppLovinMax.Internal; using UnityEditor; using UnityEngine; using UnityEngine.Networking; @@ -20,10 +19,12 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor [Serializable] public class PluginData { + // ReSharper disable InconsistentNaming - Consistent with JSON data. public Network AppLovinMax; public Network[] MediatedNetworks; public Network[] PartnerMicroSdks; public DynamicLibraryToEmbed[] ThirdPartyDynamicLibrariesToEmbed; + public Alert[] Alerts; } [Serializable] @@ -46,6 +47,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor // } // + // ReSharper disable InconsistentNaming - Consistent with JSON data. public string Name; public string DisplayName; public string DownloadUrl; @@ -53,15 +55,18 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public PackageInfo[] Packages; public string[] PluginFilePaths; public Versions LatestVersions; + public DynamicLibraryToEmbed[] DynamicLibrariesToEmbed; + [NonSerialized] public Versions CurrentVersions; [NonSerialized] public MaxSdkUtils.VersionComparisonResult CurrentToLatestVersionComparisonResult = MaxSdkUtils.VersionComparisonResult.Lesser; [NonSerialized] public bool RequiresUpdate; - public DynamicLibraryToEmbed[] DynamicLibrariesToEmbed; + [NonSerialized] public bool IsCurrentlyInstalling; } [Serializable] public class DynamicLibraryToEmbed { + // ReSharper disable InconsistentNaming - Consistent with JSON data. public string PodName; public string[] FrameworkNames; @@ -78,12 +83,62 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor } } + public enum Severity + { + Info, + Warning, + Error + } + + [Serializable] + public class Alert + { + public string SeverityType; + public string Title; + public string Message; + public string Url; + public string MinimumPluginVersion; + public string MaximumPluginVersion; + public string MinimumUnityVersion; + public string MaximumUnityVersion; + + public Severity Severity; + + public void InitializeSeverityEnum() + { + switch (SeverityType) + { + case "INFO": + Severity = Severity.Info; + break; + case "WARNING": + Severity = Severity.Warning; + break; + case "ERROR": + Severity = Severity.Error; + break; + default: + MaxSdkLogger.E(string.Format("Alert <{0}> has unsupported severity type <{1}>.", Title, SeverityType)); + Severity = Severity.Info; + break; + } + } + + public bool ShouldShowAlert() + { + var pluginVersionValid = MaxSdkUtils.IsVersionInRange(MaxSdk.Version, MinimumPluginVersion, MaximumPluginVersion); + var unityVersionValid = MaxSdkUtils.IsVersionInRange(Application.unityVersion, MinimumUnityVersion, MaximumUnityVersion); + return pluginVersionValid && unityVersionValid; + } + } + /// /// A helper data class used to get current versions from Dependency.xml files. /// [Serializable] public class Versions { + // ReSharper disable InconsistentNaming - Consistent with JSON data. public string Unity; public string Android; public string Ios; @@ -107,12 +162,14 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public override int GetHashCode() { - return new {Unity, Android, Ios}.GetHashCode(); + return new {unity = Unity, android = Android, ios = Ios}.GetHashCode(); } private static string AdapterSdkVersion(string adapterVersion) { - var index = adapterVersion.LastIndexOf("."); + if (string.IsNullOrEmpty(adapterVersion)) return ""; + + var index = adapterVersion.LastIndexOf(".", StringComparison.Ordinal); return index > 0 ? adapterVersion.Substring(0, index) : adapterVersion; } } @@ -123,32 +180,30 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public class AppLovinIntegrationManager { /// - /// Delegate to be called when downloading a plugin with the progress percentage. + /// Delegate to be called when a plugin package's import is started. /// - /// The name of the plugin being downloaded. - /// Percentage downloaded. - /// Whether or not the download is complete. - public delegate void DownloadPluginProgressCallback(string pluginName, float progress, bool done); + internal delegate void ImportPackageStartedCallback(Network network); /// - /// Delegate to be called when a plugin package is imported. + /// Delegate to be called when a plugin package is finished importing. /// /// The network data for which the package is imported. - public delegate void ImportPackageCompletedCallback(Network network); + internal delegate void ImportPackageCompletedCallback(Network network); private static readonly AppLovinIntegrationManager instance = new AppLovinIntegrationManager(); internal static readonly string GradleTemplatePath = Path.Combine("Assets/Plugins/Android", "mainTemplate.gradle"); private const string MaxSdkAssetExportPath = "MaxSdk/Scripts/MaxSdk.cs"; + private const string MaxSdkMediationExportPath = "MaxSdk/Mediation"; - private static readonly string PluginDataEndpoint = "https://unity.applovin.com/max/1.0/integration_manager_info?plugin_version={0}"; + private const string PluginDataEndpoint = "https://unity.applovin.com/max/1.0/integration_manager_info?plugin_version={0}"; private static string externalDependencyManagerVersion; - public static DownloadPluginProgressCallback downloadPluginProgressCallback; - public static ImportPackageCompletedCallback importPackageCompletedCallback; + internal static ImportPackageStartedCallback OnImportPackageStartedCallback; + internal static ImportPackageCompletedCallback OnImportPackageCompletedCallback; - private UnityWebRequest webRequest; + private MaxWebRequest maxWebRequest; private Network importingNetwork; /// @@ -166,8 +221,8 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { get { - // Search for the asset with the default exported path first, In most cases, we should be able to find the asset. - // In some cases where we don't, use the platform specific export path to search for the asset (in case of migrating a project from Windows to Mac or vice versa). + // Search for the asset with the export path label. + // Paths are normalized using AltDirectorySeparatorChar (/) to ensure compatibility across platforms (in case of migrating a project from Windows to Mac or vice versa). var maxSdkScriptAssetPath = MaxSdkUtils.GetAssetPathForExportPath(MaxSdkAssetExportPath); // maxSdkScriptAssetPath will always have AltDirectorySeparatorChar (/) as the path separator. Convert to platform specific path. @@ -176,6 +231,15 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor } } + public static string MediationDirectory + { + get + { + var mediationAssetPath = MaxSdkUtils.GetAssetPathForExportPath(MaxSdkMediationExportPath); + return mediationAssetPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar); + } + } + /// /// Whether or not the plugin is in the Unity Package Manager. /// @@ -215,7 +279,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { get { - if (!string.IsNullOrEmpty(externalDependencyManagerVersion)) return externalDependencyManagerVersion; + if (MaxSdkUtils.IsValidString(externalDependencyManagerVersion)) return externalDependencyManagerVersion; try { @@ -235,6 +299,13 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private AppLovinIntegrationManager() { + AssetDatabase.importPackageStarted += packageName => + { + if (!IsImportingNetwork(packageName)) return; + + CallImportPackageStartedCallback(importingNetwork); + }; + // Add asset import callbacks. AssetDatabase.importPackageCompleted += packageName => { @@ -250,7 +321,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { if (!IsImportingNetwork(packageName)) return; - MaxSdkLogger.UserDebug("Package import cancelled."); importingNetwork = null; }; @@ -268,15 +338,15 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public static PluginData LoadPluginDataSync() { var url = string.Format(PluginDataEndpoint, MaxSdk.Version); - using (var unityWebRequest = UnityWebRequest.Get(url)) + var webRequestConfig = new WebRequestConfig() { - var operation = unityWebRequest.SendWebRequest(); + EndPoint = url, + }; - // Just wait till www is done - while (!operation.isDone) { } + var maxWebRequest = new MaxWebRequest(webRequestConfig); + var webResponse = maxWebRequest.SendSync(); - return CreatePluginDataFromWebResponse(unityWebRequest); - } + return CreatePluginDataFromWebResponse(webResponse); } /// @@ -286,25 +356,22 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public IEnumerator LoadPluginData(Action callback) { var url = string.Format(PluginDataEndpoint, MaxSdk.Version); - using (var unityWebRequest = UnityWebRequest.Get(url)) + var webRequestConfig = new WebRequestConfig() { - var operation = unityWebRequest.SendWebRequest(); - - while (!operation.isDone) yield return new WaitForSeconds(0.1f); // Just wait till www is done. Our coroutine is pretty rudimentary. - - var pluginData = CreatePluginDataFromWebResponse(unityWebRequest); + EndPoint = url, + }; + maxWebRequest = new MaxWebRequest(webRequestConfig); + yield return maxWebRequest.Send(webResponse => + { + var pluginData = CreatePluginDataFromWebResponse(webResponse); callback(pluginData); - } + }); } - private static PluginData CreatePluginDataFromWebResponse(UnityWebRequest unityWebRequest) + private static PluginData CreatePluginDataFromWebResponse(WebResponse webResponse) { -#if UNITY_2020_1_OR_NEWER - if (unityWebRequest.result != UnityWebRequest.Result.Success) -#else - if (unityWebRequest.isNetworkError || unityWebRequest.isHttpError) -#endif + if (!webResponse.IsSuccess) { MaxSdkLogger.E("Failed to load plugin data. Please check your internet connection."); return null; @@ -313,7 +380,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor PluginData pluginData; try { - pluginData = JsonUtility.FromJson(unityWebRequest.downloadHandler.text); + pluginData = JsonUtility.FromJson(webResponse.ResponseMessage); AppLovinPackageManager.PluginData = pluginData; } catch (Exception exception) @@ -334,9 +401,20 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor AppLovinPackageManager.UpdateCurrentVersions(network); } - foreach (var partnerMicroSdk in pluginData.PartnerMicroSdks) + if (pluginData.PartnerMicroSdks != null) { - AppLovinPackageManager.UpdateCurrentVersions(partnerMicroSdk); + foreach (var partnerMicroSdk in pluginData.PartnerMicroSdks) + { + AppLovinPackageManager.UpdateCurrentVersions(partnerMicroSdk); + } + } + + if (pluginData.Alerts == null) return pluginData; + + // Initiate Severity enums from the raw strings in the response + foreach (var alert in pluginData.Alerts) + { + alert.InitializeSeverityEnum(); } return pluginData; @@ -351,36 +429,25 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public IEnumerator DownloadPlugin(Network network, bool showImport = true) { var path = Path.Combine(Application.temporaryCachePath, GetPluginFileName(network)); // TODO: Maybe delete plugin file after finishing import. - var downloadHandler = new DownloadHandlerFile(path); - webRequest = new UnityWebRequest(network.DownloadUrl) + var webRequestConfig = new WebRequestConfig() { - method = UnityWebRequest.kHttpVerbGET, - downloadHandler = downloadHandler + DownloadHandler = new DownloadHandlerFile(path), + EndPoint = network.DownloadUrl }; - var operation = webRequest.SendWebRequest(); - while (!operation.isDone) + maxWebRequest = new MaxWebRequest(webRequestConfig); + yield return maxWebRequest.Send(webResponse => { - yield return new WaitForSeconds(0.1f); // Just wait till webRequest is completed. Our coroutine is pretty rudimentary. - CallDownloadPluginProgressCallback(network.DisplayName, operation.progress, operation.isDone); - } - -#if UNITY_2020_1_OR_NEWER - if (webRequest.result != UnityWebRequest.Result.Success) -#else - if (webRequest.isNetworkError || webRequest.isHttpError) -#endif - { - MaxSdkLogger.UserError(webRequest.error); - } - else - { - importingNetwork = network; - AssetDatabase.ImportPackage(path, showImport); - } - - webRequest.Dispose(); - webRequest = null; + if (webResponse.IsSuccess) + { + importingNetwork = network; + AssetDatabase.ImportPackage(path, showImport); + } + else + { + MaxSdkLogger.UserError("Failed to download plugin package: " + webResponse.ErrorMessage); + } + }); } /// @@ -388,9 +455,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// public void CancelDownload() { - if (webRequest == null) return; + if (maxWebRequest == null) return; - webRequest.Abort(); + maxWebRequest.Abort(); } /// @@ -421,18 +488,18 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor return importingNetwork != null && GetPluginFileName(importingNetwork).Contains(packageName); } - private static void CallDownloadPluginProgressCallback(string pluginName, float progress, bool isDone) + private static void CallImportPackageStartedCallback(Network network) { - if (downloadPluginProgressCallback == null) return; + if (OnImportPackageStartedCallback == null) return; - downloadPluginProgressCallback(pluginName, progress, isDone); + OnImportPackageStartedCallback(network); } private static void CallImportPackageCompletedCallback(Network network) { - if (importPackageCompletedCallback == null) return; + if (OnImportPackageCompletedCallback == null) return; - importPackageCompletedCallback(network); + OnImportPackageCompletedCallback(network); } private static object GetEditorUserBuildSetting(string name, object defaultValue) diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManager.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerUtils.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs similarity index 74% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs index 151d5d6..244a76a 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs @@ -8,6 +8,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.IO; using System.Linq; using UnityEditor; @@ -17,57 +18,58 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { public class AppLovinIntegrationManagerWindow : EditorWindow { - private const string windowTitle = "AppLovin Integration Manager"; + private const string WindowTitle = "AppLovin Integration Manager"; - private const string appLovinSdkKeyLink = "https://dash.applovin.com/o/account#keys"; + private const string AppLovinSdkKeyLink = "https://dash.applovin.com/o/account#keys"; - private const string userTrackingUsageDescriptionDocsLink = "https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription"; - private const string documentationTermsAndPrivacyPolicyFlow = "https://developers.applovin.com/en/unity/overview/terms-and-privacy-policy-flow"; - private const string documentationAdaptersLink = "https://developers.applovin.com/en/unity/preparing-mediated-networks"; - private const string documentationNote = "Please ensure that integration instructions (e.g. permissions, ATS settings, etc) specific to each network are implemented as well. Click the link below for more info:"; - private const string uninstallIconExportPath = "MaxSdk/Resources/Images/uninstall_icon.png"; - private const string alertIconExportPath = "MaxSdk/Resources/Images/alert_icon.png"; - private const string warningIconExportPath = "MaxSdk/Resources/Images/warning_icon.png"; + private const string UserTrackingUsageDescriptionDocsLink = "https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription"; + private const string DocumentationTermsAndPrivacyPolicyFlow = "https://support.axon.ai/en/max/unity/overview/terms-and-privacy-policy-flow"; + private const string DocumentationAdaptersLink = "https://support.axon.ai/en/max/unity/preparing-mediated-networks"; + private const string DocumentationNote = "Please ensure that integration instructions (e.g. permissions, ATS settings, etc) specific to each network are implemented as well. Click the link below for more info:"; + private const string UninstallIconExportPath = "MaxSdk/Resources/Images/uninstall_icon.png"; + private const string InfoIconExportPath = "MaxSdk/Resources/Images/info_icon.png"; + private const string WarningIconExportPath = "MaxSdk/Resources/Images/warning_icon.png"; + private const string ErrorIconExportPath = "MaxSdk/Resources/Images/error_icon.png"; - private const string qualityServiceRequiresGradleBuildErrorMsg = "AppLovin Quality Service integration via AppLovin Integration Manager requires Custom Gradle Template enabled or Unity 2018.2 or higher.\n" + + private const string QualityServiceRequiresGradleBuildErrorMsg = "AppLovin Quality Service integration via AppLovin Integration Manager requires Custom Gradle Template enabled or Unity 2018.2 or higher.\n" + "If you would like to continue using your existing setup, please add Quality Service Plugin to your build.gradle manually."; - private const string customGradleVersionTooltip = "To set the version to 6.9.3, set the field to: https://services.gradle.org/distributions/gradle-6.9.3-bin.zip"; - private const string customGradleToolsVersionTooltip = "To set the version to 4.2.0, set the field to: 4.2.0"; + private const string CustomGradleVersionTooltip = "To set the version to 6.9.3, set the field to: https://services.gradle.org/distributions/gradle-6.9.3-bin.zip"; + private const string CustomGradleToolsVersionTooltip = "To set the version to 4.2.0, set the field to: 4.2.0"; - private const string keyShowMicroSdkPartners = "com.applovin.show_micro_sdk_partners"; - private const string keyShowMediatedNetworks = "com.applovin.show_mediated_networks"; - private const string keyShowSdkSettings = "com.applovin.show_sdk_settings"; - private const string keyShowPrivacySettings = "com.applovin.show_privacy_settings"; - private const string keyShowOtherSettings = "com.applovin.show_other_settings"; + private const string KeyShowAlerts = "com.applovin.show_alerts"; + private const string KeyShowMicroSdkPartners = "com.applovin.show_micro_sdk_partners"; + private const string KeyShowMediatedNetworks = "com.applovin.show_mediated_networks"; + private const string KeyShowSdkSettings = "com.applovin.show_sdk_settings"; + private const string KeyShowPrivacySettings = "com.applovin.show_privacy_settings"; + private const string KeyShowOtherSettings = "com.applovin.show_other_settings"; - private const string expandButtonText = "+"; - private const string collapseButtonText = "-"; + private const string ExpandButtonText = "+"; + private const string CollapseButtonText = "-"; - private const string externalDependencyManagerPath = "Assets/ExternalDependencyManager"; + private const string ExternalDependencyManagerPath = "Assets/ExternalDependencyManager"; - private readonly string[] termsFlowPlatforms = new string[3] {"Both", "Android", "iOS"}; private readonly string[] debugUserGeographies = new string[2] {"Not Set", "GDPR"}; private Vector2 scrollPosition; - private static readonly Vector2 windowMinSize = new Vector2(750, 750); - private const float actionFieldWidth = 60f; - private const float upgradeAllButtonWidth = 80f; - private const float networkFieldMinWidth = 100f; - private const float versionFieldMinWidth = 190f; - private const float privacySettingLabelWidth = 250f; - private const float networkFieldWidthPercentage = 0.22f; - private const float versionFieldWidthPercentage = 0.36f; // There are two version fields. Each take 40% of the width, network field takes the remaining 20%. - private static float previousWindowWidth = windowMinSize.x; - private static GUILayoutOption networkWidthOption = GUILayout.Width(networkFieldMinWidth); - private static GUILayoutOption versionWidthOption = GUILayout.Width(versionFieldMinWidth); + private static readonly Vector2 WindowMinSize = new Vector2(750, 750); + private const float ActionFieldWidth = 70f; + private const float UpgradeAllButtonWidth = 80f; + private const float NetworkFieldMinWidth = 100f; + private const float VersionFieldMinWidth = 190f; + private const float PrivacySettingLabelWidth = 250f; + private const float NetworkFieldWidthPercentage = 0.22f; + private const float VersionFieldWidthPercentage = 0.36f; // There are two version fields. Each take 40% of the width, network field takes the remaining 20%. + private static float previousWindowWidth = WindowMinSize.x; + private static GUILayoutOption networkWidthOption = GUILayout.Width(NetworkFieldMinWidth); + private static GUILayoutOption versionWidthOption = GUILayout.Width(VersionFieldMinWidth); private static GUILayoutOption privacySettingFieldWidthOption = GUILayout.Width(400); - private static readonly GUILayoutOption fieldWidth = GUILayout.Width(actionFieldWidth); - private static readonly GUILayoutOption upgradeAllButtonFieldWidth = GUILayout.Width(upgradeAllButtonWidth); - private static readonly GUILayoutOption collapseButtonWidthOption = GUILayout.Width(20f); + private static readonly GUILayoutOption FieldWidth = GUILayout.Width(ActionFieldWidth); + private static readonly GUILayoutOption UpgradeAllButtonFieldWidth = GUILayout.Width(UpgradeAllButtonWidth); + private static readonly GUILayoutOption CollapseButtonWidthOption = GUILayout.Width(20f); - private static readonly Color darkModeTextColor = new Color(0.29f, 0.6f, 0.8f); + private static readonly Color DarkModeTextColor = new Color(0.29f, 0.6f, 0.8f); private GUIStyle titleLabelStyle; private GUIStyle headerLabelStyle; @@ -83,13 +85,14 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private AppLovinEditorCoroutine loadDataCoroutine; private Texture2D uninstallIcon; - private Texture2D alertIcon; + private Texture2D infoIcon; private Texture2D warningIcon; + private Texture2D errorIcon; public static void ShowManager() { - var manager = GetWindow(utility: true, title: windowTitle, focus: true); - manager.minSize = windowMinSize; + var manager = GetWindow(utility: true, title: WindowTitle, focus: true); + manager.minSize = WindowMinSize; } #region Editor Window Lifecyle Methods @@ -118,7 +121,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor linkLabelStyle = new GUIStyle(EditorStyles.label) { wordWrap = true, - normal = {textColor = EditorGUIUtility.isProSkin ? darkModeTextColor : Color.blue} + normal = {textColor = EditorGUIUtility.isProSkin ? DarkModeTextColor : Color.blue} }; wrapTextLabelStyle = new GUIStyle(EditorStyles.label) @@ -134,19 +137,27 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor }; // Load uninstall icon texture. - var uninstallIconData = File.ReadAllBytes(MaxSdkUtils.GetAssetPathForExportPath(uninstallIconExportPath)); - uninstallIcon = new Texture2D(0, 0, TextureFormat.RGBA32, false); // 1. Initial size doesn't matter here, will be automatically resized once the image asset is loaded. 2. Set mipChain to false, else the texture has a weird blurry effect. + var uninstallIconData = File.ReadAllBytes(MaxSdkUtils.GetAssetPathForExportPath(UninstallIconExportPath)); + // 1. Set the initial size to 1, as Unity 6000 no longer supports a width or height of 0. + // 2. The image will be automatically resized once the image asset is loaded. + // 3. Set mipChain to false, else the texture has a weird blurry effect. + uninstallIcon = new Texture2D(1, 1, TextureFormat.RGBA32, false); uninstallIcon.LoadImage(uninstallIconData); - // Load alert icon texture. - var alertIconData = File.ReadAllBytes(MaxSdkUtils.GetAssetPathForExportPath(alertIconExportPath)); - alertIcon = new Texture2D(0, 0, TextureFormat.RGBA32, false); - alertIcon.LoadImage(alertIconData); + // Load info icon texture. + var infoIconData = File.ReadAllBytes(MaxSdkUtils.GetAssetPathForExportPath(InfoIconExportPath)); + infoIcon = new Texture2D(1, 1, TextureFormat.RGBA32, false); + infoIcon.LoadImage(infoIconData); // Load warning icon texture. - var warningIconData = File.ReadAllBytes(MaxSdkUtils.GetAssetPathForExportPath(warningIconExportPath)); - warningIcon = new Texture2D(0, 0, TextureFormat.RGBA32, false); + var warningIconData = File.ReadAllBytes(MaxSdkUtils.GetAssetPathForExportPath(WarningIconExportPath)); + warningIcon = new Texture2D(1, 1, TextureFormat.RGBA32, false); warningIcon.LoadImage(warningIconData); + + // Load error icon texture. + var errorIconData = File.ReadAllBytes(MaxSdkUtils.GetAssetPathForExportPath(ErrorIconExportPath)); + errorIcon = new Texture2D(1, 1, TextureFormat.RGBA32, false); + errorIcon.LoadImage(errorIconData); } private void OnEnable() @@ -171,10 +182,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private void OnWindowEnabled() { - AppLovinIntegrationManager.downloadPluginProgressCallback = OnDownloadPluginProgress; - // Plugin downloaded and imported. Update current versions for the imported package. - AppLovinIntegrationManager.importPackageCompletedCallback = OnImportPackageCompleted; + AppLovinIntegrationManager.OnImportPackageStartedCallback = OnImportPackageStarted; + AppLovinIntegrationManager.OnImportPackageCompletedCallback = OnImportPackageCompleted; Load(); } @@ -211,17 +221,36 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor // Draw AppLovin MAX plugin details EditorGUILayout.LabelField("AppLovin MAX Plugin Details", titleLabelStyle); - DrawPluginDetails(); - if (pluginData != null && pluginData.PartnerMicroSdks != null) + // Draw alerts + if (pluginData != null && pluginData.Alerts != null) { - DrawCollapsableSection(keyShowMicroSdkPartners, "AppLovin Micro SDK Partners", DrawPartnerMicroSdks); + var alertsToShow = pluginData.Alerts.Where(alert => alert.ShouldShowAlert()).ToList(); + if (alertsToShow.Count > 0) + { + EditorGUILayout.BeginHorizontal(); + var showAlertDetails = DrawExpandCollapseButton(KeyShowAlerts); + EditorGUILayout.LabelField("Alerts", titleLabelStyle, GUILayout.Width(45)); + DrawAlertCount(alertsToShow); + GUILayout.FlexibleSpace(); + EditorGUILayout.EndHorizontal(); + if (showAlertDetails) + { + DrawAlerts(alertsToShow); + } + } + } + + // Draw Micro SDK Partners + if (pluginData != null && !MaxSdkUtils.IsNullOrEmpty(pluginData.PartnerMicroSdks)) + { + DrawCollapsibleSection(KeyShowMicroSdkPartners, "AppLovin Micro SDK Partners", DrawPartnerMicroSdks); } // Draw mediated networks); EditorGUILayout.BeginHorizontal(); - var showDetails = DrawExpandCollapseButton(keyShowMediatedNetworks); + var showDetails = DrawExpandCollapseButton(KeyShowMediatedNetworks); EditorGUILayout.LabelField("Mediated Networks", titleLabelStyle); GUILayout.FlexibleSpace(); DrawUpgradeAllButton(); @@ -231,30 +260,28 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor DrawMediatedNetworks(); } -#if UNITY_2019_2_OR_NEWER if (!AppLovinIntegrationManager.IsPluginInPackageManager) { EditorGUILayout.LabelField("Unity Package Manager Migration", titleLabelStyle); DrawPluginMigrationHelper(); } -#endif // Draw AppLovin Quality Service settings - DrawCollapsableSection(keyShowSdkSettings, "SDK Settings", DrawQualityServiceSettings); + DrawCollapsibleSection(KeyShowSdkSettings, "SDK Settings", DrawQualityServiceSettings); - DrawCollapsableSection(keyShowPrivacySettings, "Privacy Settings", DrawPrivacySettings); + DrawCollapsibleSection(KeyShowPrivacySettings, "Privacy Settings", DrawPrivacySettings); - DrawCollapsableSection(keyShowOtherSettings, "Other Settings", DrawOtherSettings); + DrawCollapsibleSection(KeyShowOtherSettings, "Other Settings", DrawOtherSettings); // Draw Unity environment details EditorGUILayout.LabelField("Unity Environment Details", titleLabelStyle); DrawUnityEnvironmentDetails(); // Draw documentation notes - EditorGUILayout.LabelField(new GUIContent(documentationNote), wrapTextLabelStyle); - if (GUILayout.Button(new GUIContent(documentationAdaptersLink), linkLabelStyle)) + EditorGUILayout.LabelField(new GUIContent(DocumentationNote), wrapTextLabelStyle); + if (GUILayout.Button(new GUIContent(DocumentationAdaptersLink), linkLabelStyle)) { - Application.OpenURL(documentationAdaptersLink); + Application.OpenURL(DocumentationAdaptersLink); } } @@ -283,7 +310,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.BeginHorizontal(); GUILayout.Space(5); EditorGUILayout.LabelField("Failed to load plugin data. Please click retry or restart the integration manager.", titleLabelStyle); - if (GUILayout.Button("Retry", fieldWidth)) + if (GUILayout.Button("Retry", FieldWidth)) { pluginDataLoadFailed = false; Load(); @@ -338,9 +365,14 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.BeginHorizontal(); GUILayout.FlexibleSpace(); - GUI.enabled = upgradeButtonEnabled; - if (GUILayout.Button(new GUIContent("Upgrade"), fieldWidth)) + var action = appLovinMax.IsCurrentlyInstalling ? "Installing..." : "Upgrade"; + + GUI.enabled = upgradeButtonEnabled && !appLovinMax.IsCurrentlyInstalling; + if (GUILayout.Button(new GUIContent(action), FieldWidth)) { + // Only show "Installing..." if the plugin is in the Assets folder + // Manifest edits don't trigger import callbacks, and UPM resolution locks the UI anyway. + appLovinMax.IsCurrentlyInstalling = !AppLovinIntegrationManager.IsPluginInPackageManager; AppLovinEditorCoroutine.StartCoroutine(AppLovinPackageManager.AddNetwork(pluginData.AppLovinMax, true)); } @@ -356,6 +388,84 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.EndHorizontal(); } + /// + /// Draw the number of each alert type next to the alert section header. + /// + private void DrawAlertCount(List alerts) + { + if (pluginData == null) return; + + var infoAlertsCount = alerts.Count(alert => alert.Severity == Severity.Info); + var warningAlertsCount = alerts.Count(alert => alert.Severity == Severity.Warning); + var errorAlertsCount = alerts.Count(alert => alert.Severity == Severity.Error); + + GUILayout.Label(infoIcon, GUILayout.Width(20), GUILayout.Height(20)); + EditorGUILayout.LabelField(AlertCountToString(infoAlertsCount), GUILayout.Width(20)); + GUILayout.Label(warningIcon, GUILayout.Width(20), GUILayout.Height(20)); + EditorGUILayout.LabelField(AlertCountToString(warningAlertsCount), GUILayout.Width(20)); + GUILayout.Label(errorIcon, GUILayout.Width(20), GUILayout.Height(20)); + EditorGUILayout.LabelField(AlertCountToString(errorAlertsCount), GUILayout.Width(20)); + } + + /// + /// Draw the list of alerts grouped by severity. + /// + private void DrawAlerts(List alerts) + { + GUILayout.BeginHorizontal(); + GUILayout.Space(10); + using (new EditorGUILayout.VerticalScope("box")) + { + DrawAlertsOfType(alerts, Severity.Error); + DrawAlertsOfType(alerts, Severity.Warning); + DrawAlertsOfType(alerts, Severity.Info); + } + + GUILayout.Space(5); + GUILayout.EndHorizontal(); + } + + private void DrawAlertsOfType(List alerts, Severity severity) + { + var alertsOfType = alerts.Where(alert => alert.Severity == severity).ToList(); + foreach (var alert in alertsOfType) + { + DrawAlert(alert); + } + } + + /// + /// Draw a single alert. + /// + private void DrawAlert(Alert alert) + { + using (new EditorGUILayout.HorizontalScope()) + { + using (new EditorGUILayout.VerticalScope(GUILayout.Width(20))) + { + GUILayout.Space(2); + GUILayout.Label(GetSeverityIcon(alert.Severity), GUILayout.Width(20), GUILayout.Height(20)); + } + + using (new EditorGUILayout.VerticalScope()) + { + GUILayout.Label(alert.Title, headerLabelStyle); + EditorGUILayout.LabelField(alert.Message, wrapTextLabelStyle); + if (MaxSdkUtils.IsValidString(alert.Url)) + { + if (GUILayout.Button(new GUIContent(alert.Url), linkLabelStyle)) + { + Application.OpenURL(alert.Url); + } + } + + GUILayout.Space(2); + } + } + + GUILayout.Space(10); + } + /// /// Draws the headers for a table. /// @@ -372,7 +482,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor if (drawAction) { GUILayout.FlexibleSpace(); - GUILayout.Button("Actions", headerLabelStyle, fieldWidth); + GUILayout.Button("Actions", headerLabelStyle, FieldWidth); GUILayout.Space(5); } } @@ -508,16 +618,24 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor if (network.RequiresUpdate) { - GUILayout.Label(new GUIContent {image = alertIcon, tooltip = "Adapter not compatible, please update to the latest version."}, iconStyle); + GUILayout.Label(new GUIContent {image = errorIcon, tooltip = "Adapter not compatible, please update to the latest version."}, iconStyle); } else if ((network.Name.Equals("ADMOB_NETWORK") || network.Name.Equals("GOOGLE_AD_MANAGER_NETWORK")) && shouldShowGoogleWarning) { GUILayout.Label(new GUIContent {image = warningIcon, tooltip = "You may see unexpected errors if you use different versions of the AdMob and Google Ad Manager adapter SDKs."}, iconStyle); } - GUI.enabled = networkButtonsEnabled && isActionEnabled; - if (GUILayout.Button(new GUIContent(action), fieldWidth)) + if (network.IsCurrentlyInstalling) { + action = "Installing..."; + } + + GUI.enabled = networkButtonsEnabled && isActionEnabled && !network.IsCurrentlyInstalling; + if (GUILayout.Button(new GUIContent(action), FieldWidth)) + { + // Only show "Installing..." if the plugin is in the Assets folder + // Manifest edits don't trigger import callbacks, and UPM resolution locks the UI anyway. + network.IsCurrentlyInstalling = !AppLovinIntegrationManager.IsPluginInPackageManager; AppLovinEditorCoroutine.StartCoroutine(AppLovinPackageManager.AddNetwork(network, true)); } @@ -527,9 +645,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUI.enabled = networkButtonsEnabled && isInstalled; if (GUILayout.Button(new GUIContent {image = uninstallIcon, tooltip = "Uninstall"}, iconStyle)) { - EditorUtility.DisplayProgressBar("Integration Manager", "Deleting " + network.Name + "...", 0.5f); AppLovinPackageManager.RemoveNetwork(network); - EditorUtility.ClearProgressBar(); + AppLovinPackageManager.UpdateCurrentVersions(network); + UpdateShouldShowGoogleWarningIfNeeded(); } GUI.enabled = true; @@ -582,7 +700,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private void DrawUpgradeAllButton() { GUI.enabled = NetworksRequireUpgrade(); - if (GUILayout.Button(new GUIContent("Upgrade All"), upgradeAllButtonFieldWidth)) + if (GUILayout.Button(new GUIContent("Upgrade All"), UpgradeAllButtonFieldWidth)) { AppLovinEditorCoroutine.StartCoroutine(UpgradeAllNetworks()); } @@ -591,7 +709,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.Space(10); } -#if UNITY_2019_2_OR_NEWER private void DrawPluginMigrationHelper() { GUILayout.BeginHorizontal(); @@ -618,7 +735,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor "Are you sure you want to migrate the SDK and adapters to UPM? This action will move both the MAX SDK and its adapters.", "Yes", "No")) { var deleteExternalDependencyManager = false; - if (Directory.Exists(externalDependencyManagerPath)) + if (Directory.Exists(ExternalDependencyManagerPath)) { deleteExternalDependencyManager = EditorUtility.DisplayDialog("External Dependency Manager Detected", "Our plugin includes the External Dependency Manager via the Unity Package Manager. Would you like us to automatically remove the existing External Dependency Manager folder, or would you prefer to manage it manually?", "Remove Automatically", "Manage Manually"); @@ -638,7 +755,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.Space(5); GUILayout.EndHorizontal(); } -#endif private void DrawQualityServiceSettings() { @@ -652,20 +768,20 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.Space(4); GUILayout.BeginHorizontal(); GUILayout.Space(4); - EditorGUILayout.HelpBox(qualityServiceRequiresGradleBuildErrorMsg, MessageType.Warning); + EditorGUILayout.HelpBox(QualityServiceRequiresGradleBuildErrorMsg, MessageType.Warning); GUILayout.Space(4); GUILayout.EndHorizontal(); GUILayout.Space(4); } - AppLovinSettings.Instance.SdkKey = DrawTextField("AppLovin SDK Key", AppLovinSettings.Instance.SdkKey, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption); + AppLovinSettings.Instance.SdkKey = DrawTextField("AppLovin SDK Key", AppLovinSettings.Instance.SdkKey, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption); GUILayout.BeginHorizontal(); GUILayout.Space(4); GUILayout.Button("You can find your SDK key here: ", wrapTextLabelStyle, GUILayout.Width(185)); // Setting a fixed width since Unity adds arbitrary padding at the end leaving a space between link and text. - if (GUILayout.Button(new GUIContent(appLovinSdkKeyLink), linkLabelStyle)) + if (GUILayout.Button(new GUIContent(AppLovinSdkKeyLink), linkLabelStyle)) { - Application.OpenURL(appLovinSdkKeyLink); + Application.OpenURL(AppLovinSdkKeyLink); } GUILayout.FlexibleSpace(); @@ -750,9 +866,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(); GUILayout.Space(4); - if (GUILayout.Button(new GUIContent(documentationTermsAndPrivacyPolicyFlow), linkLabelStyle)) + if (GUILayout.Button(new GUIContent(DocumentationTermsAndPrivacyPolicyFlow), linkLabelStyle)) { - Application.OpenURL(documentationTermsAndPrivacyPolicyFlow); + Application.OpenURL(DocumentationTermsAndPrivacyPolicyFlow); } GUILayout.Space(4); @@ -760,8 +876,14 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.Space(8); - AppLovinInternalSettings.Instance.ConsentFlowPrivacyPolicyUrl = DrawTextField("Privacy Policy URL", AppLovinInternalSettings.Instance.ConsentFlowPrivacyPolicyUrl, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption); - AppLovinInternalSettings.Instance.ConsentFlowTermsOfServiceUrl = DrawTextField("Terms of Service URL (optional)", AppLovinInternalSettings.Instance.ConsentFlowTermsOfServiceUrl, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption); + AppLovinInternalSettings.Instance.ConsentFlowPrivacyPolicyUrl = DrawTextField("Privacy Policy URL", AppLovinInternalSettings.Instance.ConsentFlowPrivacyPolicyUrl, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption); + AppLovinInternalSettings.Instance.ConsentFlowTermsOfServiceUrl = DrawTextField("Terms of Service URL (optional)", AppLovinInternalSettings.Instance.ConsentFlowTermsOfServiceUrl, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption); + + GUILayout.Space(4); + GUILayout.BeginHorizontal(); + GUILayout.Space(4); + AppLovinInternalSettings.Instance.ShouldShowTermsAndPrivacyPolicyAlertInGDPR = GUILayout.Toggle(AppLovinInternalSettings.Instance.ShouldShowTermsAndPrivacyPolicyAlertInGDPR, " Show Terms and Privacy Policy Flow when in GDPR Regions"); + GUILayout.EndHorizontal(); GUILayout.Space(4); GUILayout.BeginHorizontal(); @@ -778,7 +900,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.Space(4); GUILayout.Space(4); - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEn = DrawTextField("User Tracking Usage Description", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEn, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEn = DrawTextField("User Tracking Usage Description", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEn, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); GUILayout.BeginHorizontal(); GUILayout.Space(4); @@ -788,13 +910,13 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor if (AppLovinInternalSettings.Instance.UserTrackingUsageLocalizationEnabled) { - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHans = DrawTextField("Chinese, Simplified (zh-Hans)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHans, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHant = DrawTextField("Chinese, Traditional (zh-Hant)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHant, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionFr = DrawTextField("French (fr)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionFr, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionDe = DrawTextField("German (de)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionDe, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionJa = DrawTextField("Japanese (ja)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionJa, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionKo = DrawTextField("Korean (ko)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionKo, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); - AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEs = DrawTextField("Spanish (es)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEs, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHans = DrawTextField("Chinese, Simplified (zh-Hans)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHans, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHant = DrawTextField("Chinese, Traditional (zh-Hant)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionZhHant, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionFr = DrawTextField("French (fr)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionFr, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionDe = DrawTextField("German (de)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionDe, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionJa = DrawTextField("Japanese (ja)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionJa, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionKo = DrawTextField("Korean (ko)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionKo, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); + AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEs = DrawTextField("Spanish (es)", AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionEs, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, isEditableTextField); GUILayout.Space(4); GUILayout.BeginHorizontal(); @@ -812,9 +934,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(); GUILayout.Space(4); - if (GUILayout.Button(new GUIContent(userTrackingUsageDescriptionDocsLink), linkLabelStyle)) + if (GUILayout.Button(new GUIContent(UserTrackingUsageDescriptionDocsLink), linkLabelStyle)) { - Application.OpenURL(userTrackingUsageDescriptionDocsLink); + Application.OpenURL(UserTrackingUsageDescriptionDocsLink); } GUILayout.Space(4); @@ -842,10 +964,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor GUILayout.Space(10); using (new EditorGUILayout.VerticalScope("box")) { - GUILayout.Space(5); - AppLovinSettings.Instance.SetAttributionReportEndpoint = DrawOtherSettingsToggle(AppLovinSettings.Instance.SetAttributionReportEndpoint, " Set Advertising Attribution Report Endpoint in Info.plist (iOS only)"); - GUILayout.Space(5); - AppLovinSettings.Instance.AddApsSkAdNetworkIds = DrawOtherSettingsToggle(AppLovinSettings.Instance.AddApsSkAdNetworkIds, " Add Amazon Publisher Services SKAdNetworkID's"); GUILayout.Space(5); var autoUpdateEnabled = DrawOtherSettingsToggle(EditorPrefs.GetBool(AppLovinAutoUpdater.KeyAutoUpdateEnabled, true), " Enable Auto Update", "Checks for AppLovin MAX plugin updates and notifies you when an update is available."); EditorPrefs.SetBool(AppLovinAutoUpdater.KeyAutoUpdateEnabled, autoUpdateEnabled); @@ -853,8 +971,8 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var verboseLoggingEnabled = DrawOtherSettingsToggle(EditorPrefs.GetBool(MaxSdkLogger.KeyVerboseLoggingEnabled, false), " Enable Verbose Logging"); EditorPrefs.SetBool(MaxSdkLogger.KeyVerboseLoggingEnabled, verboseLoggingEnabled); GUILayout.Space(5); - AppLovinSettings.Instance.CustomGradleVersionUrl = DrawTextField("Custom Gradle Version URL", AppLovinSettings.Instance.CustomGradleVersionUrl, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, tooltip: customGradleVersionTooltip); - AppLovinSettings.Instance.CustomGradleToolsVersion = DrawTextField("Custom Gradle Tools Version", AppLovinSettings.Instance.CustomGradleToolsVersion, GUILayout.Width(privacySettingLabelWidth), privacySettingFieldWidthOption, tooltip: customGradleToolsVersionTooltip); + AppLovinSettings.Instance.CustomGradleVersionUrl = DrawTextField("Custom Gradle Version URL", AppLovinSettings.Instance.CustomGradleVersionUrl, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, tooltip: CustomGradleVersionTooltip); + AppLovinSettings.Instance.CustomGradleToolsVersion = DrawTextField("Custom Gradle Tools Version", AppLovinSettings.Instance.CustomGradleToolsVersion, GUILayout.Width(PrivacySettingLabelWidth), privacySettingFieldWidthOption, tooltip: CustomGradleToolsVersionTooltip); EditorGUILayout.HelpBox("This will overwrite the gradle build tools version in your base gradle template.", MessageType.Info); } @@ -906,7 +1024,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor } } - private void DrawCollapsableSection(string keyShowDetails, string label, Action drawContent) + private void DrawCollapsibleSection(string keyShowDetails, string label, Action drawContent) { EditorGUILayout.BeginHorizontal(); var showDetails = DrawExpandCollapseButton(keyShowDetails); @@ -923,8 +1041,8 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private bool DrawExpandCollapseButton(string keyShowDetails) { var showDetails = EditorPrefs.GetBool(keyShowDetails, true); - var buttonText = showDetails ? collapseButtonText : expandButtonText; - if (GUILayout.Button(buttonText, collapseButtonWidthOption)) + var buttonText = showDetails ? CollapseButtonText : ExpandButtonText; + if (GUILayout.Button(buttonText, CollapseButtonWidthOption)) { EditorPrefs.SetBool(keyShowDetails, !showDetails); } @@ -938,15 +1056,15 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private void CalculateFieldWidth() { var currentWidth = position.width; - var availableWidth = currentWidth - actionFieldWidth - 80; // NOTE: Magic number alert. This is the sum of all the spacing the fields and other UI elements. - var networkLabelWidth = Math.Max(networkFieldMinWidth, availableWidth * networkFieldWidthPercentage); + var availableWidth = currentWidth - ActionFieldWidth - 80; // NOTE: Magic number alert. This is the sum of all the spacing the fields and other UI elements. + var networkLabelWidth = Math.Max(NetworkFieldMinWidth, availableWidth * NetworkFieldWidthPercentage); networkWidthOption = GUILayout.Width(networkLabelWidth); - var versionLabelWidth = Math.Max(versionFieldMinWidth, availableWidth * versionFieldWidthPercentage); + var versionLabelWidth = Math.Max(VersionFieldMinWidth, availableWidth * VersionFieldWidthPercentage); versionWidthOption = GUILayout.Width(versionLabelWidth); const int textFieldOtherUiElementsWidth = 55; // NOTE: Magic number alert. This is the sum of all the spacing the fields and other UI elements. - var availableUserDescriptionTextFieldWidth = currentWidth - privacySettingLabelWidth - textFieldOtherUiElementsWidth; + var availableUserDescriptionTextFieldWidth = currentWidth - PrivacySettingLabelWidth - textFieldOtherUiElementsWidth; privacySettingFieldWidthOption = GUILayout.Width(availableUserDescriptionTextFieldWidth); } @@ -978,25 +1096,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor })); } - /// - /// Callback method that will be called with progress updates when the plugin is being downloaded. - /// - public static void OnDownloadPluginProgress(string pluginName, float progress, bool done) + private void OnImportPackageStarted(Network network) { - // Download is complete. Clear progress bar. - if (done) - { - EditorUtility.ClearProgressBar(); - } - // Download is in progress, update progress bar. - else - { - if (EditorUtility.DisplayCancelableProgressBar(windowTitle, string.Format("Downloading {0} plugin...", pluginName), progress)) - { - AppLovinIntegrationManager.Instance.CancelDownload(); - EditorUtility.ClearProgressBar(); - } - } + network.IsCurrentlyInstalling = false; } private void OnImportPackageCompleted(Network network) @@ -1019,7 +1121,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var googleAdManagerNetwork = networks.FirstOrDefault(foundNetwork => foundNetwork.Name.Equals("GOOGLE_AD_MANAGER_NETWORK")); if (googleNetwork != null && googleAdManagerNetwork != null && - !string.IsNullOrEmpty(googleNetwork.CurrentVersions.Unity) && !string.IsNullOrEmpty(googleAdManagerNetwork.CurrentVersions.Unity) && + MaxSdkUtils.IsValidString(googleNetwork.CurrentVersions.Unity) && MaxSdkUtils.IsValidString(googleAdManagerNetwork.CurrentVersions.Unity) && !googleNetwork.CurrentVersions.HasEqualSdkVersions(googleAdManagerNetwork.CurrentVersions)) { shouldShowGoogleWarning = true; @@ -1042,7 +1144,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { var comparison = network.CurrentToLatestVersionComparisonResult; // A newer version is available - if (!string.IsNullOrEmpty(network.CurrentVersions.Unity) && comparison == MaxSdkUtils.VersionComparisonResult.Lesser) + if (MaxSdkUtils.IsValidString(network.CurrentVersions.Unity) && comparison == MaxSdkUtils.VersionComparisonResult.Lesser) { yield return AppLovinPackageManager.AddNetwork(network, false); } @@ -1063,7 +1165,33 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor if (pluginData == null || pluginData.AppLovinMax.CurrentVersions == null) return false; var networks = pluginData.MediatedNetworks; - return networks.Any(network => !string.IsNullOrEmpty(network.CurrentVersions.Unity) && network.CurrentToLatestVersionComparisonResult == MaxSdkUtils.VersionComparisonResult.Lesser); + return networks.Any(network => MaxSdkUtils.IsValidString(network.CurrentVersions.Unity) && network.CurrentToLatestVersionComparisonResult == MaxSdkUtils.VersionComparisonResult.Lesser); + } + + /// + /// Takes in an int representing the count of an alert and returns it as a string or "9+" if greater than 9. + /// + private string AlertCountToString(int count) + { + return count > 9 ? "9+" : count.ToString(); + } + + /// + /// Returns the icon for the given severity type. + /// + private Texture2D GetSeverityIcon(Severity severity) + { + switch (severity) + { + case Severity.Info: + return infoIcon; + case Severity.Warning: + return warningIcon; + case Severity.Error: + return errorIcon; + default: + return infoIcon; + } } #endregion diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinIntegrationManagerWindow.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs similarity index 78% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs index 41552d9..2ee24b9 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs @@ -1,5 +1,5 @@ // -// AppLovinInternalSettigns.cs +// AppLovinInternalSettings.cs // AppLovin User Engagement Unity Plugin // // Created by Santosh Bagadi on 9/15/22. @@ -22,18 +22,19 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { private static AppLovinInternalSettings instance; - public const string DefaultUserTrackingDescriptionEn = "This uses device info for more personalized ads and content"; - public const string DefaultUserTrackingDescriptionDe = "Dies benutzt Gerätinformationen für relevantere Werbeinhalte"; - public const string DefaultUserTrackingDescriptionEs = "Esto utiliza la información del dispositivo para anuncios y contenido más personalizados"; - public const string DefaultUserTrackingDescriptionFr = "Cela permet d'utiliser les informations du téléphone pour afficher des contenus publicitaires plus pertinents."; - public const string DefaultUserTrackingDescriptionJa = "これはユーザーデータをもとに、より関連性の高い広告コンテンツをお客様に提供します"; - public const string DefaultUserTrackingDescriptionKo = "보다 개인화된 광고 및 콘텐츠를 위해 기기 정보를 사용합니다."; - public const string DefaultUserTrackingDescriptionZhHans = "我们使用设备信息来提供个性化的广告和内容。"; - public const string DefaultUserTrackingDescriptionZhHant = "我們使用設備信息來提供個性化的廣告和內容。"; + private const string DefaultUserTrackingDescriptionEn = "This uses device info for more personalized ads and content"; + private const string DefaultUserTrackingDescriptionDe = "Dies benutzt Gerätinformationen für relevantere Werbeinhalte"; + private const string DefaultUserTrackingDescriptionEs = "Esto utiliza la información del dispositivo para anuncios y contenido más personalizados"; + private const string DefaultUserTrackingDescriptionFr = "Cela permet d'utiliser les informations du téléphone pour afficher des contenus publicitaires plus pertinents."; + private const string DefaultUserTrackingDescriptionJa = "これはユーザーデータをもとに、より関連性の高い広告コンテンツをお客様に提供します"; + private const string DefaultUserTrackingDescriptionKo = "보다 개인화된 광고 및 콘텐츠를 위해 기기 정보를 사용합니다."; + private const string DefaultUserTrackingDescriptionZhHans = "我们使用设备信息来提供个性化的广告和内容。"; + private const string DefaultUserTrackingDescriptionZhHant = "我們使用設備信息來提供個性化的廣告和內容。"; [SerializeField] private bool consentFlowEnabled; [SerializeField] private string consentFlowPrivacyPolicyUrl = string.Empty; [SerializeField] private string consentFlowTermsOfServiceUrl = string.Empty; + [SerializeField] private bool shouldShowTermsAndPrivacyPolicyAlertInGDPR; [SerializeField] private bool overrideDefaultUserTrackingUsageDescriptions; [SerializeField] private MaxSdkBase.ConsentFlowUserGeography debugUserGeography; [SerializeField] private string userTrackingUsageDescriptionEn = string.Empty; @@ -140,9 +141,18 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor set { consentFlowTermsOfServiceUrl = value; } } + /// + /// Whether or not to show the Terms and Privacy Policy alert in GDPR regions prior to presenting the CMP prompt. + /// + public bool ShouldShowTermsAndPrivacyPolicyAlertInGDPR + { + get { return shouldShowTermsAndPrivacyPolicyAlertInGDPR; } + set { shouldShowTermsAndPrivacyPolicyAlertInGDPR = value; } + } + /// /// A User Tracking Usage Description in English to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation. /// public string UserTrackingUsageDescriptionEn { @@ -185,7 +195,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// Whether or not to localize User Tracking Usage Description. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public bool UserTrackingUsageLocalizationEnabled { @@ -226,7 +236,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// A User Tracking Usage Description in German to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public string UserTrackingUsageDescriptionDe { @@ -236,7 +246,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// A User Tracking Usage Description in Spanish to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public string UserTrackingUsageDescriptionEs { @@ -246,7 +256,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// A User Tracking Usage Description in French to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public string UserTrackingUsageDescriptionFr { @@ -256,7 +266,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// A User Tracking Usage Description in Japanese to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public string UserTrackingUsageDescriptionJa { @@ -266,7 +276,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// A User Tracking Usage Description in Korean to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public string UserTrackingUsageDescriptionKo { @@ -276,7 +286,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// A User Tracking Usage Description in Chinese (Simplified) to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public string UserTrackingUsageDescriptionZhHans { @@ -286,7 +296,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// A User Tracking Usage Description in Chinese (Traditional) to be shown to users when requesting permission to use data for tracking. - /// For more information see Apple's documentation. + /// For more information see Apple's documentation: https://developer.apple.com/documentation/bundleresources/information_property_list/nsusertrackingusagedescription /// public string UserTrackingUsageDescriptionZhHant { diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinInternalSettings.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs similarity index 91% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs index 130b383..debdfd2 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs @@ -11,7 +11,7 @@ using UnityEngine; namespace AppLovinMax.Scripts.IntegrationManager.Editor { - public class AppLovinMenuItems + public static class AppLovinMenuItems { /** * The special characters at the end represent a shortcut for this action. @@ -31,7 +31,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor [MenuItem("AppLovin/Documentation")] private static void Documentation() { - Application.OpenURL("https://developers.applovin.com/en/unity/overview/integration"); + Application.OpenURL("https://support.axon.ai/en/max/unity/overview/integration"); } [MenuItem("AppLovin/Contact Us")] diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinMenuItems.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs similarity index 81% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs index fcbed1d..0945743 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs @@ -23,29 +23,22 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public interface IPackageManagerClient { - List GetInstalledMediationNetworks(); IEnumerator AddNetwork(Network network, bool showImport); void RemoveNetwork(Network network); } public static class AppLovinPackageManager { -#if UNITY_2019_2_OR_NEWER - private static readonly IPackageManagerClient _upmPackageManager = new AppLovinUpmPackageManager(); -#endif - private static readonly IPackageManagerClient _assetsPackageManager = new AppLovinAssetsPackageManager(); + private const string AppLovinMediationAmazonAdapterDependenciesPath = "Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml"; - private static bool _migrationPromptShown; + private static readonly IPackageManagerClient _upmPackageManager = new AppLovinUpmPackageManager(); + private static readonly IPackageManagerClient _assetsPackageManager = new AppLovinAssetsPackageManager(); private static IPackageManagerClient PackageManagerClient { get { -#if UNITY_2019_2_OR_NEWER return AppLovinIntegrationManager.IsPluginInPackageManager ? _upmPackageManager : _assetsPackageManager; -#else - return _assetsPackageManager; -#endif } } @@ -107,8 +100,14 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// A list of the installed mediation network names. internal static List GetInstalledMediationNetworks() { - var installedNetworks = PackageManagerClient.GetInstalledMediationNetworks(); - if (AppLovinSettings.Instance.AddApsSkAdNetworkIds) + var installedNetworks = new List(); + var installedNetworksInAssets = AppLovinAssetsPackageManager.GetInstalledMediationNetworks(); + installedNetworks.AddRange(installedNetworksInAssets); + + var installedNetworksInPackages = AppLovinUpmPackageManager.GetInstalledMediationNetworks(); + installedNetworks.AddRange(installedNetworksInPackages); + + if (IsAmazonAppLovinAdapterInstalled()) { installedNetworks.Add("AmazonAdMarketplace"); } @@ -148,7 +147,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// The exported path of the MAX plugin asset or an empty list if the asset is not found. private static List GetAssetPathListForExportPath(string exportPath) { - var assetLabelToFind = "l:al_max_export_path-" + exportPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + var assetLabelToFind = "l:al_max_export_path-" + MaxSdkUtils.NormalizeToUnityPath(exportPath); var assetGuids = AssetDatabase.FindAssets(assetLabelToFind); var assetPaths = new List(); @@ -167,6 +166,11 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor internal static void UpdateCurrentVersions(Network network) { var assetPaths = GetAssetPathListForExportPath(network.DependenciesFilePath); + if (HasDuplicateAdapters(assetPaths)) + { + ShowDeleteDuplicateAdapterPrompt(network); + } + var currentVersions = GetCurrentVersions(assetPaths); network.CurrentVersions = currentVersions; @@ -204,12 +208,12 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { // If adapter is indeed installed, compare the current (installed) and the latest (from db) versions, so that we can determine if the publisher is on an older, current or a newer version of the adapter. // If the publisher is on a newer version of the adapter than the db version, that means they are on a beta version. - if (!string.IsNullOrEmpty(currentVersions.Unity)) + if (MaxSdkUtils.IsValidString(currentVersions.Unity)) { network.CurrentToLatestVersionComparisonResult = AppLovinIntegrationManagerUtils.CompareUnityMediationVersions(currentVersions.Unity, network.LatestVersions.Unity); } - if (!string.IsNullOrEmpty(network.CurrentVersions.Unity) && AppLovinAutoUpdater.MinAdapterVersions.ContainsKey(network.Name)) + if (MaxSdkUtils.IsValidString(network.CurrentVersions.Unity) && AppLovinAutoUpdater.MinAdapterVersions.ContainsKey(network.Name)) { var comparisonResult = AppLovinIntegrationManagerUtils.CompareUnityMediationVersions(network.CurrentVersions.Unity, AppLovinAutoUpdater.MinAdapterVersions[network.Name]); // Requires update if current version is lower than the min required version. @@ -223,6 +227,64 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor } } + /// + /// Checks whether a network has duplicate adapters installed in both the Assets folder and via UPM. + /// + /// The list of paths to the dependencies.xml files + /// True if there are adapters in both the Assets folder and installed via UPM + private static bool HasDuplicateAdapters(List dependencyPaths) + { + var inPackagesFolder = dependencyPaths.Any(path => path.Contains("Packages")); + var inAssetsFolder = dependencyPaths.Any(path => path.Contains("Assets")); + + return inPackagesFolder && inAssetsFolder; + } + + /// + /// Displays a prompt informing the user that duplicate adapters were detected + /// and allows them to choose which version to keep. + /// + /// The network that has duplicate adapters installed. + private static void ShowDeleteDuplicateAdapterPrompt(Network network) + { + var keepAssetsAdapter = EditorUtility.DisplayDialog("Duplicate Adapters Detected", + "The " + network.DisplayName + " adapter is installed in both the Assets folder and via UPM. Please choose which version to keep.", + "Keep Assets Folder Version", + "Keep UPM Version"); + DeleteDuplicateAdapter(network, keepAssetsAdapter); + } + + /// + /// Removes a duplicate adapter by either deleting it from the Assets folder + /// or uninstalling it from the Unity Package Manager (UPM). + /// + /// The network for which the duplicate adapter is being removed. + /// If true, retains the adapter in the Assets folder and removes the UPM version; + /// otherwise, deletes the adapter from the Assets folder. + internal static void DeleteDuplicateAdapter(Network network, bool keepAssetsAdapter) + { + // Skip duplicate removal logic for our plugin. + if (network.Name.Equals("APPLOVIN_NETWORK")) return; + + if (keepAssetsAdapter) + { + var appLovinManifest = AppLovinUpmManifest.Load(); + AppLovinUpmPackageManager.RemovePackages(network, appLovinManifest); + appLovinManifest.Save(); + } + else + { + foreach (var pluginFilePath in network.PluginFilePaths) + { + var filePath = Path.Combine(AppLovinIntegrationManager.MediationDirectory, pluginFilePath.Replace("MaxSdk/Mediation/", "")); + FileUtil.DeleteFileOrDirectory(filePath); + FileUtil.DeleteFileOrDirectory(filePath + ".meta"); + } + } + + AppLovinUpmPackageManager.ResolvePackageManager(); + } + /// /// Gets the current versions for a given network's dependency file paths. UPM will have multiple paths /// for each network - one each for iOS and Android. @@ -327,24 +389,19 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor } } -#if UNITY_2019_2_OR_NEWER /// - /// Show the adapter migration prompt if it hasn't been shown yet. + /// Check for the Amazon AppLovin adapter in the project. /// - private static void ShowAdapterMigrationPrompt() + /// Whether the AppLovin Adapter is installed through the Amazon SDK. + private static bool IsAmazonAppLovinAdapterInstalled() { - if (_migrationPromptShown) return; + string[] dependenciesFiles = AssetDatabase.FindAssets("t:TextAsset Dependencies", new[] {"Assets"}) + .Select(AssetDatabase.GUIDToAssetPath) + .ToArray(); - _migrationPromptShown = true; - var migrateAdapters = EditorUtility.DisplayDialog("Adapter Detected in Mediation Folder", - "It appears that you have an adapter in the Mediation folder while AppLovin's plugin is installed via UPM. This could potentially break the integration or cause unexpected errors. Would you like to automatically migrate all your adapters to UPM?", "Yes", "No"); - - if (migrateAdapters) - { - AppLovinPluginMigrationHelper.MigrateAdapters(PluginData, AppLovinUpmManifest.Load()); - } + // Use regex to search for Amazon and then AppLovin in the file paths of the dependencies.xml files. + return dependenciesFiles.Any(filePath => filePath.Contains(AppLovinMediationAmazonAdapterDependenciesPath)); } -#endif /// /// Refresh assets and update current versions after a slight delay to allow for Client.Resolve to finish. @@ -360,7 +417,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor #endregion } -#if UNITY_2019_2_OR_NEWER public class AppLovinUpmPackageManager : IPackageManagerClient { public const string PackageNamePrefixAppLovin = "com.applovin.mediation.ads"; @@ -374,7 +430,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private static MethodInfo packageManagerResolveMethod; #endif - public List GetInstalledMediationNetworks() + public static List GetInstalledMediationNetworks() { // Return empty list if we failed to get the package list var packageCollection = GetPackageCollectionSync(TimeoutFetchPackageCollectionSeconds); @@ -396,6 +452,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var appLovinManifest = AppLovinUpmManifest.Load(); AddPackages(network, appLovinManifest); appLovinManifest.Save(); + + // Remove any versions of the adapter in the Assets folder + AppLovinPackageManager.DeleteDuplicateAdapter(network, false); ResolvePackageManager(); yield break; @@ -428,7 +487,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// The network to add. /// The AppLovinUpmManifest instance to edit - private static void RemovePackages(Network network, AppLovinUpmManifest appLovinManifest) + internal static void RemovePackages(Network network, AppLovinUpmManifest appLovinManifest) { foreach (var packageInfo in network.Packages) { @@ -526,13 +585,11 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor } } -#endif - public class AppLovinAssetsPackageManager : IPackageManagerClient { - public List GetInstalledMediationNetworks() + public static List GetInstalledMediationNetworks() { - var maxMediationDirectory = Path.Combine(AppLovinIntegrationManager.PluginParentDirectory, "MaxSdk/Mediation/"); + var maxMediationDirectory = AppLovinIntegrationManager.MediationDirectory; if (!Directory.Exists(maxMediationDirectory)) return new List(); var mediationNetworkDirectories = Directory.GetDirectories(maxMediationDirectory); diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPackageManager.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs similarity index 61% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs index 9aa6d23..e240323 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs @@ -4,7 +4,6 @@ using System.Linq; using UnityEditor; using UnityEngine; -#if UNITY_2019_2_OR_NEWER namespace AppLovinMax.Scripts.IntegrationManager.Editor { /// @@ -20,6 +19,8 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private const string OpenUpmRegistryUrl = "https://package.openupm.com"; private static readonly List OpenUpmRegistryScopes = new List() {"com.google.external-dependency-manager"}; + private static List betaNetworkPluginFilePaths = new List(); + /// /// Attempts to move the Unity plugin to UPM by adding the AppLovin scoped registry and dependencies to the manifest. /// @@ -50,6 +51,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor internal static void MigrateAdapters(PluginData pluginData, AppLovinUpmManifest appLovinManifest) { var allNetworks = pluginData.MediatedNetworks.Concat(pluginData.PartnerMicroSdks).ToArray(); + betaNetworkPluginFilePaths.Clear(); // Add every currently installed network and separate it by android and iOS. foreach (var network in allNetworks) @@ -57,6 +59,12 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var currentVersion = network.CurrentVersions != null ? network.CurrentVersions.Unity : ""; if (string.IsNullOrEmpty(currentVersion)) continue; + if (currentVersion.Contains("beta")) + { + betaNetworkPluginFilePaths.AddRange(network.PluginFilePaths); + continue; + } + AppLovinUpmPackageManager.AddPackages(network, appLovinManifest); } } @@ -97,15 +105,62 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var appLovinResourcesDirectory = Path.Combine(pluginPath, "Resources"); var appLovinSettingsTempPath = Path.Combine(Path.GetTempPath(), "AppLovinSettings.asset"); + var appLovinMediationTempPath = Path.Combine(Path.GetTempPath(), "Mediation"); - // Move the AppLovinSettings.asset file to a temp directory, delete the plugin directory, then move the settings file back. - File.Copy(appLovinSettingsPath, appLovinSettingsTempPath, true); + // Ensure there aren't any errors when moving the files due to the directories/files already existing. + FileUtil.DeleteFileOrDirectory(appLovinSettingsTempPath); + FileUtil.DeleteFileOrDirectory(appLovinMediationTempPath); + + var mediationAssetsDir = Path.Combine(AppLovinIntegrationManager.PluginParentDirectory, "MaxSdk/Mediation"); + + // Move the AppLovinSettings.asset file and any beta adapters to a temporary directory. + File.Move(appLovinSettingsPath, appLovinSettingsTempPath); + var adapterSaved = MoveBetaAdaptersIfNeeded(mediationAssetsDir, appLovinMediationTempPath); + + // Move the meta file if the adapter was saved to save the asset labels + if (adapterSaved) + { + File.Move(mediationAssetsDir, appLovinMediationTempPath + ".meta"); + } + + // Delete the plugin directory and then move the AppLovinSettings.asset and beta adapters back. FileUtil.DeleteFileOrDirectory(pluginPath); Directory.CreateDirectory(appLovinResourcesDirectory); File.Move(appLovinSettingsTempPath, appLovinSettingsPath); + MoveBetaAdaptersIfNeeded(appLovinMediationTempPath, mediationAssetsDir); + if (adapterSaved) + { + File.Move(appLovinMediationTempPath + ".meta", mediationAssetsDir); + } + + FileUtil.DeleteFileOrDirectory(appLovinMediationTempPath); + } + + /// + /// Moves the beta adapters from a source mediation directory to a destination mediation directory. + /// + /// The directory containing the beta adapters to be moved. + /// The target directory where the beta adapters should be moved. + private static bool MoveBetaAdaptersIfNeeded(string sourceMediationDirectory, string destinationMediationDirectory) + { + if (betaNetworkPluginFilePaths.Count == 0 || !Directory.Exists(sourceMediationDirectory)) return false; + + var movedAdapter = false; + Directory.CreateDirectory(destinationMediationDirectory); + foreach (var pluginFilePath in betaNetworkPluginFilePaths) + { + var sourceDirectory = Path.Combine(sourceMediationDirectory, Path.GetFileName(pluginFilePath)); + var destinationDirectory = Path.Combine(destinationMediationDirectory, Path.GetFileName(pluginFilePath)); + if (Directory.Exists(sourceDirectory)) + { + Directory.Move(sourceDirectory, destinationDirectory); + movedAdapter = true; + } + } + + return movedAdapter; } #endregion } } -#endif diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPluginMigrationHelper.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs similarity index 95% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs index e0f8566..ae86796 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs @@ -24,11 +24,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// public class AppLovinPostProcessAndroid : IPostGenerateGradleAndroidProject { -#if UNITY_2019_3_OR_NEWER private const string PropertyAndroidX = "android.useAndroidX"; private const string PropertyJetifier = "android.enableJetifier"; private const string EnableProperty = "=true"; -#endif private const string PropertyDexingArtifactTransform = "android.enableDexingArtifactTransform"; private const string DisableProperty = "=false"; @@ -44,16 +42,12 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private const string AppLovinSettingsFileName = "applovin_settings.json"; - private const string KeyTermsFlowSettings = "terms_flow_settings"; - private const string KeyTermsFlowEnabled = "terms_flow_enabled"; - private const string KeyTermsFlowTermsOfService = "terms_flow_terms_of_service"; - private const string KeyTermsFlowPrivacyPolicy = "terms_flow_privacy_policy"; - private const string KeySdkKey = "sdk_key"; private const string KeyConsentFlowSettings = "consent_flow_settings"; private const string KeyConsentFlowEnabled = "consent_flow_enabled"; private const string KeyConsentFlowTermsOfService = "consent_flow_terms_of_service"; private const string KeyConsentFlowPrivacyPolicy = "consent_flow_privacy_policy"; + private const string KeyConsentFlowShowTermsAndPrivacyPolicyAlertInGDPR = "consent_flow_show_terms_and_privacy_policy_alert_in_gdpr"; private const string KeyConsentFlowDebugUserGeography = "consent_flow_debug_user_geography"; private const string KeyRenderOutsideSafeArea = "render_outside_safe_area"; @@ -74,15 +68,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public void OnPostGenerateGradleAndroidProject(string path) { -#if UNITY_2019_3_OR_NEWER var rootGradleBuildFilePath = Path.Combine(path, "../build.gradle"); var gradlePropertiesPath = Path.Combine(path, "../gradle.properties"); var gradleWrapperPropertiesPath = Path.Combine(path, "../gradle/wrapper/gradle-wrapper.properties"); -#else - var rootGradleBuildFilePath = Path.Combine(path, "build.gradle"); - var gradlePropertiesPath = Path.Combine(path, "gradle.properties"); - var gradleWrapperPropertiesPath = Path.Combine(path, "gradle/wrapper/gradle-wrapper.properties"); -#endif UpdateGradleVersionsIfNeeded(gradleWrapperPropertiesPath, rootGradleBuildFilePath); @@ -93,20 +81,13 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { var lines = File.ReadAllLines(gradlePropertiesPath); -#if UNITY_2019_3_OR_NEWER // Add all properties except AndroidX, Jetifier, and DexingArtifactTransform since they may already exist. We will re-add them below. gradlePropertiesUpdated.AddRange(lines.Where(line => !line.Contains(PropertyAndroidX) && !line.Contains(PropertyJetifier) && !line.Contains(PropertyDexingArtifactTransform))); -#else - // Add all properties except DexingArtifactTransform since it may already exist. We will re-add it below. - gradlePropertiesUpdated.AddRange(lines.Where(line => !line.Contains(PropertyDexingArtifactTransform))); -#endif } -#if UNITY_2019_3_OR_NEWER // Enable AndroidX and Jetifier properties gradlePropertiesUpdated.Add(PropertyAndroidX + EnableProperty); gradlePropertiesUpdated.Add(PropertyJetifier + EnableProperty); -#endif // `DexingArtifactTransform` has been removed in Gradle 8+ which is the default Gradle version for Unity 6. #if !UNITY_6000_0_OR_NEWER @@ -130,7 +111,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public int callbackOrder { - get { return int.MaxValue; } + get { return AppLovinPreProcess.CallbackOrder; } } private static void ProcessAndroidManifest(string path) @@ -383,6 +364,8 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { consentFlowSettings[KeyConsentFlowTermsOfService] = termsOfServiceUrl; } + + consentFlowSettings[KeyConsentFlowShowTermsAndPrivacyPolicyAlertInGDPR] = AppLovinInternalSettings.Instance.ShouldShowTermsAndPrivacyPolicyAlertInGDPR; var debugUserGeography = AppLovinInternalSettings.Instance.DebugUserGeography; if (debugUserGeography == MaxSdkBase.ConsentFlowUserGeography.Gdpr) diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs similarity index 56% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs index e3a0d2e..e56f255 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs @@ -22,20 +22,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { if (!AppLovinSettings.Instance.QualityServiceEnabled) return; -#if UNITY_2019_3_OR_NEWER - // On Unity 2019.3+, the path returned is the path to the unityLibrary's module. - // The AppLovin Quality Service buildscript closure related lines need to be added to the root build.gradle file. - var rootGradleBuildFilePath = Path.Combine(path, "../build.gradle"); - var rootSettingsGradleFilePath = Path.Combine(path, "../settings.gradle"); - - // For 2022.2 and newer and 2021.3.41+ - var qualityServiceAdded = AddPluginToRootGradleBuildFile(rootGradleBuildFilePath); - var appLovinRepositoryAdded = AddAppLovinRepository(rootSettingsGradleFilePath); - - // For 2021.3.40 and older and 2022.0 - 2022.1.x - var buildScriptChangesAdded = AddQualityServiceBuildScriptLines(rootGradleBuildFilePath); - - var failedToAddPlugin = !buildScriptChangesAdded && !(qualityServiceAdded && appLovinRepositoryAdded); + var failedToAddPlugin = !AddQualityServiceToRootGradleFile(path); if (failedToAddPlugin) { MaxSdkLogger.UserWarning("Failed to add AppLovin Quality Service plugin to the gradle project."); @@ -44,12 +31,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor // The plugin needs to be added to the application module (named launcher) var applicationGradleBuildFilePath = Path.Combine(path, "../launcher/build.gradle"); -#else - // If Gradle template is enabled, we would have already updated the plugin. - if (AppLovinIntegrationManager.GradleTemplateEnabled) return; - - var applicationGradleBuildFilePath = Path.Combine(path, "build.gradle"); -#endif if (!File.Exists(applicationGradleBuildFilePath)) { @@ -62,7 +43,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor public int callbackOrder { - get { return int.MaxValue; } + get { return CallbackOrder; } } } } diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs similarity index 82% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs index 99eb59e..475481d 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs @@ -9,18 +9,14 @@ #if UNITY_IOS || UNITY_IPHONE using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; +using AppLovinMax.Internal; using UnityEditor; using UnityEditor.Callbacks; -#if UNITY_2019_3_OR_NEWER using UnityEditor.iOS.Xcode.Extensions; -#endif using UnityEditor.iOS.Xcode; -using UnityEditor.PackageManager; using UnityEngine; using UnityEngine.Networking; @@ -36,9 +32,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor { private const string OutputFileName = "AppLovinQualityServiceSetup.rb"; -#if !UNITY_2019_3_OR_NEWER - private const string UnityMainTargetName = "Unity-iPhone"; -#endif // Use a priority of 90 to have AppLovin embed frameworks after Pods are installed (EDM finishes installing Pods at priority 60) and before Firebase Crashlytics runs their scripts (at priority 100). private const int AppLovinEmbedFrameworksPriority = 90; @@ -61,6 +54,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private const string KeyConsentFlowEnabled = "ConsentFlowEnabled"; private const string KeyConsentFlowTermsOfService = "ConsentFlowTermsOfService"; private const string KeyConsentFlowPrivacyPolicy = "ConsentFlowPrivacyPolicy"; + private const string KeyConsentFlowShowTermsAndPrivacyPolicyAlertInGDPR = "ConsentFlowShowTermsAndPrivacyPolicyAlertInGDPR"; private const string KeyConsentFlowDebugUserGeography = "ConsentFlowDebugUserGeography"; private const string KeyAppLovinSdkKeyToRemove = "AppLovinSdkKey"; @@ -73,7 +67,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// 1. Downloads the Quality Service ruby script. /// 2. Runs the script using Ruby which integrates AppLovin Quality Service to the project. /// - [PostProcessBuild(int.MaxValue)] // We want to run Quality Service script last. + [PostProcessBuild(AppLovinPreProcess.CallbackOrder)] // We want to run Quality Service script last. public static void OnPostProcessBuild(BuildTarget buildTarget, string buildPath) { if (!AppLovinSettings.Instance.QualityServiceEnabled) return; @@ -94,49 +88,40 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor return; } - // Download the ruby script needed to install Quality Service - var downloadHandler = new DownloadHandlerFile(outputFilePath); - var postJson = string.Format("{{\"sdk_key\" : \"{0}\"}}", sdkKey); - var bodyRaw = Encoding.UTF8.GetBytes(postJson); - var uploadHandler = new UploadHandlerRaw(bodyRaw); - uploadHandler.contentType = "application/json"; - - using (var unityWebRequest = new UnityWebRequest("https://api2.safedk.com/v1/build/ios_setup2")) + var webRequestConfig = new WebRequestConfig() { - unityWebRequest.method = UnityWebRequest.kHttpVerbPOST; - unityWebRequest.downloadHandler = downloadHandler; - unityWebRequest.uploadHandler = uploadHandler; - var operation = unityWebRequest.SendWebRequest(); + DownloadHandler = new DownloadHandlerFile(outputFilePath), + JsonString = string.Format("{{\"sdk_key\" : \"{0}\"}}", sdkKey), + EndPoint = "https://api2.safedk.com/v1/build/ios_setup2", + RequestType = WebRequestType.Post, + }; - // Wait for the download to complete or the request to timeout. - while (!operation.isDone) { } + webRequestConfig.Headers.Add("Content-Type", "application/json"); -#if UNITY_2020_1_OR_NEWER - if (unityWebRequest.result != UnityWebRequest.Result.Success) -#else - if (unityWebRequest.isNetworkError || unityWebRequest.isHttpError) -#endif - { - MaxSdkLogger.UserError("AppLovin Quality Service installation failed. Failed to download script with error: " + unityWebRequest.error); - return; - } + var maxWebRequest = new MaxWebRequest(webRequestConfig); - // Check if Ruby is installed - var rubyVersion = AppLovinCommandLine.Run("ruby", "--version", buildPath); - if (rubyVersion.ExitCode != 0) - { - MaxSdkLogger.UserError("AppLovin Quality Service installation requires Ruby. Please install Ruby, export it to your system PATH and re-export the project."); - return; - } - - // Ruby is installed, run `ruby AppLovinQualityServiceSetup.rb` - var result = AppLovinCommandLine.Run("ruby", OutputFileName, buildPath); - - // Check if we have an error. - if (result.ExitCode != 0) MaxSdkLogger.UserError("Failed to set up AppLovin Quality Service"); - - MaxSdkLogger.UserDebug(result.Message); + var webResponse = maxWebRequest.SendSync(); + if (!webResponse.IsSuccess) + { + MaxSdkLogger.UserError("AppLovin Quality Service installation failed. Failed to download script with error: " + webResponse.ErrorMessage); + return; } + + // Check if Ruby is installed + var rubyVersion = AppLovinCommandLine.Run("ruby", "--version", buildPath); + if (rubyVersion.ExitCode != 0) + { + MaxSdkLogger.UserError("AppLovin Quality Service installation requires Ruby. Please install Ruby, export it to your system PATH and re-export the project."); + return; + } + + // Ruby is installed, run `ruby AppLovinQualityServiceSetup.rb` + var result = AppLovinCommandLine.Run("ruby", OutputFileName, buildPath); + + // Check if we have an error. + if (result.ExitCode != 0) MaxSdkLogger.UserError("Failed to set up AppLovin Quality Service"); + + MaxSdkLogger.UserDebug(result.Message); } [PostProcessBuild(AppLovinEmbedFrameworksPriority)] @@ -146,13 +131,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var project = new PBXProject(); project.ReadFromFile(projectPath); -#if UNITY_2019_3_OR_NEWER var unityMainTargetGuid = project.GetUnityMainTargetGuid(); var unityFrameworkTargetGuid = project.GetUnityFrameworkTargetGuid(); -#else - var unityMainTargetGuid = project.TargetGuidByName(UnityMainTargetName); - var unityFrameworkTargetGuid = project.TargetGuidByName(UnityMainTargetName); -#endif + EmbedDynamicLibrariesIfNeeded(buildPath, project, unityMainTargetGuid); LocalizeUserTrackingDescriptionIfNeeded(AppLovinInternalSettings.Instance.UserTrackingUsageDescriptionDe, "de", buildPath, project, unityMainTargetGuid); @@ -179,23 +160,11 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var dynamicLibraryPathsToEmbed = GetDynamicLibraryPathsToEmbed(podsDirectory, buildPath); if (dynamicLibraryPathsToEmbed == null || dynamicLibraryPathsToEmbed.Count == 0) return; -#if UNITY_2019_3_OR_NEWER foreach (var dynamicLibraryPath in dynamicLibraryPathsToEmbed) { var fileGuid = project.AddFile(dynamicLibraryPath, dynamicLibraryPath); project.AddFileToEmbedFrameworks(targetGuid, fileGuid); } -#else - string runpathSearchPaths; - runpathSearchPaths = project.GetBuildPropertyForAnyConfig(targetGuid, "LD_RUNPATH_SEARCH_PATHS"); - runpathSearchPaths += string.IsNullOrEmpty(runpathSearchPaths) ? "" : " "; - - // Check if runtime search paths already contains the required search paths for dynamic libraries. - if (runpathSearchPaths.Contains("@executable_path/Frameworks")) return; - - runpathSearchPaths += "@executable_path/Frameworks"; - project.SetBuildProperty(targetGuid, "LD_RUNPATH_SEARCH_PATHS", runpathSearchPaths); -#endif } /// @@ -315,13 +284,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var currentIosVersion = network.CurrentVersions.Ios; if (string.IsNullOrEmpty(currentIosVersion)) return false; - var minIosVersion = libraryToEmbed.MinVersion; - var maxIosVersion = libraryToEmbed.MaxVersion; - - var greaterThanOrEqualToMinVersion = string.IsNullOrEmpty(minIosVersion) || MaxSdkUtils.CompareVersions(currentIosVersion, minIosVersion) != MaxSdkUtils.VersionComparisonResult.Lesser; - var lessThanOrEqualToMaxVersion = string.IsNullOrEmpty(maxIosVersion) || MaxSdkUtils.CompareVersions(currentIosVersion, maxIosVersion) != MaxSdkUtils.VersionComparisonResult.Greater; - - return greaterThanOrEqualToMinVersion && lessThanOrEqualToMaxVersion; + return MaxSdkUtils.IsVersionInRange(currentIosVersion, libraryToEmbed.MinVersion, libraryToEmbed.MaxVersion); } private static List GetDynamicLibraryPathsInProjectToEmbed(string podsDirectory, List dynamicLibrariesToEmbed) @@ -446,9 +409,19 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor project.SetBuildProperty(unityFrameworkTargetGuid, "SWIFT_VERSION", "5.0"); } - // Enable Swift modules - project.AddBuildProperty(unityFrameworkTargetGuid, "CLANG_ENABLE_MODULES", "YES"); - project.AddBuildProperty(unityMainTargetGuid, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "YES"); + // Some publishers may configure these settings in their own post-processing scripts. + // Only set them if they haven't already been defined to avoid overwriting publisher-defined values. + var enableModules = project.GetBuildPropertyForAnyConfig(unityFrameworkTargetGuid, "CLANG_ENABLE_MODULES"); + if (string.IsNullOrEmpty(enableModules)) + { + project.SetBuildProperty(unityFrameworkTargetGuid, "CLANG_ENABLE_MODULES", "YES"); + } + + var alwaysEmbedSwiftLibraries = project.GetBuildPropertyForAnyConfig(unityMainTargetGuid, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES"); + if (string.IsNullOrEmpty(alwaysEmbedSwiftLibraries)) + { + project.SetBuildProperty(unityMainTargetGuid, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "YES"); + } } private static void CreateSwiftFile(string swiftFilePath) @@ -466,14 +439,14 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor } } - [PostProcessBuild(int.MaxValue)] + [PostProcessBuild(AppLovinPreProcess.CallbackOrder)] public static void MaxPostProcessPlist(BuildTarget buildTarget, string path) { var plistPath = Path.Combine(path, "Info.plist"); var plist = new PlistDocument(); plist.ReadFromFile(plistPath); - SetAttributionReportEndpointIfNeeded(plist); + RemoveAttributionReportEndpointIfNeeded(plist); EnableVerboseLoggingIfNeeded(plist); AddGoogleApplicationIdIfNeeded(plist); @@ -485,23 +458,16 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor plist.WriteToFile(plistPath); } - private static void SetAttributionReportEndpointIfNeeded(PlistDocument plist) + private static void RemoveAttributionReportEndpointIfNeeded(PlistDocument plist) { - if (AppLovinSettings.Instance.SetAttributionReportEndpoint) - { - plist.root.SetString("NSAdvertisingAttributionReportEndpoint", AppLovinAdvertisingAttributionEndpoint); - } - else - { - PlistElement attributionReportEndPoint; - plist.root.values.TryGetValue("NSAdvertisingAttributionReportEndpoint", out attributionReportEndPoint); + PlistElement attributionReportEndPoint; + plist.root.values.TryGetValue("NSAdvertisingAttributionReportEndpoint", out attributionReportEndPoint); - // Check if we had previously set the attribution endpoint and un-set it. - if (attributionReportEndPoint != null && AppLovinAdvertisingAttributionEndpoint.Equals(attributionReportEndPoint.AsString())) - { - plist.root.values.Remove("NSAdvertisingAttributionReportEndpoint"); - } - } + // We no longer support this feature. Check if we had previously set the attribution endpoint and un-set it. + if (attributionReportEndPoint == null || !AppLovinAdvertisingAttributionEndpoint.Equals(attributionReportEndPoint.AsString())) return; + + MaxSdkLogger.UserWarning("Global SKAdNetwork postback forwarding is no longer supported by AppLovin. Removing AppLovin Advertising Attribution Endpoint from Info.plist."); + plist.root.values.Remove("NSAdvertisingAttributionReportEndpoint"); } private static void EnableVerboseLoggingIfNeeded(PlistDocument plist) @@ -569,13 +535,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var project = new PBXProject(); project.ReadFromFile(projectPath); -#if UNITY_2019_3_OR_NEWER var unityMainTargetGuid = project.GetUnityMainTargetGuid(); -#else - var unityMainTargetGuid = project.TargetGuidByName(UnityMainTargetName); -#endif - var guid = project.AddFile(AppLovinSettingsPlistFileName, AppLovinSettingsPlistFileName, PBXSourceTree.Source); + var guid = project.AddFile(AppLovinSettingsPlistFileName, AppLovinSettingsPlistFileName); project.AddFileToBuild(unityMainTargetGuid, guid); project.WriteToFile(projectPath); } @@ -606,6 +568,9 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor consentFlowInfoRoot.SetString(KeyConsentFlowTermsOfService, termsOfServiceUrl); } + var shouldShowTermsAndPrivacyPolicyAlertInGdpr = AppLovinInternalSettings.Instance.ShouldShowTermsAndPrivacyPolicyAlertInGDPR; + consentFlowInfoRoot.SetBoolean(KeyConsentFlowShowTermsAndPrivacyPolicyAlertInGDPR, shouldShowTermsAndPrivacyPolicyAlertInGdpr); + var debugUserGeography = AppLovinInternalSettings.Instance.DebugUserGeography; if (debugUserGeography == MaxSdkBase.ConsentFlowUserGeography.Gdpr) { @@ -679,36 +644,33 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var installedNetworks = AppLovinPackageManager.GetInstalledMediationNetworks(); var uriBuilder = new UriBuilder("https://unity.applovin.com/max/1.0/skadnetwork_ids"); var adNetworks = string.Join(",", installedNetworks.ToArray()); - if (!string.IsNullOrEmpty(adNetworks)) + if (MaxSdkUtils.IsValidString(adNetworks)) { uriBuilder.Query += string.Format("ad_networks={0}", adNetworks); } - using (var unityWebRequest = UnityWebRequest.Get(uriBuilder.ToString())) + var webRequestConfig = new WebRequestConfig() { - var operation = unityWebRequest.SendWebRequest(); - // Wait for the download to complete or the request to timeout. - while (!operation.isDone) { } + EndPoint = uriBuilder.ToString() + }; -#if UNITY_2020_1_OR_NEWER - if (unityWebRequest.result != UnityWebRequest.Result.Success) -#else - if (unityWebRequest.isNetworkError || unityWebRequest.isHttpError) -#endif - { - MaxSdkLogger.UserError("Failed to retrieve SKAdNetwork IDs with error: " + unityWebRequest.error); - return new SkAdNetworkData(); - } + var maxWebRequest = new MaxWebRequest(webRequestConfig); + var webResponse = maxWebRequest.SendSync(); - try - { - return JsonUtility.FromJson(unityWebRequest.downloadHandler.text); - } - catch (Exception exception) - { - MaxSdkLogger.UserError("Failed to parse data '" + unityWebRequest.downloadHandler.text + "' with exception: " + exception); - return new SkAdNetworkData(); - } + if (!webResponse.IsSuccess) + { + MaxSdkLogger.UserError("Failed to retrieve SKAdNetwork IDs with error: " + webResponse.ErrorMessage); + return new SkAdNetworkData(); + } + + try + { + return JsonUtility.FromJson(webResponse.ResponseMessage); + } + catch (Exception exception) + { + MaxSdkLogger.UserError("Failed to parse data '" + webResponse.ResponseMessage + "' with exception: " + exception); + return new SkAdNetworkData(); } } diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs.meta diff --git a/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcess.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcess.cs new file mode 100644 index 0000000..3ed102a --- /dev/null +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcess.cs @@ -0,0 +1,182 @@ +// +// AppLovinPreProcess.cs +// AppLovin MAX Unity Plugin +// +// Created by Jonathan Liu on 10/19/2023. +// Copyright © 2023 AppLovin. All rights reserved. +// + +using System; +using System.IO; +using System.Linq; +using System.Xml; +using System.Xml.Linq; + +namespace AppLovinMax.Scripts.IntegrationManager.Editor +{ + public abstract class AppLovinPreProcess + { + // Use a slightly lower value than max value so pubs have the option to run a post process script after ours. + internal const int CallbackOrder = int.MaxValue - 10; + private const string AppLovinDependenciesFileExportPath = "MaxSdk/AppLovin/Editor/Dependencies.xml"; + private const string ElementNameDependencies = "dependencies"; + + private static readonly XmlWriterSettings DependenciesFileXmlWriterSettings = new XmlWriterSettings + { + Indent = true, + IndentChars = " ", + NewLineChars = "\n", + NewLineHandling = NewLineHandling.Replace + }; + + protected static string AppLovinDependenciesFilePath + { + get { return AppLovinIntegrationManager.IsPluginInPackageManager ? Path.Combine("Assets", AppLovinDependenciesFileExportPath) : MaxSdkUtils.GetAssetPathForExportPath(AppLovinDependenciesFileExportPath); } + } + + /// + /// Gets the AppLovin Dependencies.xml file. If `createIfNotExists` is true, a new file will be created if one does not exist. + /// + /// The path to the AppLovin Dependencies.xml file + /// Whether to create a new Dependencies.xml file if one does not exist + /// + protected static XDocument GetAppLovinDependenciesFile(string path, bool createIfNotExists = false) + { + try + { + if (File.Exists(path)) + { + return XDocument.Load(path); + } + + if (createIfNotExists) + { + return new XDocument(new XDeclaration("1.0", "utf-8", "yes"), + new XElement(ElementNameDependencies)); + } + } + catch (Exception exception) + { + MaxSdkLogger.E("Unable to load Dependencies file due to exception: " + exception.Message); + } + + return null; + } + + /// + /// Updates a dependency if it exists, otherwise adds a new dependency. + /// + /// The dependencies document we are writing to + /// The parent tag that we want to search for the dependency. For example, to add a new dependency to Android, pass in "androidPackages" + /// The element we are looking to update/add. For example, to add a new dependency to Android, pass in "androidPackage" + /// The attribute name we want in the dependency. For example, to add something to the spec attribute, pass in "spec" + /// The attribute value prefix we are looking to replace. For example, "com.google.android.ump:user-messaging-platform" + /// The new dependency we want to add. + protected static void AddOrUpdateDependency( + XDocument dependenciesDocument, + string parentTag, + string elementTag, + string matchAttribute, + string matchValuePrefix, + XElement newDependency) + { + var parentElement = dependenciesDocument.Root.Element(parentTag); + if (parentElement == null) + { + parentElement = new XElement(parentTag); + dependenciesDocument.Root.Add(parentElement); + } + + // Check if a dependency exists that matches the attributes name and value + var existingElement = parentElement.Elements(elementTag) + .FirstOrDefault(element => + { + var attr = element.Attribute(matchAttribute); + return attr != null && attr.Value.StartsWith(matchValuePrefix, StringComparison.OrdinalIgnoreCase); + }); + + if (existingElement != null) + { + foreach (var attr in newDependency.Attributes()) + { + existingElement.SetAttributeValue(attr.Name, attr.Value); + } + } + else + { + parentElement.Add(newDependency); + } + } + + /// + /// Removes a dependency from an xml file. + /// + /// The xml file to remove a dependency from + /// The parent tag that we want to search for the dependency to remove. For example: "androidPackages" + /// The element we are looking to remove. For example: "androidPackage" + /// The attribute name we want to remove. For example: "spec" + /// The attribute value prefix we are looking to replace. For example: "com.google.android.ump:user-messaging-platform" + /// True if the dependency was removed successfully, otherwise return false. + protected static bool RemoveDependency( + XDocument doc, + string parentTag, + string elementTag, + string matchAttribute, + string matchValuePrefix) + { + var root = doc.Root; + if (root == null) return false; + + var parentElement = root.Element(parentTag); + if (parentElement == null) return false; + + XElement toRemove = null; + foreach (var e in parentElement.Elements(elementTag)) + { + var attr = e.Attribute(matchAttribute); + if (attr != null && attr.Value.StartsWith(matchValuePrefix)) + { + toRemove = e; + break; + } + } + + if (toRemove == null) return false; + + toRemove.Remove(); + return true; + } + + /// + /// Saves an xml file. + /// + /// The document to save + /// The path to the document to save + /// Returns true if the file was saved successfully + protected static bool SaveDependenciesFile(XDocument doc, string path) + { + try + { + // Ensure directory exists before saving the file + var directory = Path.GetDirectoryName(path); + if (MaxSdkUtils.IsValidString(directory)) + { + // Does nothing if directory already exists + Directory.CreateDirectory(directory); + } + + using (var xmlWriter = XmlWriter.Create(path, DependenciesFileXmlWriterSettings)) + { + doc.Save(xmlWriter); + return true; + } + } + catch (Exception exception) + { + MaxSdkLogger.E("Unable to save Dependencies file due to exception: " + exception.Message); + } + + return false; + } + } +} diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcess.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcess.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcess.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcess.cs.meta diff --git a/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessAndroid.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessAndroid.cs new file mode 100644 index 0000000..2df7e0a --- /dev/null +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessAndroid.cs @@ -0,0 +1,111 @@ +// +// AppLovinBuildPreProcessor.cs +// AppLovin MAX Unity Plugin +// +// Created by Santosh Bagadi on 8/27/19. +// Copyright © 2019 AppLovin. All rights reserved. +// + +#if UNITY_ANDROID + +using System.Xml.Linq; +using UnityEditor.Build; +using UnityEditor.Build.Reporting; + +namespace AppLovinMax.Scripts.IntegrationManager.Editor +{ + /// + /// Adds the AppLovin Quality Service plugin to the gradle template file. See for more details. + /// + public class AppLovinPreProcessAndroid : AppLovinProcessGradleBuildFile, IPreprocessBuildWithReport + { + private const string ElementNameAndroidPackages = "androidPackages"; + private const string ElementNameAndroidPackage = "androidPackage"; + private const string AttributeNameSpec = "spec"; + private const string UmpDependencyPackage = "com.google.android.ump:user-messaging-platform:"; + private const string UmpDependencyVersion = "4.0.0"; + + public void OnPreprocessBuild(BuildReport report) + { + PreprocessAppLovinQualityServicePlugin(); + AddGoogleCmpDependencyIfNeeded(); + } + + private static void PreprocessAppLovinQualityServicePlugin() + { + // We can only process gradle template file here. If it is not available, we will try again in post build on Unity IDEs newer than 2018_2 (see AppLovinPostProcessGradleProject). + if (!AppLovinIntegrationManager.GradleTemplateEnabled) return; + + // The publisher could be migrating from older Unity versions to 2019_3 or newer. + // If so, we should delete the plugin from the template. The plugin will be added to the project's application module in the post processing script (AppLovinPostProcessGradleProject). + RemoveAppLovinQualityServiceOrSafeDkPlugin(AppLovinIntegrationManager.GradleTemplatePath); + } + + private static void AddGoogleCmpDependencyIfNeeded() + { + if (AppLovinInternalSettings.Instance.ConsentFlowEnabled) + { + var umpPackage = new XElement(ElementNameAndroidPackage, + new XAttribute(AttributeNameSpec, UmpDependencyPackage + UmpDependencyVersion)); + var success = AddOrUpdateAndroidDependency(UmpDependencyPackage, umpPackage ); + if (!success) + { + MaxSdkLogger.UserWarning("Google CMP will not function. Unable to add user-messaging-platform dependency."); + } + } + else + { + RemoveAndroidDependency(UmpDependencyPackage); + } + } + + /// + /// Adds or updates an Android dependency in the AppLovin Dependencies.xml file. + /// + /// The package that we are trying to update + /// The new dependency to add if it doesn't exist + /// Returns true if the file was successfully edited + private static bool AddOrUpdateAndroidDependency(string package, XElement newDependency) + { + var dependenciesFilePath = AppLovinDependenciesFilePath; + var dependenciesDocument = GetAppLovinDependenciesFile(dependenciesFilePath, AppLovinIntegrationManager.IsPluginInPackageManager); + if (dependenciesDocument == null) return false; + + AddOrUpdateDependency(dependenciesDocument, + ElementNameAndroidPackages, + ElementNameAndroidPackage, + AttributeNameSpec, + package, + newDependency); + return SaveDependenciesFile(dependenciesDocument, dependenciesFilePath); + } + + /// + /// Removed an android dependency from the AppLovin Dependencies.xml file. + /// + /// The package to remove + private static void RemoveAndroidDependency(string package) + { + var dependenciesFilePath = AppLovinDependenciesFilePath; + var dependenciesDocument = GetAppLovinDependenciesFile(dependenciesFilePath); + if (dependenciesDocument == null) return; + + var removed = RemoveDependency(dependenciesDocument, + ElementNameAndroidPackages, + ElementNameAndroidPackage, + AttributeNameSpec, + package); + + if (!removed) return; + + SaveDependenciesFile(dependenciesDocument, dependenciesFilePath); + } + + public int callbackOrder + { + get { return CallbackOrder; } + } + } +} + +#endif diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessAndroid.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessAndroid.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessAndroid.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessAndroid.cs.meta diff --git a/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessiOS.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessiOS.cs new file mode 100644 index 0000000..19729a1 --- /dev/null +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessiOS.cs @@ -0,0 +1,99 @@ +// +// AppLovinBuildPreProcessiOS.cs +// AppLovin MAX Unity Plugin +// +// Created by Jonathan Liu on 10/17/2023. +// Copyright © 2023 AppLovin. All rights reserved. +// + +#if UNITY_IOS + +using System.Xml.Linq; +using UnityEditor.Build; +using UnityEditor.Build.Reporting; + +namespace AppLovinMax.Scripts.IntegrationManager.Editor +{ + public class AppLovinPreProcessiOS : AppLovinPreProcess, IPreprocessBuildWithReport + { + public void OnPreprocessBuild(BuildReport report) + { + AddGoogleCmpDependencyIfNeeded(); + } + + private const string ElementNameIosPods = "iosPods"; + private const string ElementNameIosPod = "iosPod"; + private const string AttributeNameName = "name"; + private const string AttributeNameVersion = "version"; + private const string UmpDependencyPod = "GoogleUserMessagingPlatform"; + private const string UmpDependencyVersion = "~> 3.1"; + + private static void AddGoogleCmpDependencyIfNeeded() + { + if (AppLovinInternalSettings.Instance.ConsentFlowEnabled) + { + var umpDependency = new XElement(ElementNameIosPod, + new XAttribute(AttributeNameName, UmpDependencyPod), + new XAttribute(AttributeNameVersion, UmpDependencyVersion)); + var success = AddOrUpdateIosDependency(UmpDependencyPod, umpDependency); + if (!success) + { + MaxSdkLogger.UserWarning("Google CMP will not function. Unable to add GoogleUserMessagingPlatform dependency."); + } + } + else + { + RemoveIosDependency(UmpDependencyPod); + } + } + + /// + /// Adds or updates an iOS pod in the AppLovin Dependencies.xml file. + /// + /// The pod that we are trying to update + /// The new dependency to add if it doesn't exist + /// Returns true if the file was successfully edited + private static bool AddOrUpdateIosDependency(string pod, XElement newDependency) + { + var dependenciesFilePath = AppLovinDependenciesFilePath; + var dependenciesDocument = GetAppLovinDependenciesFile(dependenciesFilePath, AppLovinIntegrationManager.IsPluginInPackageManager); + if (dependenciesDocument == null) return false; + + AddOrUpdateDependency(dependenciesDocument, + ElementNameIosPods, + ElementNameIosPod, + AttributeNameName, + pod, + newDependency); + return SaveDependenciesFile(dependenciesDocument, dependenciesFilePath); + } + + /// + /// Removed an iOS pod from the AppLovin Dependencies.xml file. + /// + /// The pod to remove + private static void RemoveIosDependency(string pod) + { + var dependenciesFilePath = AppLovinDependenciesFilePath; + var dependenciesDocument = GetAppLovinDependenciesFile(dependenciesFilePath); + if (dependenciesDocument == null) return; + + var removed = RemoveDependency(dependenciesDocument, + ElementNameIosPods, + ElementNameIosPod, + AttributeNameName, + pod); + + if (!removed) return; + + SaveDependenciesFile(dependenciesDocument, dependenciesFilePath); + } + + public int callbackOrder + { + get { return CallbackOrder; } + } + } +} + +#endif diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessiOS.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessiOS.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessiOS.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPreProcessiOS.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs similarity index 64% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs index 166524c..88bd668 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs @@ -6,22 +6,21 @@ #if UNITY_ANDROID -using System.Text; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using UnityEditorInternal; +using AppLovinMax.Internal; using UnityEngine; -using UnityEngine.Networking; -using Debug = UnityEngine.Debug; +using UnityEngine.PlayerLoop; namespace AppLovinMax.Scripts.IntegrationManager.Editor { [Serializable] public class AppLovinQualityServiceData { + // ReSharper disable once InconsistentNaming - Need to keep name for response data public string api_key; } @@ -57,6 +56,60 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private const string SafeDkLegacyMavenRepo = "http://download.safedk.com"; private const string SafeDkLegacyDependencyClassPath = "com.safedk:SafeDKGradlePlugin:"; + /// + /// Adds the Quality Service plugin to the root gradle file. + /// + /// The path to the unityLibrary's module. + /// True if the plugin was added successfully, otherwise return false + protected static bool AddQualityServiceToRootGradleFile(string path) + { + var rootGradleBuildFilePath = Path.Combine(path, "../build.gradle"); + var shouldAddQualityServiceToDependencies = ShouldAddQualityServiceToDependencies(rootGradleBuildFilePath); + + if (shouldAddQualityServiceToDependencies) + { + // Add the Quality Service Plugin to the dependencies block in the root build.gradle file + return AddQualityServiceBuildScriptLines(rootGradleBuildFilePath); + } + + // Add the Quality Service Plugin to the plugin block in the root build.gradle file + var rootSettingsGradleFilePath = Path.Combine(path, "../settings.gradle"); + var qualityServiceAdded = AddPluginToRootGradleBuildFile(rootGradleBuildFilePath); + var appLovinRepositoryAdded = AddAppLovinRepository(rootSettingsGradleFilePath); + return qualityServiceAdded && appLovinRepositoryAdded; + } + + /// + /// Determines whether the AppLovin Quality Service plugin should be added to the + /// dependencies block in the root build.gradle file or to the plugins block. + /// + /// Gradle's required structure for including plugins varies by version: + /// - Older versions of Gradle require the plugin to be added to the dependencies block. + /// Example: + /// dependencies { + /// classpath 'com.android.tools.build:gradle:4.0.1' + /// classpath 'com.applovin.quality:AppLovinQualityServiceGradlePlugin:+' + /// } + /// + /// - Newer versions of gradle require the plugin to be added to the plugins block. + /// Example: + /// plugins { + /// id 'com.android.application' version '7.4.2' apply false + /// id 'com.android.library' version '7.4.2' apply false + /// id 'com.applovin.quality' version '+' apply false + /// } + /// + /// Since Unity projects may use custom Gradle versions depending on the Unity version or + /// user modifications, this check ensures proper integration of the AppLovin plugin. + /// + /// The path to project's root build.gradle file. + /// true if the file contains a `dependencies` block, indicating an older Gradle version + private static bool ShouldAddQualityServiceToDependencies(string rootGradleBuildFile) + { + var lines = File.ReadAllLines(rootGradleBuildFile).ToList(); + return lines.Any(line => TokenBuildScriptDependencies.IsMatch(line)); + } + /// /// Updates the provided Gradle script to add Quality Service plugin. /// @@ -87,11 +140,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor var outputLines = GenerateUpdatedBuildFileLines( sanitizedLines, apiKey, -#if UNITY_2019_3_OR_NEWER - false // On Unity 2019.3+, the buildscript closure related lines will to be added to the root build.gradle file. -#else - true -#endif + false // The buildscript closure related lines will to be added to the root build.gradle file. ); // outputLines can be null if we couldn't add the plugin. if (outputLines == null) return; @@ -122,10 +171,10 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// The path to project's root build.gradle file. /// true when the plugin was added successfully. - protected bool AddPluginToRootGradleBuildFile(string rootGradleBuildFile) + private static bool AddPluginToRootGradleBuildFile(string rootGradleBuildFile) { var lines = File.ReadAllLines(rootGradleBuildFile).ToList(); - + // Check if the plugin is already added to the file. var pluginAdded = lines.Any(line => line.Contains(QualityServicePluginRoot)); if (pluginAdded) return true; @@ -182,7 +231,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// The path to the project's settings.gradle file. /// true if the repository was added successfully. - protected bool AddAppLovinRepository(string settingsGradleFile) + private static bool AddAppLovinRepository(string settingsGradleFile) { var lines = File.ReadLines(settingsGradleFile).ToList(); var outputLines = new List(); @@ -244,7 +293,6 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor return true; } -#if UNITY_2019_3_OR_NEWER /// /// Adds the necessary AppLovin Quality Service dependency and maven repo lines to the provided root build.gradle file. /// Sample build.gradle file after adding quality service: @@ -265,7 +313,7 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor /// /// The root build.gradle file path /// true if the build script lines were applied correctly. - protected bool AddQualityServiceBuildScriptLines(string rootGradleBuildFile) + private static bool AddQualityServiceBuildScriptLines(string rootGradleBuildFile) { var lines = File.ReadAllLines(rootGradleBuildFile).ToList(); var outputLines = GenerateUpdatedBuildFileLines(lines, null, true); @@ -307,46 +355,35 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor Console.WriteLine(exception); } } -#endif private static AppLovinQualityServiceData RetrieveQualityServiceData(string sdkKey) { - var postJson = string.Format("{{\"sdk_key\" : \"{0}\"}}", sdkKey); - var bodyRaw = Encoding.UTF8.GetBytes(postJson); - // Upload handler is automatically disposed when UnityWebRequest is disposed - var uploadHandler = new UploadHandlerRaw(bodyRaw); - uploadHandler.contentType = "application/json"; - - using (var unityWebRequest = new UnityWebRequest("https://api2.safedk.com/v1/build/cred")) + var webRequestConfig = new WebRequestConfig() { - unityWebRequest.method = UnityWebRequest.kHttpVerbPOST; - unityWebRequest.uploadHandler = uploadHandler; - unityWebRequest.downloadHandler = new DownloadHandlerBuffer(); + JsonString = string.Format("{{\"sdk_key\" : \"{0}\"}}", sdkKey), + EndPoint = "https://api2.safedk.com/v1/build/cred", + RequestType = WebRequestType.Post, + }; - var operation = unityWebRequest.SendWebRequest(); + webRequestConfig.Headers.Add("Content-Type", "application/json"); - // Wait for the download to complete or the request to timeout. - while (!operation.isDone) { } + var maxWebRequest = new MaxWebRequest(webRequestConfig); + var webResponse = maxWebRequest.SendSync(); -#if UNITY_2020_1_OR_NEWER - if (unityWebRequest.result != UnityWebRequest.Result.Success) -#else - if (unityWebRequest.isNetworkError || unityWebRequest.isHttpError) -#endif - { - MaxSdkLogger.UserError("Failed to retrieve API Key for SDK Key: " + sdkKey + "with error: " + unityWebRequest.error); - return new AppLovinQualityServiceData(); - } + if (!webResponse.IsSuccess) + { + MaxSdkLogger.UserError("Failed to retrieve API Key for SDK Key: " + sdkKey + "with error: " + webResponse.ErrorMessage); + return new AppLovinQualityServiceData(); + } - try - { - return JsonUtility.FromJson(unityWebRequest.downloadHandler.text); - } - catch (Exception exception) - { - MaxSdkLogger.UserError("Failed to parse API Key." + exception); - return new AppLovinQualityServiceData(); - } + try + { + return JsonUtility.FromJson(webResponse.ResponseMessage); + } + catch (Exception exception) + { + MaxSdkLogger.UserError("Failed to parse API Key." + exception); + return new AppLovinQualityServiceData(); } } @@ -413,7 +450,13 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor private static List GenerateUpdatedBuildFileLines(List lines, string apiKey, bool addBuildScriptLines) { - var addPlugin = !string.IsNullOrEmpty(apiKey); + // Check if the plugin exists, if so, update the SDK Key. + var pluginExists = lines.Any(line => TokenAppLovinPlugin.IsMatch(line)); + return pluginExists ? UpdateExistingPlugin(lines, apiKey) : AddPluginAndBuildScript(lines, apiKey, addBuildScriptLines); + } + + private static List UpdateExistingPlugin(List lines, string apiKey) + { // A sample of the template file. // ... // allprojects { @@ -434,149 +477,162 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor // **DEPS**} // ... var outputLines = new List(); - // Check if the plugin exists, if so, update the SDK Key. - var pluginExists = lines.Any(line => TokenAppLovinPlugin.IsMatch(line)); - if (pluginExists) + var pluginMatched = false; + var insideAppLovinClosure = false; + var updatedApiKey = false; + var mavenRepoUpdated = false; + var dependencyClassPathUpdated = false; + foreach (var line in lines) { - var pluginMatched = false; - var insideAppLovinClosure = false; - var updatedApiKey = false; - var mavenRepoUpdated = false; - var dependencyClassPathUpdated = false; - foreach (var line in lines) + // Bintray maven repo is no longer being used. Update to s3 maven repo with regex check + if (!mavenRepoUpdated && (line.Contains(QualityServiceBintrayMavenRepo) || line.Contains(QualityServiceNoRegexMavenRepo))) { - // Bintray maven repo is no longer being used. Update to s3 maven repo with regex check - if (!mavenRepoUpdated && (line.Contains(QualityServiceBintrayMavenRepo) || line.Contains(QualityServiceNoRegexMavenRepo))) - { - outputLines.Add(GetFormattedBuildScriptLine(QualityServiceMavenRepo)); - mavenRepoUpdated = true; - continue; - } - - // We no longer use version specific dependency class path. Just use + for version to always pull the latest. - if (!dependencyClassPathUpdated && line.Contains(QualityServiceDependencyClassPathV3)) - { - outputLines.Add(GetFormattedBuildScriptLine(QualityServiceDependencyClassPath)); - dependencyClassPathUpdated = true; - continue; - } - - if (!pluginMatched && line.Contains(QualityServicePlugin)) - { - insideAppLovinClosure = true; - pluginMatched = true; - } - - if (insideAppLovinClosure && line.Contains("}")) - { - insideAppLovinClosure = false; - } - - // Update the API key. - if (insideAppLovinClosure && !updatedApiKey && TokenApiKey.IsMatch(line)) - { - outputLines.Add(string.Format(QualityServiceApiKey, apiKey)); - updatedApiKey = true; - } - // Keep adding the line until we find and update the plugin. - else - { - outputLines.Add(line); - } + outputLines.Add(GetFormattedBuildScriptLine(QualityServiceMavenRepo)); + mavenRepoUpdated = true; + continue; } - } - // Plugin hasn't been added yet, add it. - else - { - var buildScriptClosureDepth = 0; - var insideBuildScriptClosure = false; - var buildScriptMatched = false; - var qualityServiceRepositoryAdded = false; - var qualityServiceDependencyClassPathAdded = false; - var qualityServicePluginAdded = false; - foreach (var line in lines) + + // We no longer use version specific dependency class path. Just use + for version to always pull the latest. + if (!dependencyClassPathUpdated && line.Contains(QualityServiceDependencyClassPathV3)) + { + outputLines.Add(GetFormattedBuildScriptLine(QualityServiceDependencyClassPath)); + dependencyClassPathUpdated = true; + continue; + } + + if (!pluginMatched && line.Contains(QualityServicePlugin)) + { + insideAppLovinClosure = true; + pluginMatched = true; + } + + if (insideAppLovinClosure && line.Contains("}")) + { + insideAppLovinClosure = false; + } + + // Update the API key. + if (insideAppLovinClosure && !updatedApiKey && TokenApiKey.IsMatch(line)) + { + outputLines.Add(string.Format(QualityServiceApiKey, apiKey)); + updatedApiKey = true; + } + // Keep adding the line until we find and update the plugin. + else { - // Add the line to the output lines. outputLines.Add(line); - - // Check if we need to add the build script lines and add them. - if (addBuildScriptLines) - { - if (!buildScriptMatched && line.Contains(BuildScriptMatcher)) - { - buildScriptMatched = true; - insideBuildScriptClosure = true; - } - - // Match the parenthesis to track if we are still inside the buildscript closure. - if (insideBuildScriptClosure) - { - if (line.Contains("{")) - { - buildScriptClosureDepth++; - } - - if (line.Contains("}")) - { - buildScriptClosureDepth--; - } - - if (buildScriptClosureDepth == 0) - { - insideBuildScriptClosure = false; - - // There may be multiple buildscript closures and we need to keep looking until we added both the repository and classpath. - buildScriptMatched = qualityServiceRepositoryAdded && qualityServiceDependencyClassPathAdded; - } - } - - if (insideBuildScriptClosure) - { - // Add the build script dependency repositories. - if (!qualityServiceRepositoryAdded && TokenBuildScriptRepositories.IsMatch(line)) - { - outputLines.Add(GetFormattedBuildScriptLine(QualityServiceMavenRepo)); - qualityServiceRepositoryAdded = true; - } - // Add the build script dependencies. - else if (!qualityServiceDependencyClassPathAdded && TokenBuildScriptDependencies.IsMatch(line)) - { - outputLines.Add(GetFormattedBuildScriptLine(QualityServiceDependencyClassPath)); - qualityServiceDependencyClassPathAdded = true; - } - } - } - - // Check if we need to add the plugin and add it. - if (addPlugin) - { - // Add the plugin. - if (!qualityServicePluginAdded && TokenApplicationPlugin.IsMatch(line)) - { - outputLines.Add(QualityServiceApplyPlugin); - outputLines.AddRange(GenerateAppLovinPluginClosure(apiKey)); - qualityServicePluginAdded = true; - } - } - } - - if ((addBuildScriptLines && (!qualityServiceRepositoryAdded || !qualityServiceDependencyClassPathAdded)) || (addPlugin && !qualityServicePluginAdded)) - { - return null; } } return outputLines; } + private static List AddPluginAndBuildScript(List lines, string apiKey, bool addBuildScriptLines) + { + var shouldAddPlugin = MaxSdkUtils.IsValidString(apiKey); + if (shouldAddPlugin) + { + lines = AddPlugin(lines, apiKey); + if (lines == null) return null; + } + + if (!addBuildScriptLines) return lines; + + lines = AddBuildScript(lines); + return lines; + } + + private static List AddBuildScript(List lines) + { + var outputLines = new List(); + var buildScriptClosureDepth = 0; + var insideBuildScriptClosure = false; + var buildScriptMatched = false; + var qualityServiceRepositoryAdded = false; + var qualityServiceDependencyClassPathAdded = false; + foreach (var line in lines) + { + // Add the line to the output lines. + outputLines.Add(line); + + if (!buildScriptMatched && line.Contains(BuildScriptMatcher)) + { + buildScriptMatched = true; + insideBuildScriptClosure = true; + } + + // Match the parenthesis to track if we are still inside the buildscript closure. + if (insideBuildScriptClosure) + { + if (line.Contains("{")) + { + buildScriptClosureDepth++; + } + + if (line.Contains("}")) + { + buildScriptClosureDepth--; + } + + if (buildScriptClosureDepth == 0) + { + insideBuildScriptClosure = false; + + // There may be multiple buildscript closures and we need to keep looking until we added both the repository and classpath. + buildScriptMatched = qualityServiceRepositoryAdded && qualityServiceDependencyClassPathAdded; + } + } + + if (insideBuildScriptClosure) + { + // Add the build script dependency repositories. + if (!qualityServiceRepositoryAdded && TokenBuildScriptRepositories.IsMatch(line)) + { + outputLines.Add(GetFormattedBuildScriptLine(QualityServiceMavenRepo)); + qualityServiceRepositoryAdded = true; + } + // Add the build script dependencies. + else if (!qualityServiceDependencyClassPathAdded && TokenBuildScriptDependencies.IsMatch(line)) + { + outputLines.Add(GetFormattedBuildScriptLine(QualityServiceDependencyClassPath)); + qualityServiceDependencyClassPathAdded = true; + } + } + } + + if (!qualityServiceRepositoryAdded || !qualityServiceDependencyClassPathAdded) + { + return null; + } + + return outputLines; + } + + private static List AddPlugin(List lines, string apiKey) + { + var outputLines = new List(); + var qualityServicePluginAdded = false; + foreach (var line in lines) + { + outputLines.Add(line); + + // Add the plugin. + if (qualityServicePluginAdded || !TokenApplicationPlugin.IsMatch(line)) continue; + + outputLines.Add(QualityServiceApplyPlugin); + outputLines.AddRange(GenerateAppLovinPluginClosure(apiKey)); + qualityServicePluginAdded = true; + } + + return qualityServicePluginAdded ? outputLines : null; + } + public static string GetFormattedBuildScriptLine(string buildScriptLine) { #if UNITY_2022_2_OR_NEWER return " " -#elif UNITY_2019_3_OR_NEWER - return " " #else - return " " + return " " #endif + buildScriptLine; } diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs similarity index 78% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs index 4ce66cf..6a56a22 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs @@ -21,16 +21,13 @@ using UnityEngine.Serialization; /// public class AppLovinSettings : ScriptableObject { - public const string SettingsExportPath = "MaxSdk/Resources/AppLovinSettings.asset"; + private const string SettingsExportPath = "MaxSdk/Resources/AppLovinSettings.asset"; private static AppLovinSettings instance; [SerializeField] private bool qualityServiceEnabled = true; [SerializeField] private string sdkKey; - [SerializeField] private bool setAttributionReportEndpoint; - [SerializeField] private bool addApsSkAdNetworkIds; - [SerializeField] private string customGradleVersionUrl; [SerializeField] private string customGradleToolsVersion; @@ -60,16 +57,15 @@ public class AppLovinSettings : ScriptableObject return instance; } - // If there is no existing AppLovinSettings asset, create one in the default location string settingsFilePath; // The settings file should be under the Assets/ folder so that it can be version controlled and cannot be overriden when updating. - // If the plugin is outside the Assets folder, create the settings asset at the default location. + // If the plugin is outside the Assets folder or if there is no existing AppLovinSettings asset, create the settings asset at the default location. if (AppLovinIntegrationManager.IsPluginInPackageManager) { - // Note: Can't use absolute path when calling `CreateAsset`. Should use relative path to Assets/ directory. - settingsFilePath = Path.Combine("Assets", SettingsExportPath); + // Note: Can't use absolute path when calling `CreateAsset`. Should use path relative to Assets/ directory. + settingsFilePath = MaxSdkUtils.NormalizeToUnityPath(Path.Combine("Assets", SettingsExportPath)); - var maxSdkDir = Path.Combine(Application.dataPath, "MaxSdk"); + var maxSdkDir = MaxSdkUtils.NormalizeToUnityPath(Path.Combine(Application.dataPath, "MaxSdk")); if (!Directory.Exists(maxSdkDir)) { Directory.CreateDirectory(maxSdkDir); @@ -77,7 +73,7 @@ public class AppLovinSettings : ScriptableObject } else { - settingsFilePath = Path.Combine(AppLovinIntegrationManager.PluginParentDirectory, SettingsExportPath); + settingsFilePath = MaxSdkUtils.NormalizeToUnityPath(Path.Combine(AppLovinIntegrationManager.PluginParentDirectory, SettingsExportPath)); } var settingsDir = Path.GetDirectoryName(settingsFilePath); @@ -117,24 +113,6 @@ public class AppLovinSettings : ScriptableObject set { Instance.sdkKey = value; } } - /// - /// Whether or not to set `NSAdvertisingAttributionReportEndpoint` in Info.plist. - /// - public bool SetAttributionReportEndpoint - { - get { return Instance.setAttributionReportEndpoint; } - set { Instance.setAttributionReportEndpoint = value; } - } - - /// - /// Whether or not to add Amazon Publisher Services SKAdNetworkID's. - /// - public bool AddApsSkAdNetworkIds - { - get { return Instance.addApsSkAdNetworkIds; } - set { Instance.addApsSkAdNetworkIds = value; } - } - /// /// A URL to set the distributionUrl in the gradle-wrapper.properties file (ex: https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip) /// diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinSettings.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs similarity index 99% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs index 38aab79..8a55ae9 100644 --- a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs +++ b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs @@ -1,4 +1,3 @@ -#if UNITY_2019_2_OR_NEWER using System; using System.Collections.Generic; using System.IO; @@ -189,4 +188,3 @@ namespace AppLovinMax.Scripts.IntegrationManager.Editor #endregion } } -#endif diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinUpmManifest.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef diff --git a/Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef.meta b/Assets/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef.meta rename to Assets/MaxSdk/Scripts/IntegrationManager/Editor/MaxSdk.IntegrationManager.Editor.asmdef.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxCmpService.cs b/Assets/MaxSdk/Scripts/MaxCmpService.cs similarity index 95% rename from Assets/Plugins/MaxSdk/Scripts/MaxCmpService.cs rename to Assets/MaxSdk/Scripts/MaxCmpService.cs index c142439..e492a73 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxCmpService.cs +++ b/Assets/MaxSdk/Scripts/MaxCmpService.cs @@ -25,7 +25,7 @@ public class MaxCmpService private MaxCmpService() { } - private static Action OnCompletedAction; + private static Action _onCompletedAction; #if UNITY_EDITOR #elif UNITY_ANDROID @@ -50,7 +50,7 @@ public class MaxCmpService /// Called when the CMP flow finishes showing. public void ShowCmpForExistingUser(Action onCompletedAction) { - OnCompletedAction = onCompletedAction; + _onCompletedAction = onCompletedAction; #if UNITY_EDITOR var errorProps = new Dictionary @@ -88,10 +88,10 @@ public class MaxCmpService internal static void NotifyCompletedIfNeeded(Dictionary errorProps) { - if (OnCompletedAction == null) return; + if (_onCompletedAction == null) return; var error = (errorProps == null) ? null : MaxCmpError.Create(errorProps); - OnCompletedAction(error); + _onCompletedAction(error); } } diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxCmpService.cs.meta b/Assets/MaxSdk/Scripts/MaxCmpService.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxCmpService.cs.meta rename to Assets/MaxSdk/Scripts/MaxCmpService.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxEventExecutor.cs b/Assets/MaxSdk/Scripts/MaxEventExecutor.cs similarity index 63% rename from Assets/Plugins/MaxSdk/Scripts/MaxEventExecutor.cs rename to Assets/MaxSdk/Scripts/MaxEventExecutor.cs index 6b893ad..4d22dc2 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxEventExecutor.cs +++ b/Assets/MaxSdk/Scripts/MaxEventExecutor.cs @@ -15,31 +15,31 @@ namespace AppLovinMax.Internal { public class MaxEventExecutor : MonoBehaviour { - private static MaxEventExecutor instance; - private static List adEventsQueue = new List(); + private static MaxEventExecutor _instance; + private static readonly List AdEventsQueue = new List(); - private static volatile bool adEventsQueueEmpty = true; + private static volatile bool _adEventsQueueEmpty = true; struct MaxAction { - public Action action; - public string eventName; + public readonly Action ActionToExecute; + public readonly string EventName; public MaxAction(Action actionToExecute, string nameOfEvent) { - action = actionToExecute; - eventName = nameOfEvent; + ActionToExecute = actionToExecute; + EventName = nameOfEvent; } } public static void InitializeIfNeeded() { - if (instance != null) return; + if (_instance != null) return; var executor = new GameObject("MaxEventExecutor"); executor.hideFlags = HideFlags.HideAndDontSave; DontDestroyOnLoad(executor); - instance = executor.AddComponent(); + _instance = executor.AddComponent(); } #region Public API @@ -50,17 +50,17 @@ namespace AppLovinMax.Internal get { InitializeIfNeeded(); - return instance; + return _instance; } } #endif public static void ExecuteOnMainThread(Action action, string eventName) { - lock (adEventsQueue) + lock (AdEventsQueue) { - adEventsQueue.Add(new MaxAction(action, eventName)); - adEventsQueueEmpty = false; + AdEventsQueue.Add(new MaxAction(action, eventName)); + _adEventsQueueEmpty = false; } } @@ -73,27 +73,27 @@ namespace AppLovinMax.Internal public void Update() { - if (adEventsQueueEmpty) return; + if (_adEventsQueueEmpty) return; var actionsToExecute = new List(); - lock (adEventsQueue) + lock (AdEventsQueue) { - actionsToExecute.AddRange(adEventsQueue); - adEventsQueue.Clear(); - adEventsQueueEmpty = true; + actionsToExecute.AddRange(AdEventsQueue); + AdEventsQueue.Clear(); + _adEventsQueueEmpty = true; } foreach (var maxAction in actionsToExecute) { - if (maxAction.action.Target != null) + if (maxAction.ActionToExecute.Target != null) { try { - maxAction.action.Invoke(); + maxAction.ActionToExecute.Invoke(); } catch (Exception exception) { - MaxSdkLogger.UserError("Caught exception in publisher event: " + maxAction.eventName + ", exception: " + exception); + MaxSdkLogger.UserError("Caught exception in publisher event: " + maxAction.EventName + ", exception: " + exception); MaxSdkLogger.LogException(exception); } } @@ -102,7 +102,7 @@ namespace AppLovinMax.Internal public void Disable() { - instance = null; + _instance = null; } } } diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxEventExecutor.cs.meta b/Assets/MaxSdk/Scripts/MaxEventExecutor.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxEventExecutor.cs.meta rename to Assets/MaxSdk/Scripts/MaxEventExecutor.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxEventSystemChecker.cs b/Assets/MaxSdk/Scripts/MaxEventSystemChecker.cs similarity index 92% rename from Assets/Plugins/MaxSdk/Scripts/MaxEventSystemChecker.cs rename to Assets/MaxSdk/Scripts/MaxEventSystemChecker.cs index 19a082f..c15563b 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxEventSystemChecker.cs +++ b/Assets/MaxSdk/Scripts/MaxEventSystemChecker.cs @@ -22,7 +22,7 @@ namespace AppLovinMax.Scripts { // Enable the EventSystem if there is no other EventSystem in the scene var eventSystem = GetComponent(); - var currentSystem = UnityEngine.EventSystems.EventSystem.current; + var currentSystem = EventSystem.current; if (currentSystem == null || currentSystem == eventSystem) { eventSystem.enabled = true; diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxEventSystemChecker.cs.meta b/Assets/MaxSdk/Scripts/MaxEventSystemChecker.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxEventSystemChecker.cs.meta rename to Assets/MaxSdk/Scripts/MaxEventSystemChecker.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxEvents.cs b/Assets/MaxSdk/Scripts/MaxEvents.cs similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxEvents.cs rename to Assets/MaxSdk/Scripts/MaxEvents.cs diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxEvents.cs.meta b/Assets/MaxSdk/Scripts/MaxEvents.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxEvents.cs.meta rename to Assets/MaxSdk/Scripts/MaxEvents.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdk.Scripts.asmdef b/Assets/MaxSdk/Scripts/MaxSdk.Scripts.asmdef similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdk.Scripts.asmdef rename to Assets/MaxSdk/Scripts/MaxSdk.Scripts.asmdef diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdk.Scripts.asmdef.meta b/Assets/MaxSdk/Scripts/MaxSdk.Scripts.asmdef.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdk.Scripts.asmdef.meta rename to Assets/MaxSdk/Scripts/MaxSdk.Scripts.asmdef.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdk.cs b/Assets/MaxSdk/Scripts/MaxSdk.cs similarity index 70% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdk.cs rename to Assets/MaxSdk/Scripts/MaxSdk.cs index ce3745e..8e69d9b 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxSdk.cs +++ b/Assets/MaxSdk/Scripts/MaxSdk.cs @@ -1,10 +1,6 @@ -/** - * AppLovin MAX Unity Plugin C# Wrapper - */ - -using UnityEngine; -using System.Collections.Generic; -using System.Runtime.InteropServices; +// +// AppLovin MAX Unity Plugin C# Wrapper +// public class MaxSdk : #if UNITY_EDITOR @@ -18,7 +14,7 @@ public class MaxSdk : MaxSdkUnityEditor #endif { - private const string _version = "8.0.1"; + private const string _version = "8.6.2"; /// /// Returns the current plugin version. diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdk.cs.meta b/Assets/MaxSdk/Scripts/MaxSdk.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdk.cs.meta rename to Assets/MaxSdk/Scripts/MaxSdk.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkAndroid.cs b/Assets/MaxSdk/Scripts/MaxSdkAndroid.cs similarity index 85% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkAndroid.cs rename to Assets/MaxSdk/Scripts/MaxSdkAndroid.cs index 8a87832..1b45c0b 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxSdkAndroid.cs +++ b/Assets/MaxSdk/Scripts/MaxSdkAndroid.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using AppLovinMax.ThirdParty.MiniJson; +#if UNITY_ANDROID /// /// Android AppLovin MAX Unity Plugin implementation /// @@ -11,7 +12,7 @@ public class MaxSdkAndroid : MaxSdkBase private static readonly AndroidJavaClass MaxUnityPluginClass = new AndroidJavaClass("com.applovin.mediation.unity.MaxUnityPlugin"); - private static BackgroundCallbackProxy BackgroundCallback = new BackgroundCallbackProxy(); + private static readonly BackgroundCallbackProxy BackgroundCallback = new BackgroundCallbackProxy(); static MaxSdkAndroid() { @@ -80,10 +81,10 @@ public class MaxSdkAndroid : MaxSdkBase /// /// Please call this method after the SDK has initialized. /// - public static List GetAvailableMediatedNetworks() + public static List GetAvailableMediatedNetworks() { var serializedNetworks = MaxUnityPluginClass.CallStatic("getAvailableMediatedNetworks"); - return MaxSdkUtils.PropsStringsToList(serializedNetworks); + return MaxSdkUtils.PropsStringsToList(serializedNetworks); } /// @@ -151,7 +152,7 @@ public class MaxSdkAndroid : MaxSdkBase /// /// Check if user has provided consent for information sharing with AppLovin and other providers. /// - /// true if user has provided consent for information sharing. false if the user declined to share information or the consent value has not been set . + /// true if user has provided consent for information sharing. false if the user declined to share information or the consent value has not been set. See IsUserConsentSet. public static bool HasUserConsent() { return MaxUnityPluginClass.CallStatic("hasUserConsent"); @@ -178,7 +179,7 @@ public class MaxSdkAndroid : MaxSdkBase /// /// Check if the user has opted out of the sale of their personal information. /// - /// true if the user has opted out of the sale of their personal information. false if the user opted in to the sell of their personal information or the value has not been set . + /// true if the user has opted out of the sale of their personal information. false if the user opted in to the sell of their personal information or the value has not been set. See IsDoNotSellSet. public static bool IsDoNotSell() { return MaxUnityPluginClass.CallStatic("isDoNotSell"); @@ -201,26 +202,18 @@ public class MaxSdkAndroid : MaxSdkBase /// Create a new banner. /// /// Ad unit identifier of the banner to create. Must not be null. - /// Banner position. Must not be null. - public static void CreateBanner(string adUnitIdentifier, BannerPosition bannerPosition) + /// The configuration for the banner + public static void CreateBanner(string adUnitIdentifier, AdViewConfiguration configuration) { ValidateAdUnitIdentifier(adUnitIdentifier, "create banner"); - MaxUnityPluginClass.CallStatic("createBanner", adUnitIdentifier, bannerPosition.ToSnakeCaseString()); - } - - /// - /// Create a new banner with a custom position. - /// - /// Ad unit identifier of the banner to create. Must not be null. - /// The X coordinate (horizontal position) of the banner relative to the top left corner of the screen. - /// The Y coordinate (vertical position) of the banner relative to the top left corner of the screen. - /// - /// The banner is placed within the safe area of the screen. You can use this to get the absolute position of the banner on screen. - /// - public static void CreateBanner(string adUnitIdentifier, float x, float y) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "create banner"); - MaxUnityPluginClass.CallStatic("createBanner", adUnitIdentifier, x, y); + if (configuration.UseCoordinates) + { + MaxUnityPluginClass.CallStatic("createBanner", adUnitIdentifier, configuration.XCoordinate, configuration.YCoordinate, configuration.IsAdaptive); + } + else + { + MaxUnityPluginClass.CallStatic("createBanner", adUnitIdentifier, configuration.Position.ToSnakeCaseString(), configuration.IsAdaptive); + } } /// @@ -271,7 +264,7 @@ public class MaxSdkAndroid : MaxSdkBase /// /// The ad unit identifier of the banner for which to update the position. Must not be null. /// A new position for the banner. Must not be null. - public static void UpdateBannerPosition(string adUnitIdentifier, BannerPosition bannerPosition) + public static void UpdateBannerPosition(string adUnitIdentifier, AdViewPosition bannerPosition) { ValidateAdUnitIdentifier(adUnitIdentifier, "update banner position"); MaxUnityPluginClass.CallStatic("updateBannerPosition", adUnitIdentifier, bannerPosition.ToSnakeCaseString()); @@ -408,26 +401,18 @@ public class MaxSdkAndroid : MaxSdkBase /// Create a new MREC. /// /// Ad unit identifier of the MREC to create. Must not be null. - /// MREC position. Must not be null. - public static void CreateMRec(string adUnitIdentifier, AdViewPosition mrecPosition) + /// The configuration for the MREC. + public static void CreateMRec(string adUnitIdentifier, AdViewConfiguration configuration) { ValidateAdUnitIdentifier(adUnitIdentifier, "create MREC"); - MaxUnityPluginClass.CallStatic("createMRec", adUnitIdentifier, mrecPosition.ToSnakeCaseString()); - } - - /// - /// Create a new MREC with a custom position. - /// - /// Ad unit identifier of the MREC to create. Must not be null. - /// The X coordinate (horizontal position) of the MREC relative to the top left corner of the screen. - /// The Y coordinate (vertical position) of the MREC relative to the top left corner of the screen. - /// - /// The MREC is placed within the safe area of the screen. You can use this to get the absolute position Rect of the MREC on screen. - /// - public static void CreateMRec(string adUnitIdentifier, float x, float y) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "create MREC"); - MaxUnityPluginClass.CallStatic("createMRec", adUnitIdentifier, x, y); + if (configuration.UseCoordinates) + { + MaxUnityPluginClass.CallStatic("createMRec", adUnitIdentifier, configuration.XCoordinate, configuration.YCoordinate); + } + else + { + MaxUnityPluginClass.CallStatic("createMRec", adUnitIdentifier, configuration.Position.ToSnakeCaseString()); + } } /// @@ -818,83 +803,6 @@ public class MaxSdkAndroid : MaxSdkBase #endregion - #region Rewarded Interstitial - - /// - /// Start loading an rewarded interstitial ad. - /// - /// Ad unit identifier of the rewarded interstitial ad to load. Must not be null. - public static void LoadRewardedInterstitialAd(string adUnitIdentifier) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "load rewarded interstitial ad"); - MaxUnityPluginClass.CallStatic("loadRewardedInterstitialAd", adUnitIdentifier); - } - - /// - /// Check if rewarded interstitial ad ad is loaded and ready to be displayed. - /// - /// Ad unit identifier of the rewarded interstitial ad to load. Must not be null. - /// True if the ad is ready to be displayed - public static bool IsRewardedInterstitialAdReady(string adUnitIdentifier) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "check rewarded interstitial ad loaded"); - return MaxUnityPluginClass.CallStatic("isRewardedInterstitialAdReady", adUnitIdentifier); - } - - /// - /// Present loaded rewarded interstitial ad for a given placement to tie ad events to. Note: if the rewarded interstitial ad is not ready to be displayed nothing will happen. - /// - /// Ad unit identifier of the rewarded interstitial to show. Must not be null. - /// The placement to tie the showing ad's events to - /// The custom data to tie the showing ad's events to. Maximum size is 8KB. - public static void ShowRewardedInterstitialAd(string adUnitIdentifier, string placement = null, string customData = null) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "show rewarded interstitial ad"); - - if (IsRewardedInterstitialAdReady(adUnitIdentifier)) - { - MaxUnityPluginClass.CallStatic("showRewardedInterstitialAd", adUnitIdentifier, placement, customData); - } - else - { - MaxSdkLogger.UserWarning("Not showing MAX Ads rewarded interstitial ad: ad not ready"); - } - } - - /// - /// Set an extra parameter for the ad. - /// - /// Ad unit identifier of the rewarded interstitial to set the extra parameter for. Must not be null. - /// The key for the extra parameter. Must not be null. - /// The value for the extra parameter. - public static void SetRewardedInterstitialAdExtraParameter(string adUnitIdentifier, string key, string value) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "set rewarded interstitial ad extra parameter"); - MaxUnityPluginClass.CallStatic("setRewardedInterstitialAdExtraParameter", adUnitIdentifier, key, value); - } - - /// - /// Set a local extra parameter for the ad. - /// - /// Ad unit identifier of the rewarded interstitial to set the local extra parameter for. Must not be null. - /// The key for the local extra parameter. Must not be null. - /// The value for the extra parameter. Accepts the following types: , null, IList, IDictionary, string, primitive types - public static void SetRewardedInterstitialAdLocalExtraParameter(string adUnitIdentifier, string key, object value) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "set rewarded interstitial ad local extra parameter"); - - if (value == null || value is AndroidJavaObject) - { - MaxUnityPluginClass.CallStatic("setRewardedInterstitialAdLocalExtraParameter", adUnitIdentifier, key, (AndroidJavaObject) value); - } - else - { - MaxUnityPluginClass.CallStatic("setRewardedInterstitialAdLocalExtraParameterJson", adUnitIdentifier, key, SerializeLocalExtraParameterValue(value)); - } - } - - #endregion - #region Event Tracking /// @@ -904,7 +812,9 @@ public class MaxSdkAndroid : MaxSdkBase /// A dictionary containing key-value pairs further describing this event. public static void TrackEvent(string name, IDictionary parameters = null) { - MaxUnityPluginClass.CallStatic("trackEvent", name, Json.Serialize(parameters)); + // Convert null to "{}" to avoid Unity sending the literal "null" to Android. + var jsonString = ( parameters == null ) ? EmptyJson : Json.Serialize(parameters); + MaxUnityPluginClass.CallStatic("trackEvent", name, jsonString); } #endregion @@ -1022,6 +932,38 @@ public class MaxSdkAndroid : MaxSdkBase #region Obsolete + [Obsolete("This API has been deprecated and will be removed in a future release. Please use CreateBanner(string adUnitIdentifier, AdViewConfiguration configuration) instead.")] + public static void CreateBanner(string adUnitIdentifier, BannerPosition bannerPosition) + { + // AdViewPosition and BannerPosition share identical enum values, so casting is safe + CreateBanner(adUnitIdentifier, new AdViewConfiguration((AdViewPosition) bannerPosition)); + } + + [Obsolete("This API has been deprecated and will be removed in a future release. Please use CreateBanner(string adUnitIdentifier, AdViewConfiguration configuration) instead.")] + public static void CreateBanner(string adUnitIdentifier, float x, float y) + { + CreateBanner(adUnitIdentifier, new AdViewConfiguration(x, y)); + } + + [Obsolete("This API has been deprecated and will be removed in a future release. Please use UpdateBannerPosition(string adUnitIdentifier, AdViewPosition bannerPosition) instead.")] + public static void UpdateBannerPosition(string adUnitIdentifier, BannerPosition bannerPosition) + { + // AdViewPosition and BannerPosition share identical enum values, so casting is safe + UpdateBannerPosition(adUnitIdentifier, (AdViewPosition) bannerPosition); + } + + [Obsolete("This API has been deprecated and will be removed in a future release. Please use CreateMRec(string adUnitIdentifier, AdViewConfiguration configuration) instead.")] + public static void CreateMRec(string adUnitIdentifier, AdViewPosition mrecPosition) + { + CreateMRec(adUnitIdentifier, new AdViewConfiguration(mrecPosition)); + } + + [Obsolete("This API has been deprecated and will be removed in a future release. Please use CreateMRec(string adUnitIdentifier, AdViewConfiguration configuration) instead.")] + public static void CreateMRec(string adUnitIdentifier, float x, float y) + { + CreateMRec(adUnitIdentifier, new AdViewConfiguration(x, y)); + } + [Obsolete("This API has been deprecated and will be removed in a future release. Please set your SDK key in the AppLovin Integration Manager.")] public static void SetSdkKey(string sdkKey) { @@ -1029,28 +971,6 @@ public class MaxSdkAndroid : MaxSdkBase MaxSdkLogger.UserWarning("MaxSdk.SetSdkKey() has been deprecated and will be removed in a future release. Please set your SDK key in the AppLovin Integration Manager."); } - [Obsolete("This method has been deprecated. Please use `GetSdkConfiguration().ConsentDialogState`")] - public static ConsentDialogState GetConsentDialogState() - { - if (!IsInitialized()) - { - MaxSdkLogger.UserWarning("MAX Ads SDK has not been initialized yet. GetConsentDialogState() may return ConsentDialogState.Unknown"); - } - - return (ConsentDialogState) MaxUnityPluginClass.CallStatic("getConsentDialogState"); - } - - [Obsolete("This method has been deprecated. The AdInfo object is returned with ad callbacks.")] - public static AdInfo GetAdInfo(string adUnitIdentifier) - { - var adInfoString = MaxUnityPluginClass.CallStatic("getAdInfo", adUnitIdentifier); - - if (string.IsNullOrEmpty(adInfoString)) return null; - - var adInfoDictionary = Json.Deserialize(adInfoString) as Dictionary; - return new AdInfo(adInfoDictionary); - } - #endregion internal class BackgroundCallbackProxy : AndroidJavaProxy @@ -1063,3 +983,4 @@ public class MaxSdkAndroid : MaxSdkBase } } } +#endif diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkAndroid.cs.meta b/Assets/MaxSdk/Scripts/MaxSdkAndroid.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkAndroid.cs.meta rename to Assets/MaxSdk/Scripts/MaxSdkAndroid.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkBase.cs b/Assets/MaxSdk/Scripts/MaxSdkBase.cs similarity index 87% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkBase.cs rename to Assets/MaxSdk/Scripts/MaxSdkBase.cs index b32e508..2c50ee3 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxSdkBase.cs +++ b/Assets/MaxSdk/Scripts/MaxSdkBase.cs @@ -14,6 +14,8 @@ using System.Runtime.InteropServices; public abstract class MaxSdkBase { + protected const string EmptyJson = "{}"; + /// /// This enum represents the user's geography used to determine the type of consent flow shown to the user. /// @@ -42,7 +44,7 @@ public abstract class MaxSdkBase public enum AppTrackingStatus { /// - /// Device is on < iOS14, AppTrackingTransparency.framework is not available. + /// Device is on < iOS14, AppTrackingTransparency.framework is not available. /// Unavailable, @@ -68,6 +70,42 @@ public abstract class MaxSdkBase } #endif + /// + /// An enum describing the adapter's initialization status. + /// + public enum InitializationStatus + { + /// + /// The adapter is not initialized. Note: networks need to be enabled for an ad unit id to be initialized. + /// + NotInitialized = -4, + + /// + /// The 3rd-party SDK does not have an initialization callback with status. + /// + DoesNotApply = -3, + + /// + /// The 3rd-party SDK is currently initializing. + /// + Initializing = -2, + + /// + /// The 3rd-party SDK explicitly initialized, but without a status. + /// + InitializedUnknown = -1, + + /// + /// The 3rd-party SDK initialization failed. + /// + InitializedFailure = 0, + + /// + /// The 3rd-party SDK initialization was successful. + /// + InitializedSuccess = 1 + } + public enum AdViewPosition { TopLeft, @@ -81,17 +119,53 @@ public abstract class MaxSdkBase BottomRight } - public enum BannerPosition + public class AdViewConfiguration { - TopLeft, - TopCenter, - TopRight, - Centered, - CenterLeft, - CenterRight, - BottomLeft, - BottomCenter, - BottomRight + /// + /// The position of the ad. + /// + public AdViewPosition Position { get; private set; } + + /// + /// The horizontal (X) position of the banner, relative to the top-left corner of the screen's safe area. + /// + public float XCoordinate { get; private set; } + + /// + /// The vertical (Y) position of the banner, relative to the top-left corner of the screen's safe area. + /// + public float YCoordinate { get; private set; } + + /// + /// Whether to use adaptive banners. Has no effect on MREC ads. + /// + public bool IsAdaptive { get; set; } + + internal bool UseCoordinates { get; private set; } + + /// + /// Creates an AdViewConfiguration with the given AdViewPosition. + /// + /// The position of the ad. Must not be null. + public AdViewConfiguration(AdViewPosition position) + { + Position = position; + IsAdaptive = true; + UseCoordinates = false; + } + + /// + /// Creates an AdViewConfiguration with the given x and y coordinates. + /// + /// The horizontal (X) position of the banner, relative to the top-left corner of the screen's safe area. + /// The vertical (Y) position of the banner, relative to the top-left corner of the screen's safe area. + public AdViewConfiguration(float x, float y) + { + XCoordinate = x; + YCoordinate = y; + IsAdaptive = true; + UseCoordinates = true; + } } public class SdkConfiguration @@ -478,6 +552,7 @@ public abstract class MaxSdkBase public string AdapterClassName { get; private set; } public string AdapterVersion { get; private set; } public string SdkVersion { get; private set; } + public InitializationStatus InitializationStatus { get; private set; } public MediatedNetworkInfo(IDictionary mediatedNetworkDictionary) { @@ -486,6 +561,8 @@ public abstract class MaxSdkBase AdapterClassName = MaxSdkUtils.GetStringFromDictionary(mediatedNetworkDictionary, "adapterClassName", ""); AdapterVersion = MaxSdkUtils.GetStringFromDictionary(mediatedNetworkDictionary, "adapterVersion", ""); SdkVersion = MaxSdkUtils.GetStringFromDictionary(mediatedNetworkDictionary, "sdkVersion", ""); + var initializationStatusInt = MaxSdkUtils.GetIntFromDictionary(mediatedNetworkDictionary, "initializationStatus", (int) InitializationStatus.NotInitialized); + InitializationStatus = InitializationStatusFromCode(initializationStatusInt); } public override string ToString() @@ -493,7 +570,20 @@ public abstract class MaxSdkBase return "[MediatedNetworkInfo name: " + Name + ", adapterClassName: " + AdapterClassName + ", adapterVersion: " + AdapterVersion + - ", sdkVersion: " + SdkVersion + "]"; + ", sdkVersion: " + SdkVersion + + ", initializationStatus: " + InitializationStatus + "]"; + } + + private static InitializationStatus InitializationStatusFromCode(int code) + { + if (Enum.IsDefined(typeof(InitializationStatus), code)) + { + return (InitializationStatus) code; + } + else + { + return InitializationStatus.NotInitialized; + } } } @@ -671,6 +761,22 @@ public abstract class MaxSdkBase return Json.Serialize(data); } + #region Obsolete + + [Obsolete("This API has been deprecated and will be removed in a future release. Please use AdViewPosition instead.")] + public enum BannerPosition + { + TopLeft, + TopCenter, + TopRight, + Centered, + CenterLeft, + CenterRight, + BottomLeft, + BottomCenter, + BottomRight + } + [Obsolete("This API has been deprecated and will be removed in a future release.")] public enum ConsentDialogState { @@ -678,6 +784,8 @@ public abstract class MaxSdkBase Applies, DoesNotApply } + + #endregion } /// @@ -685,46 +793,6 @@ public abstract class MaxSdkBase /// internal static class AdPositionExtenstion { - public static string ToSnakeCaseString(this MaxSdkBase.BannerPosition position) - { - if (position == MaxSdkBase.BannerPosition.TopLeft) - { - return "top_left"; - } - else if (position == MaxSdkBase.BannerPosition.TopCenter) - { - return "top_center"; - } - else if (position == MaxSdkBase.BannerPosition.TopRight) - { - return "top_right"; - } - else if (position == MaxSdkBase.BannerPosition.Centered) - { - return "centered"; - } - else if (position == MaxSdkBase.BannerPosition.CenterLeft) - { - return "center_left"; - } - else if (position == MaxSdkBase.BannerPosition.CenterRight) - { - return "center_right"; - } - else if (position == MaxSdkBase.BannerPosition.BottomLeft) - { - return "bottom_left"; - } - else if (position == MaxSdkBase.BannerPosition.BottomCenter) - { - return "bottom_center"; - } - else // position == MaxSdkBase.BannerPosition.BottomRight - { - return "bottom_right"; - } - } - public static string ToSnakeCaseString(this MaxSdkBase.AdViewPosition position) { if (position == MaxSdkBase.AdViewPosition.TopLeft) diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkBase.cs.meta b/Assets/MaxSdk/Scripts/MaxSdkBase.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkBase.cs.meta rename to Assets/MaxSdk/Scripts/MaxSdkBase.cs.meta diff --git a/Assets/MaxSdk/Scripts/MaxSdkCallbacks.cs b/Assets/MaxSdk/Scripts/MaxSdkCallbacks.cs new file mode 100644 index 0000000..f5834f0 --- /dev/null +++ b/Assets/MaxSdk/Scripts/MaxSdkCallbacks.cs @@ -0,0 +1,1139 @@ +// ReSharper disable RedundantArgumentDefaultValue + +using System; +using System.Collections.Generic; +using System.Text.RegularExpressions; +using UnityEngine; +using AppLovinMax.ThirdParty.MiniJson; +using AppLovinMax.Internal; + +/// +/// This is is a global Unity object that is used to forward callbacks from native iOS / Android Max code to the application. +/// +public static class MaxSdkCallbacks +{ + /// + /// Fired when the SDK has finished initializing + /// + private static Action onSdkInitializedEvent; + public static event Action OnSdkInitializedEvent + { + add + { + LogSubscribedToEvent("OnSdkInitializedEvent"); + onSdkInitializedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnSdkInitializedEvent"); + onSdkInitializedEvent -= value; + } + } + + /// + /// Fired when the application is paused or resumed. + /// + private static Action onApplicationStateChangedEvent; + public static event Action OnApplicationStateChangedEvent + { + add + { + LogSubscribedToEvent("OnApplicationStateChangedEvent"); + onApplicationStateChangedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnApplicationStateChangedEvent"); + onApplicationStateChangedEvent -= value; + } + } + + public static class Interstitial + { + internal static Action onAdLoadedEvent; + public static event Action OnAdLoadedEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdLoadedEvent"); + onAdLoadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdLoadedEvent"); + onAdLoadedEvent -= value; + } + } + + internal static Action onAdLoadFailedEvent; + public static event Action OnAdLoadFailedEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdLoadFailedEvent"); + onAdLoadFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdLoadFailedEvent"); + onAdLoadFailedEvent -= value; + } + } + + /// + /// Fired when an interstitial ad is displayed (may not be received by Unity until the interstitial ad closes). + /// + internal static Action onAdDisplayedEvent; + public static event Action OnAdDisplayedEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdDisplayedEvent"); + onAdDisplayedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdDisplayedEvent"); + onAdDisplayedEvent -= value; + } + } + + internal static Action onAdDisplayFailedEvent; + public static event Action OnAdDisplayFailedEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdDisplayFailedEvent"); + onAdDisplayFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdDisplayFailedEvent"); + onAdDisplayFailedEvent -= value; + } + } + + internal static Action onAdClickedEvent; + public static event Action OnAdClickedEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdClickedEvent"); + onAdClickedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdClickedEvent"); + onAdClickedEvent -= value; + } + } + + /// + /// Fired when an interstitial ad impression was validated and revenue will be paid. + /// Executed on a background thread to avoid any delays in execution. + /// + internal static Action onAdRevenuePaidEvent; + public static event Action OnAdRevenuePaidEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdRevenuePaidEvent"); + onAdRevenuePaidEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdRevenuePaidEvent"); + onAdRevenuePaidEvent -= value; + } + } + + /// + /// Fired when an expired interstitial ad is reloaded. + /// + internal static Action onExpiredAdReloadedEvent; + public static event Action OnExpiredAdReloadedEvent + { + add + { + LogSubscribedToEvent("OnExpiredInterstitialAdReloadedEvent"); + onExpiredAdReloadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnExpiredInterstitialAdReloadedEvent"); + onExpiredAdReloadedEvent -= value; + } + } + + /// + /// Fired when an Ad Review Creative ID has been generated. + /// The parameters returned are the adUnitIdentifier, adReviewCreativeId, and adInfo in that respective order. + /// Executed on a background thread to avoid any delays in execution. + /// + internal static Action onAdReviewCreativeIdGeneratedEvent; + public static event Action OnAdReviewCreativeIdGeneratedEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent -= value; + } + } + + internal static Action onAdHiddenEvent; + public static event Action OnAdHiddenEvent + { + add + { + LogSubscribedToEvent("OnInterstitialAdHiddenEvent"); + onAdHiddenEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnInterstitialAdHiddenEvent"); + onAdHiddenEvent -= value; + } + } + } + + public static class AppOpen + { + internal static Action onAdLoadedEvent; + public static event Action OnAdLoadedEvent + { + add + { + LogSubscribedToEvent("OnAppOpenAdLoadedEvent"); + onAdLoadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnAppOpenAdLoadedEvent"); + onAdLoadedEvent -= value; + } + } + + internal static Action onAdLoadFailedEvent; + public static event Action OnAdLoadFailedEvent + { + add + { + LogSubscribedToEvent("OnAppOpenAdLoadFailedEvent"); + onAdLoadFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnAppOpenAdLoadFailedEvent"); + onAdLoadFailedEvent -= value; + } + } + + /// + /// Fired when an app open ad is displayed (may not be received by Unity until the app open ad closes). + /// + internal static Action onAdDisplayedEvent; + public static event Action OnAdDisplayedEvent + { + add + { + LogSubscribedToEvent("OnAppOpenAdDisplayedEvent"); + onAdDisplayedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnAppOpenAdDisplayedEvent"); + onAdDisplayedEvent -= value; + } + } + + internal static Action onAdDisplayFailedEvent; + public static event Action OnAdDisplayFailedEvent + { + add + { + LogSubscribedToEvent("OnAppOpenAdDisplayFailedEvent"); + onAdDisplayFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnAppOpenAdDisplayFailedEvent"); + onAdDisplayFailedEvent -= value; + } + } + + internal static Action onAdClickedEvent; + public static event Action OnAdClickedEvent + { + add + { + LogSubscribedToEvent("OnAppOpenAdClickedEvent"); + onAdClickedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnAppOpenAdClickedEvent"); + onAdClickedEvent -= value; + } + } + + /// + /// Fired when an app open ad impression was validated and revenue will be paid. + /// Executed on a background thread to avoid any delays in execution. + /// + internal static Action onAdRevenuePaidEvent; + public static event Action OnAdRevenuePaidEvent + { + add + { + LogSubscribedToEvent("OnAppOpenAdRevenuePaidEvent"); + onAdRevenuePaidEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnAppOpenAdRevenuePaidEvent"); + onAdRevenuePaidEvent -= value; + } + } + + /// + /// Fired when an expired app open ad is reloaded. + /// + internal static Action onExpiredAdReloadedEvent; + public static event Action OnExpiredAdReloadedEvent + { + add + { + LogSubscribedToEvent("OnExpiredAppOpenAdReloadedEvent"); + onExpiredAdReloadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnExpiredAppOpenAdReloadedEvent"); + onExpiredAdReloadedEvent -= value; + } + } + + internal static Action onAdHiddenEvent; + public static event Action OnAdHiddenEvent + { + add + { + LogSubscribedToEvent("OnAppOpenAdHiddenEvent"); + onAdHiddenEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnAppOpenAdHiddenEvent"); + onAdHiddenEvent -= value; + } + } + } + public static class Rewarded + { + internal static Action onAdLoadedEvent; + public static event Action OnAdLoadedEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdLoadedEvent"); + onAdLoadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdLoadedEvent"); + onAdLoadedEvent -= value; + } + } + + internal static Action onAdLoadFailedEvent; + public static event Action OnAdLoadFailedEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdLoadFailedEvent"); + onAdLoadFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdLoadFailedEvent"); + onAdLoadFailedEvent -= value; + } + } + + /// + ///Fired when a rewarded ad is displayed (may not be received by Unity until the rewarded ad closes). + /// + internal static Action onAdDisplayedEvent; + public static event Action OnAdDisplayedEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdDisplayedEvent"); + onAdDisplayedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdDisplayedEvent"); + onAdDisplayedEvent -= value; + } + } + + internal static Action onAdDisplayFailedEvent; + public static event Action OnAdDisplayFailedEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdDisplayFailedEvent"); + onAdDisplayFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdDisplayFailedEvent"); + onAdDisplayFailedEvent -= value; + } + } + + internal static Action onAdClickedEvent; + public static event Action OnAdClickedEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdClickedEvent"); + onAdClickedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdClickedEvent"); + onAdClickedEvent -= value; + } + } + + /// + /// Fired when a rewarded ad impression was validated and revenue will be paid. + /// Executed on a background thread to avoid any delays in execution. + /// + internal static Action onAdRevenuePaidEvent; + public static event Action OnAdRevenuePaidEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdRevenuePaidEvent"); + onAdRevenuePaidEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdRevenuePaidEvent"); + onAdRevenuePaidEvent -= value; + } + } + + /// + /// Fired when an expired rewarded ad is reloaded. + /// + internal static Action onExpiredAdReloadedEvent; + public static event Action OnExpiredAdReloadedEvent + { + add + { + LogSubscribedToEvent("OnExpiredRewardedAdReloadedEvent"); + onExpiredAdReloadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnExpiredRewardedAdReloadedEvent"); + onExpiredAdReloadedEvent -= value; + } + } + + /// + /// Fired when an Ad Review Creative ID has been generated. + /// + internal static Action onAdReviewCreativeIdGeneratedEvent; + public static event Action OnAdReviewCreativeIdGeneratedEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent -= value; + } + } + + internal static Action onAdReceivedRewardEvent; + public static event Action OnAdReceivedRewardEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdReceivedRewardEvent"); + onAdReceivedRewardEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdReceivedRewardEvent"); + onAdReceivedRewardEvent -= value; + } + } + + internal static Action onAdHiddenEvent; + public static event Action OnAdHiddenEvent + { + add + { + LogSubscribedToEvent("OnRewardedAdHiddenEvent"); + onAdHiddenEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnRewardedAdHiddenEvent"); + onAdHiddenEvent -= value; + } + } + } + public static class Banner + { + internal static Action onAdLoadedEvent; + public static event Action OnAdLoadedEvent + { + add + { + LogSubscribedToEvent("OnBannerAdLoadedEvent"); + onAdLoadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnBannerAdLoadedEvent"); + onAdLoadedEvent -= value; + } + } + + internal static Action onAdLoadFailedEvent; + public static event Action OnAdLoadFailedEvent + { + add + { + LogSubscribedToEvent("OnBannerAdLoadFailedEvent"); + onAdLoadFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnBannerAdLoadFailedEvent"); + onAdLoadFailedEvent -= value; + } + } + + internal static Action onAdClickedEvent; + public static event Action OnAdClickedEvent + { + add + { + LogSubscribedToEvent("OnBannerAdClickedEvent"); + onAdClickedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnBannerAdClickedEvent"); + onAdClickedEvent -= value; + } + } + + internal static Action onAdRevenuePaidEvent; + public static event Action OnAdRevenuePaidEvent + { + add + { + LogSubscribedToEvent("OnBannerAdRevenuePaidEvent"); + onAdRevenuePaidEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnBannerAdRevenuePaidEvent"); + onAdRevenuePaidEvent -= value; + } + } + + internal static Action onAdReviewCreativeIdGeneratedEvent; + public static event Action OnAdReviewCreativeIdGeneratedEvent + { + add + { + LogSubscribedToEvent("OnBannerAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnBannerAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent -= value; + } + } + + internal static Action onAdExpandedEvent; + public static event Action OnAdExpandedEvent + { + add + { + LogSubscribedToEvent("OnBannerAdExpandedEvent"); + onAdExpandedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnBannerAdExpandedEvent"); + onAdExpandedEvent -= value; + } + } + + internal static Action onAdCollapsedEvent; + public static event Action OnAdCollapsedEvent + { + add + { + LogSubscribedToEvent("OnBannerAdCollapsedEvent"); + onAdCollapsedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnBannerAdCollapsedEvent"); + onAdCollapsedEvent -= value; + } + } + } + + public static class MRec + { + internal static Action onAdLoadedEvent; + public static event Action OnAdLoadedEvent + { + add + { + LogSubscribedToEvent("OnMRecAdLoadedEvent"); + onAdLoadedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnMRecAdLoadedEvent"); + onAdLoadedEvent -= value; + } + } + + internal static Action onAdLoadFailedEvent; + public static event Action OnAdLoadFailedEvent + { + add + { + LogSubscribedToEvent("OnMRecAdLoadFailedEvent"); + onAdLoadFailedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnMRecAdLoadFailedEvent"); + onAdLoadFailedEvent -= value; + } + } + + internal static Action onAdClickedEvent; + public static event Action OnAdClickedEvent + { + add + { + LogSubscribedToEvent("OnMRecAdClickedEvent"); + onAdClickedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnMRecAdClickedEvent"); + onAdClickedEvent -= value; + } + } + + internal static Action onAdRevenuePaidEvent; + public static event Action OnAdRevenuePaidEvent + { + add + { + LogSubscribedToEvent("OnMRecAdRevenuePaidEvent"); + onAdRevenuePaidEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnMRecAdRevenuePaidEvent"); + onAdRevenuePaidEvent -= value; + } + } + + /// + /// Fired when an Ad Review Creative ID has been generated. + /// + internal static Action onAdReviewCreativeIdGeneratedEvent; + public static event Action OnAdReviewCreativeIdGeneratedEvent + { + add + { + LogSubscribedToEvent("OnMRecAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnMRecAdReviewCreativeIdGeneratedEvent"); + onAdReviewCreativeIdGeneratedEvent -= value; + } + } + + internal static Action onAdExpandedEvent; + public static event Action OnAdExpandedEvent + { + add + { + LogSubscribedToEvent("OnMRecAdExpandedEvent"); + onAdExpandedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnMRecAdExpandedEvent"); + onAdExpandedEvent -= value; + } + } + + internal static Action onAdCollapsedEvent; + public static event Action OnAdCollapsedEvent + { + add + { + LogSubscribedToEvent("OnMRecAdCollapsedEvent"); + onAdCollapsedEvent += value; + } + remove + { + LogUnsubscribedToEvent("OnMRecAdCollapsedEvent"); + onAdCollapsedEvent -= value; + } + } + } + + public static void ForwardEvent(string eventPropsStr) + { + var eventProps = Json.Deserialize(eventPropsStr) as Dictionary; + if (eventProps == null) + { + MaxSdkLogger.E("Failed to forward event due to invalid event data"); + return; + } + + var keepInBackground = MaxSdkUtils.GetBoolFromDictionary(eventProps, "keepInBackground", false); + var eventName = MaxSdkUtils.GetStringFromDictionary(eventProps, "name", ""); + if (eventName == "OnInitialCallbackEvent") + { + MaxSdkLogger.D("Initial background callback."); + } + else if (eventName == "OnSdkInitializedEvent") + { + var sdkConfiguration = MaxSdkBase.SdkConfiguration.Create(eventProps); + InvokeEvent(onSdkInitializedEvent, sdkConfiguration, eventName, keepInBackground); + } + else if (eventName == "OnCmpCompletedEvent") + { + var errorProps = MaxSdkUtils.GetDictionaryFromDictionary(eventProps, "error"); + MaxCmpService.NotifyCompletedIfNeeded(errorProps); + } + else if (eventName == "OnApplicationStateChanged") + { + var isPaused = MaxSdkUtils.GetBoolFromDictionary(eventProps, "isPaused"); + InvokeEvent(onApplicationStateChangedEvent, isPaused, eventName, keepInBackground); + } + // Ad Events + else + { + var isExpiredAdReloadedEvent = Regex.IsMatch(eventName, @"^OnExpired\w+AdReloadedEvent$"); + var adInfoEventProps = isExpiredAdReloadedEvent ? MaxSdkUtils.GetDictionaryFromDictionary(eventProps, "newAdInfo") : eventProps; + var adInfo = new MaxSdkBase.AdInfo(adInfoEventProps); + var adUnitIdentifier = MaxSdkUtils.GetStringFromDictionary(adInfoEventProps, "adUnitId", ""); + + // Expired ad reloaded callbacks pass down multiple adInfo objects + if (isExpiredAdReloadedEvent) + { + var expiredAdInfo = new MaxSdkBase.AdInfo(MaxSdkUtils.GetDictionaryFromDictionary(eventProps, "expiredAdInfo")); + if (eventName == "OnExpiredInterstitialAdReloadedEvent") + { + InvokeEvent(Interstitial.onExpiredAdReloadedEvent, adUnitIdentifier, expiredAdInfo, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnExpiredAppOpenAdReloadedEvent") + { + InvokeEvent(AppOpen.onExpiredAdReloadedEvent, adUnitIdentifier, expiredAdInfo, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnExpiredRewardedAdReloadedEvent") + { + InvokeEvent(Rewarded.onExpiredAdReloadedEvent, adUnitIdentifier, expiredAdInfo, adInfo, eventName, keepInBackground); + } + else + { + MaxSdkLogger.UserWarning("Unknown MAX Ads event fired: " + eventName); + } + } + else if (eventName == "OnBannerAdLoadedEvent") + { + InvokeEvent(Banner.onAdLoadedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnBannerAdLoadFailedEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(Banner.onAdLoadFailedEvent, adUnitIdentifier, errorInfo, eventName, keepInBackground); + } + else if (eventName == "OnBannerAdClickedEvent") + { + InvokeEvent(Banner.onAdClickedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnBannerAdRevenuePaidEvent") + { + InvokeEvent(Banner.onAdRevenuePaidEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnBannerAdReviewCreativeIdGeneratedEvent") + { + var adReviewCreativeId = MaxSdkUtils.GetStringFromDictionary(eventProps, "adReviewCreativeId", ""); + InvokeEvent(Banner.onAdReviewCreativeIdGeneratedEvent, adUnitIdentifier, adReviewCreativeId, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnBannerAdExpandedEvent") + { + InvokeEvent(Banner.onAdExpandedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnBannerAdCollapsedEvent") + { + InvokeEvent(Banner.onAdCollapsedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnMRecAdLoadedEvent") + { + InvokeEvent(MRec.onAdLoadedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnMRecAdLoadFailedEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(MRec.onAdLoadFailedEvent, adUnitIdentifier, errorInfo, eventName, keepInBackground); + } + else if (eventName == "OnMRecAdClickedEvent") + { + InvokeEvent(MRec.onAdClickedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnMRecAdRevenuePaidEvent") + { + InvokeEvent(MRec.onAdRevenuePaidEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnMRecAdReviewCreativeIdGeneratedEvent") + { + var adReviewCreativeId = MaxSdkUtils.GetStringFromDictionary(eventProps, "adReviewCreativeId", ""); + InvokeEvent(MRec.onAdReviewCreativeIdGeneratedEvent, adUnitIdentifier, adReviewCreativeId, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnMRecAdExpandedEvent") + { + InvokeEvent(MRec.onAdExpandedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnMRecAdCollapsedEvent") + { + InvokeEvent(MRec.onAdCollapsedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialLoadedEvent") + { + InvokeEvent(Interstitial.onAdLoadedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialLoadFailedEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(Interstitial.onAdLoadFailedEvent, adUnitIdentifier, errorInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialHiddenEvent") + { + InvokeEvent(Interstitial.onAdHiddenEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialDisplayedEvent") + { + InvokeEvent(Interstitial.onAdDisplayedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialAdFailedToDisplayEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(Interstitial.onAdDisplayFailedEvent, adUnitIdentifier, errorInfo, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialClickedEvent") + { + InvokeEvent(Interstitial.onAdClickedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialAdRevenuePaidEvent") + { + InvokeEvent(Interstitial.onAdRevenuePaidEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnInterstitialAdReviewCreativeIdGeneratedEvent") + { + var adReviewCreativeId = MaxSdkUtils.GetStringFromDictionary(eventProps, "adReviewCreativeId", ""); + InvokeEvent(Interstitial.onAdReviewCreativeIdGeneratedEvent, adUnitIdentifier, adReviewCreativeId, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnAppOpenAdLoadedEvent") + { + InvokeEvent(AppOpen.onAdLoadedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnAppOpenAdLoadFailedEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(AppOpen.onAdLoadFailedEvent, adUnitIdentifier, errorInfo, eventName, keepInBackground); + } + else if (eventName == "OnAppOpenAdHiddenEvent") + { + InvokeEvent(AppOpen.onAdHiddenEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnAppOpenAdDisplayedEvent") + { + InvokeEvent(AppOpen.onAdDisplayedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnAppOpenAdFailedToDisplayEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(AppOpen.onAdDisplayFailedEvent, adUnitIdentifier, errorInfo, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnAppOpenAdClickedEvent") + { + InvokeEvent(AppOpen.onAdClickedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnAppOpenAdRevenuePaidEvent") + { + InvokeEvent(AppOpen.onAdRevenuePaidEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdLoadedEvent") + { + InvokeEvent(Rewarded.onAdLoadedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdLoadFailedEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(Rewarded.onAdLoadFailedEvent, adUnitIdentifier, errorInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdDisplayedEvent") + { + InvokeEvent(Rewarded.onAdDisplayedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdHiddenEvent") + { + InvokeEvent(Rewarded.onAdHiddenEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdClickedEvent") + { + InvokeEvent(Rewarded.onAdClickedEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdRevenuePaidEvent") + { + InvokeEvent(Rewarded.onAdRevenuePaidEvent, adUnitIdentifier, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdReviewCreativeIdGeneratedEvent") + { + var adReviewCreativeId = MaxSdkUtils.GetStringFromDictionary(eventProps, "adReviewCreativeId", ""); + InvokeEvent(Rewarded.onAdReviewCreativeIdGeneratedEvent, adUnitIdentifier, adReviewCreativeId, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdFailedToDisplayEvent") + { + var errorInfo = new MaxSdkBase.ErrorInfo(eventProps); + InvokeEvent(Rewarded.onAdDisplayFailedEvent, adUnitIdentifier, errorInfo, adInfo, eventName, keepInBackground); + } + else if (eventName == "OnRewardedAdReceivedRewardEvent") + { + var reward = new MaxSdkBase.Reward + { + Label = MaxSdkUtils.GetStringFromDictionary(eventProps, "rewardLabel", ""), + Amount = MaxSdkUtils.GetIntFromDictionary(eventProps, "rewardAmount", 0) + }; + + InvokeEvent(Rewarded.onAdReceivedRewardEvent, adUnitIdentifier, reward, adInfo, eventName, keepInBackground); + } + else + { + MaxSdkLogger.UserWarning("Unknown MAX Ads event fired: " + eventName); + } + } + } + +#if UNITY_EDITOR + public static void EmitSdkInitializedEvent() + { + if (onSdkInitializedEvent == null) return; + + onSdkInitializedEvent(MaxSdkBase.SdkConfiguration.CreateEmpty()); + } +#endif + + private static void InvokeEvent(Action evt, string eventName, bool keepInBackground) + { + if (!CanInvokeEvent(evt)) return; + + MaxSdkLogger.UserDebug("Invoking event: " + eventName); + if (ShouldInvokeInBackground(keepInBackground)) + { + try + { + evt(); + } + catch (Exception exception) + { + MaxSdkLogger.UserError("Caught exception in publisher event: " + eventName + ", exception: " + exception); + MaxSdkLogger.LogException(exception); + } + } + else + { + MaxEventExecutor.ExecuteOnMainThread(evt, eventName); + } + } + + private static void InvokeEvent(Action evt, T param, string eventName, bool keepInBackground) + { + if (!CanInvokeEvent(evt)) return; + + MaxSdkLogger.UserDebug("Invoking event: " + eventName + ". Param: " + param); + if (ShouldInvokeInBackground(keepInBackground)) + { + try + { + evt(param); + } + catch (Exception exception) + { + MaxSdkLogger.UserError("Caught exception in publisher event: " + eventName + ", exception: " + exception); + MaxSdkLogger.LogException(exception); + } + } + else + { + MaxEventExecutor.ExecuteOnMainThread(() => evt(param), eventName); + } + } + + private static void InvokeEvent(Action evt, T1 param1, T2 param2, string eventName, bool keepInBackground) + { + if (!CanInvokeEvent(evt)) return; + + MaxSdkLogger.UserDebug("Invoking event: " + eventName + ". Params: " + param1 + ", " + param2); + if (ShouldInvokeInBackground(keepInBackground)) + { + try + { + evt(param1, param2); + } + catch (Exception exception) + { + MaxSdkLogger.UserError("Caught exception in publisher event: " + eventName + ", exception: " + exception); + MaxSdkLogger.LogException(exception); + } + } + else + { + MaxEventExecutor.ExecuteOnMainThread(() => evt(param1, param2), eventName); + } + } + + private static void InvokeEvent(Action evt, T1 param1, T2 param2, T3 param3, string eventName, bool keepInBackground) + { + if (!CanInvokeEvent(evt)) return; + + MaxSdkLogger.UserDebug("Invoking event: " + eventName + ". Params: " + param1 + ", " + param2 + ", " + param3); + if (ShouldInvokeInBackground(keepInBackground)) + { + try + { + evt(param1, param2, param3); + } + catch (Exception exception) + { + MaxSdkLogger.UserError("Caught exception in publisher event: " + eventName + ", exception: " + exception); + MaxSdkLogger.LogException(exception); + } + } + else + { + MaxEventExecutor.ExecuteOnMainThread(() => evt(param1, param2, param3), eventName); + } + } + + private static bool CanInvokeEvent(Delegate evt) + { + if (evt == null) return false; + + // Check that publisher is not over-subscribing + if (evt.GetInvocationList().Length > 5) + { + MaxSdkLogger.UserWarning("Ads Event (" + evt + ") has over 5 subscribers. Please make sure you are properly un-subscribing to actions!!!"); + } + + return true; + } + + private static bool ShouldInvokeInBackground(bool keepInBackground) + { + return MaxSdkBase.InvokeEventsOnUnityMainThread == null ? keepInBackground : !MaxSdkBase.InvokeEventsOnUnityMainThread.Value; + } + + private static void LogSubscribedToEvent(string eventName) + { + MaxSdkLogger.D("Listener has been added to callback: " + eventName); + } + + private static void LogUnsubscribedToEvent(string eventName) + { + MaxSdkLogger.D("Listener has been removed from callback: " + eventName); + } + +#if UNITY_EDITOR + /// + /// Resets static event handlers so they still get reset even if Domain Reloading is disabled + /// + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)] + private static void ResetOnDomainReload() + { + onSdkInitializedEvent = null; + + Interstitial.onAdLoadedEvent = null; + Interstitial.onAdLoadFailedEvent = null; + Interstitial.onAdDisplayedEvent = null; + Interstitial.onAdDisplayFailedEvent = null; + Interstitial.onAdClickedEvent = null; + Interstitial.onAdRevenuePaidEvent = null; + Interstitial.onAdReviewCreativeIdGeneratedEvent = null; + Interstitial.onAdHiddenEvent = null; + + AppOpen.onAdLoadedEvent = null; + AppOpen.onAdLoadFailedEvent = null; + AppOpen.onAdDisplayedEvent = null; + AppOpen.onAdDisplayFailedEvent = null; + AppOpen.onAdClickedEvent = null; + AppOpen.onAdRevenuePaidEvent = null; + AppOpen.onAdHiddenEvent = null; + + Rewarded.onAdLoadedEvent = null; + Rewarded.onAdLoadFailedEvent = null; + Rewarded.onAdDisplayedEvent = null; + Rewarded.onAdDisplayFailedEvent = null; + Rewarded.onAdClickedEvent = null; + Rewarded.onAdRevenuePaidEvent = null; + Rewarded.onAdReviewCreativeIdGeneratedEvent = null; + Rewarded.onAdReceivedRewardEvent = null; + Rewarded.onAdHiddenEvent = null; + + Banner.onAdLoadedEvent = null; + Banner.onAdLoadFailedEvent = null; + Banner.onAdClickedEvent = null; + Banner.onAdRevenuePaidEvent = null; + Banner.onAdReviewCreativeIdGeneratedEvent = null; + Banner.onAdExpandedEvent = null; + Banner.onAdCollapsedEvent = null; + + MRec.onAdLoadedEvent = null; + MRec.onAdLoadFailedEvent = null; + MRec.onAdClickedEvent = null; + MRec.onAdRevenuePaidEvent = null; + MRec.onAdReviewCreativeIdGeneratedEvent = null; + MRec.onAdExpandedEvent = null; + MRec.onAdCollapsedEvent = null; + + } +#endif +} diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkCallbacks.cs.meta b/Assets/MaxSdk/Scripts/MaxSdkCallbacks.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkCallbacks.cs.meta rename to Assets/MaxSdk/Scripts/MaxSdkCallbacks.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkLogger.cs b/Assets/MaxSdk/Scripts/MaxSdkLogger.cs similarity index 92% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkLogger.cs rename to Assets/MaxSdk/Scripts/MaxSdkLogger.cs index 9acac25..056a650 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxSdkLogger.cs +++ b/Assets/MaxSdk/Scripts/MaxSdkLogger.cs @@ -23,7 +23,7 @@ public class MaxSdkLogger /// public static void D(string message) { - if (MaxSdk.DisableAllLogs && !MaxSdk.IsVerboseLoggingEnabled()) return; + if (MaxSdk.DisableAllLogs || !MaxSdk.IsVerboseLoggingEnabled()) return; Debug.Log("Debug [" + SdkTag + "] " + message); } @@ -45,7 +45,7 @@ public class MaxSdkLogger /// public static void W(string message) { - if (MaxSdk.DisableAllLogs && !MaxSdk.IsVerboseLoggingEnabled()) return; + if (MaxSdk.DisableAllLogs || !MaxSdk.IsVerboseLoggingEnabled()) return; Debug.LogWarning("Warning [" + SdkTag + "] " + message); } @@ -67,7 +67,7 @@ public class MaxSdkLogger /// public static void E(string message) { - if (MaxSdk.DisableAllLogs && !MaxSdk.IsVerboseLoggingEnabled()) return; + if (MaxSdk.DisableAllLogs || !MaxSdk.IsVerboseLoggingEnabled()) return; Debug.LogError("Error [" + SdkTag + "] " + message); } diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkLogger.cs.meta b/Assets/MaxSdk/Scripts/MaxSdkLogger.cs.meta similarity index 100% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkLogger.cs.meta rename to Assets/MaxSdk/Scripts/MaxSdkLogger.cs.meta diff --git a/Assets/Plugins/MaxSdk/Scripts/MaxSdkUnityEditor.cs b/Assets/MaxSdk/Scripts/MaxSdkUnityEditor.cs similarity index 85% rename from Assets/Plugins/MaxSdk/Scripts/MaxSdkUnityEditor.cs rename to Assets/MaxSdk/Scripts/MaxSdkUnityEditor.cs index b75c7dc..74a7155 100644 --- a/Assets/Plugins/MaxSdk/Scripts/MaxSdkUnityEditor.cs +++ b/Assets/MaxSdk/Scripts/MaxSdkUnityEditor.cs @@ -251,15 +251,17 @@ public class MaxSdkUnityEditor : MaxSdkBase /// Create a new banner. /// /// Ad unit identifier of the banner to create. Must not be null. - /// Banner position. Must not be null. - public static void CreateBanner(string adUnitIdentifier, BannerPosition bannerPosition) + /// The configuration for the banner + public static void CreateBanner(string adUnitIdentifier, AdViewConfiguration configuration) { ValidateAdUnitIdentifier(adUnitIdentifier, "create banner"); RequestAdUnit(adUnitIdentifier); + if (configuration.UseCoordinates) return; + if (_showStubAds && !StubBanners.ContainsKey(adUnitIdentifier)) { - CreateStubBanner(adUnitIdentifier, bannerPosition); + CreateStubBanner(adUnitIdentifier, configuration.Position); } ExecuteWithDelay(1f, () => @@ -270,28 +272,11 @@ public class MaxSdkUnityEditor : MaxSdkBase }); } - /// - /// Create a new banner with a custom position. - /// - /// Ad unit identifier of the banner to create. Must not be null. - /// The X coordinate (horizontal position) of the banner relative to the top left corner of the screen. - /// The Y coordinate (vertical position) of the banner relative to the top left corner of the screen. - /// - /// The banner is placed within the safe area of the screen. You can use this to get the absolute position of the banner on screen. - /// - public static void CreateBanner(string adUnitIdentifier, float x, float y) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "create banner"); - RequestAdUnit(adUnitIdentifier); - - // TODO: Add stub ads support - } - - private static void CreateStubBanner(string adUnitIdentifier, BannerPosition bannerPosition) + private static void CreateStubBanner(string adUnitIdentifier, AdViewPosition bannerPosition) { #if UNITY_EDITOR // Only support BottomCenter and TopCenter for now - var bannerPrefabName = bannerPosition == BannerPosition.BottomCenter ? "BannerBottom" : "BannerTop"; + var bannerPrefabName = bannerPosition == AdViewPosition.BottomCenter ? "BannerBottom" : "BannerTop"; var prefabPath = MaxSdkUtils.GetAssetPathForExportPath("MaxSdk/Prefabs/" + bannerPrefabName + ".prefab"); var bannerPrefab = AssetDatabase.LoadAssetAtPath(prefabPath); var stubBanner = Object.Instantiate(bannerPrefab, Vector3.zero, Quaternion.identity); @@ -357,7 +342,7 @@ public class MaxSdkUnityEditor : MaxSdkBase /// /// The ad unit identifier of the banner for which to update the position. Must not be null. /// A new position for the banner. Must not be null. - public static void UpdateBannerPosition(string adUnitIdentifier, BannerPosition bannerPosition) + public static void UpdateBannerPosition(string adUnitIdentifier, AdViewPosition bannerPosition) { MaxSdkLogger.D("[AppLovin MAX] Updating banner position to '" + bannerPosition + "' for ad unit id '" + adUnitIdentifier + "'"); } @@ -508,12 +493,14 @@ public class MaxSdkUnityEditor : MaxSdkBase /// Create a new MREC. /// /// Ad unit identifier of the MREC to create. Must not be null. - /// MREC position. Must not be null. - public static void CreateMRec(string adUnitIdentifier, AdViewPosition mrecPosition) + /// The configuration for the MREC. + public static void CreateMRec(string adUnitIdentifier, AdViewConfiguration configuration) { ValidateAdUnitIdentifier(adUnitIdentifier, "create MREC"); RequestAdUnit(adUnitIdentifier); + if (configuration.UseCoordinates) return; + ExecuteWithDelay(1f, () => { var placement = MaxSdkUtils.GetStringFromDictionary(MRecPlacements, adUnitIdentifier); @@ -522,21 +509,6 @@ public class MaxSdkUnityEditor : MaxSdkBase }); } - /// - /// Create a new MREC with a custom position. - /// - /// Ad unit identifier of the MREC to create. Must not be null. - /// The X coordinate (horizontal position) of the MREC relative to the top left corner of the screen. - /// The Y coordinate (vertical position) of the MREC relative to the top left corner of the screen. - /// - /// The MREC is placed within the safe area of the screen. You can use this to get the absolute position Rect of the MREC on screen. - /// - public static void CreateMRec(string adUnitIdentifier, float x, float y) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "create MREC"); - RequestAdUnit(adUnitIdentifier); - } - /// /// Load a new MREC ad. /// NOTE: The method loads the first MREC ad and initiates an automated MREC refresh process. @@ -1053,139 +1025,6 @@ public class MaxSdkUnityEditor : MaxSdkBase #endregion - #region Rewarded Interstitial - - /// - /// Start loading an rewarded interstitial ad. - /// - /// Ad unit identifier of the rewarded interstitial ad to load. Must not be null. - public static void LoadRewardedInterstitialAd(string adUnitIdentifier) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "load rewarded interstitial ad"); - RequestAdUnit(adUnitIdentifier); - - ExecuteWithDelay(1f, () => - { - AddReadyAdUnit(adUnitIdentifier); - var eventProps = Json.Serialize(CreateBaseEventPropsDictionary("OnRewardedInterstitialAdLoadedEvent", adUnitIdentifier)); - MaxSdkCallbacks.ForwardEvent(eventProps); - }); - } - - /// - /// Check if rewarded interstitial ad ad is loaded and ready to be displayed. - /// - /// Ad unit identifier of the rewarded ad to load. Must not be null. - /// True if the ad is ready to be displayed - public static bool IsRewardedInterstitialAdReady(string adUnitIdentifier) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "check rewarded interstitial ad loaded"); - - if (!IsAdUnitRequested(adUnitIdentifier)) - { - MaxSdkLogger.UserWarning("Rewarded interstitial ad '" + adUnitIdentifier + - "' was not requested, can not check if it is loaded"); - return false; - } - - return IsAdUnitReady(adUnitIdentifier); - } - - /// - /// Present loaded rewarded interstitial ad for a given placement to tie ad events to. Note: if the rewarded interstitial ad is not ready to be displayed nothing will happen. - /// - /// Ad unit identifier of the rewarded interstitial to show. Must not be null. - /// The placement to tie the showing ad's events to - /// The custom data to tie the showing ad's events to. Maximum size is 8KB. - public static void ShowRewardedInterstitialAd(string adUnitIdentifier, string placement = null, string customData = null) - { - ValidateAdUnitIdentifier(adUnitIdentifier, "show rewarded interstitial ad"); - - if (!IsAdUnitRequested(adUnitIdentifier)) - { - MaxSdkLogger.UserWarning("Rewarded interstitial ad '" + adUnitIdentifier + - "' was not requested, can not show it"); - return; - } - - if (!IsRewardedInterstitialAdReady(adUnitIdentifier)) - { - MaxSdkLogger.UserWarning("Rewarded interstitial ad '" + adUnitIdentifier + "' is not ready, please check IsRewardedInterstitialAdReady() before showing."); - return; - } - - RemoveReadyAdUnit(adUnitIdentifier); - - if (_showStubAds) - { - ShowStubRewardedInterstitialAd(adUnitIdentifier, placement); - } - } - - private static void ShowStubRewardedInterstitialAd(string adUnitIdentifier, string placement) - { -#if UNITY_EDITOR - var prefabPath = MaxSdkUtils.GetAssetPathForExportPath("MaxSdk/Prefabs/Rewarded.prefab"); - var rewardedPrefab = AssetDatabase.LoadAssetAtPath(prefabPath); - var stubRewardedAd = Object.Instantiate(rewardedPrefab, Vector3.zero, Quaternion.identity); - var grantedReward = false; - var rewardedTitle = GameObject.Find("MaxRewardTitle").GetComponent(); - var rewardStatus = GameObject.Find("MaxRewardStatus").GetComponent(); - var closeButton = GameObject.Find("MaxRewardedCloseButton").GetComponent