diff --git a/Assets/ChillConnect/Define/Model/Config/Game/PassingTaskModel.cs b/Assets/ChillConnect/Define/Model/Config/Game/PassingTaskModel.cs index 95bb7a6..0e7d6ca 100644 --- a/Assets/ChillConnect/Define/Model/Config/Game/PassingTaskModel.cs +++ b/Assets/ChillConnect/Define/Model/Config/Game/PassingTaskModel.cs @@ -17,7 +17,7 @@ namespace ChillConnect public int tol_num; public int reward_num; public bool is_get; - public int[] Boost; + public int[] Boost; public int[] weight; } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/AddCell_12/com_addView.cs b/Assets/ChillConnect/FGUI/package/AddCell_12/com_addView.cs index 80d9c8d..1dd3787 100644 --- a/Assets/ChillConnect/FGUI/package/AddCell_12/com_addView.cs +++ b/Assets/ChillConnect/FGUI/package/AddCell_12/com_addView.cs @@ -27,13 +27,13 @@ namespace FGUI.AddCell_12 base.ConstructFromXML(xml); pay_type = GetControllerAt(0); - title = (GTextField)GetChildAt(6); - btn_close = (GButton)GetChildAt(8); - btn_watch = (GButton)GetChildAt(9); - tips = (GTextField)GetChildAt(10); - ads = (GTextField)GetChildAt(11); - btn_max_pay = (GButton)GetChildAt(12); - broad = (GComponent)GetChildAt(15); + title = (GTextField)GetChildAt(7); + btn_close = (GButton)GetChildAt(9); + btn_watch = (GButton)GetChildAt(10); + tips = (GTextField)GetChildAt(11); + ads = (GTextField)GetChildAt(12); + btn_max_pay = (GButton)GetChildAt(13); + broad = (GComponent)GetChildAt(16); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Common_01/Common_01Binder.cs b/Assets/ChillConnect/FGUI/package/Common_01/Common_01Binder.cs index eb557ae..a7fb80a 100644 --- a/Assets/ChillConnect/FGUI/package/Common_01/Common_01Binder.cs +++ b/Assets/ChillConnect/FGUI/package/Common_01/Common_01Binder.cs @@ -13,7 +13,6 @@ namespace FGUI.Common_01 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)); diff --git a/Assets/ChillConnect/FGUI/package/Common_01/btn_head.cs b/Assets/ChillConnect/FGUI/package/Common_01/btn_head.cs index 6671884..f372d21 100644 --- a/Assets/ChillConnect/FGUI/package/Common_01/btn_head.cs +++ b/Assets/ChillConnect/FGUI/package/Common_01/btn_head.cs @@ -19,7 +19,7 @@ namespace FGUI.Common_01 { base.ConstructFromXML(xml); - load_avatar = (GLoader)GetChildAt(1); + load_avatar = (GLoader)GetChildAt(0); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Common_01/com_adcoming.cs b/Assets/ChillConnect/FGUI/package/Common_01/com_adcoming.cs index 865645a..563d38c 100644 --- a/Assets/ChillConnect/FGUI/package/Common_01/com_adcoming.cs +++ b/Assets/ChillConnect/FGUI/package/Common_01/com_adcoming.cs @@ -9,7 +9,7 @@ namespace FGUI.Common_01 { public GTextField money_text; public GTextField time_text; - public btn_get btn_removead; + public GButton btn_removead; public Transition t0; public const string URL = "ui://o9974uc5jobfas"; @@ -24,7 +24,7 @@ namespace FGUI.Common_01 money_text = (GTextField)GetChildAt(2); time_text = (GTextField)GetChildAt(3); - btn_removead = (btn_get)GetChildAt(4); + btn_removead = (GButton)GetChildAt(4); t0 = GetTransitionAt(0); } } diff --git a/Assets/ChillConnect/FGUI/package/GameResult_08/com_end.cs b/Assets/ChillConnect/FGUI/package/GameResult_08/com_end.cs index 14c46f2..c1b3c74 100644 --- a/Assets/ChillConnect/FGUI/package/GameResult_08/com_end.cs +++ b/Assets/ChillConnect/FGUI/package/GameResult_08/com_end.cs @@ -23,6 +23,8 @@ namespace FGUI.GameResult_08 public GGroup top_group; public GButton btn_mult; public GButton btn_claim; + public GRichTextField text_award_2; + public GRichTextField text_award_3; public Transition t0; public Transition t2; public const string URL = "ui://8sjqw0q3sebxk"; @@ -38,9 +40,9 @@ namespace FGUI.GameResult_08 win_lose = GetControllerAt(0); switchgift = GetControllerAt(1); - bg_parent = (GGraph)GetChildAt(1); - fail_light = (GImage)GetChildAt(3); - btn_restart = (GButton)GetChildAt(4); + bg_parent = (GGraph)GetChildAt(0); + fail_light = (GImage)GetChildAt(4); + btn_restart = (GButton)GetChildAt(5); bg_parent_title = (GGraph)GetChildAt(6); lab_lose_des = (GTextField)GetChildAt(8); com_ch = (com_success_cash)GetChildAt(12); @@ -52,6 +54,8 @@ namespace FGUI.GameResult_08 top_group = (GGroup)GetChildAt(21); btn_mult = (GButton)GetChildAt(22); btn_claim = (GButton)GetChildAt(23); + text_award_2 = (GRichTextField)GetChildAt(24); + text_award_3 = (GRichTextField)GetChildAt(25); t0 = GetTransitionAt(0); t2 = GetTransitionAt(1); } diff --git a/Assets/ChillConnect/FGUI/package/Game_04/Game_04Binder.cs b/Assets/ChillConnect/FGUI/package/Game_04/Game_04Binder.cs index 0df2af3..bcd158a 100644 --- a/Assets/ChillConnect/FGUI/package/Game_04/Game_04Binder.cs +++ b/Assets/ChillConnect/FGUI/package/Game_04/Game_04Binder.cs @@ -9,6 +9,7 @@ namespace FGUI.Game_04 public static void BindAll() { UIObjectFactory.SetPackageItemExtension(com_game_menu.URL, typeof(com_game_menu)); + UIObjectFactory.SetPackageItemExtension(btn_continue.URL, typeof(btn_continue)); UIObjectFactory.SetPackageItemExtension(com_rewardbox.URL, typeof(com_rewardbox)); UIObjectFactory.SetPackageItemExtension(btn_look_ad.URL, typeof(btn_look_ad)); UIObjectFactory.SetPackageItemExtension(btn_prop.URL, typeof(btn_prop)); diff --git a/Assets/ChillConnect/FGUI/package/Game_04/btn_continue.cs b/Assets/ChillConnect/FGUI/package/Game_04/btn_continue.cs new file mode 100644 index 0000000..deb5fbb --- /dev/null +++ b/Assets/ChillConnect/FGUI/package/Game_04/btn_continue.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.Game_04 +{ + public partial class btn_continue : GButton + { + public GTextField text_set; + public const string URL = "ui://g3iqdlgca7mc44"; + + public static btn_continue CreateInstance() + { + return (btn_continue)UIPackage.CreateObject("Game_04", "btn_continue"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_set = (GTextField)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Setting_07/btn_head.cs.meta b/Assets/ChillConnect/FGUI/package/Game_04/btn_continue.cs.meta similarity index 83% rename from Assets/ChillConnect/FGUI/package/Setting_07/btn_head.cs.meta rename to Assets/ChillConnect/FGUI/package/Game_04/btn_continue.cs.meta index de43368..eb0c19e 100644 --- a/Assets/ChillConnect/FGUI/package/Setting_07/btn_head.cs.meta +++ b/Assets/ChillConnect/FGUI/package/Game_04/btn_continue.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e6bb14b518e9df45a2d98fbea802e59 +guid: 52e278f28d5652b4cbaf3ab10a4d47d9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ChillConnect/FGUI/package/Game_04/com_game.cs b/Assets/ChillConnect/FGUI/package/Game_04/com_game.cs index c7c755e..2e280d7 100644 --- a/Assets/ChillConnect/FGUI/package/Game_04/com_game.cs +++ b/Assets/ChillConnect/FGUI/package/Game_04/com_game.cs @@ -24,7 +24,6 @@ namespace FGUI.Game_04 public GButton btn_three_day; public GButton btn_failpack; public GButton btn_gold; - public GGroup top_group; public const string URL = "ui://g3iqdlgcopwgw"; public static com_game CreateInstance() @@ -36,24 +35,23 @@ namespace FGUI.Game_04 { base.ConstructFromXML(xml); - slot = (GComponent)GetChildAt(1); - out_parent = (GGraph)GetChildAt(2); - btn_add = (btn_add)GetChildAt(3); - btn_back = (btn_prop)GetChildAt(4); - btn_remove = (btn_prop)GetChildAt(5); - btn_refresh = (btn_prop)GetChildAt(6); - btn_look_ad = (GButton)GetChildAt(7); - btn_saveingpot = (GButton)GetChildAt(8); - btn_close = (GButton)GetChildAt(11); - text_level = (GTextField)GetChildAt(12); - btn_money = (GComponent)GetChildAt(13); - btn_rank = (GButton)GetChildAt(14); - btn_task_pass = (GButton)GetChildAt(16); - btn_noads = (GButton)GetChildAt(17); - btn_three_day = (GButton)GetChildAt(19); - btn_failpack = (GButton)GetChildAt(20); - btn_gold = (GButton)GetChildAt(22); - top_group = (GGroup)GetChildAt(23); + slot = (GComponent)GetChildAt(0); + out_parent = (GGraph)GetChildAt(1); + btn_add = (btn_add)GetChildAt(2); + btn_back = (btn_prop)GetChildAt(3); + btn_remove = (btn_prop)GetChildAt(4); + btn_refresh = (btn_prop)GetChildAt(5); + btn_look_ad = (GButton)GetChildAt(6); + btn_saveingpot = (GButton)GetChildAt(7); + btn_close = (GButton)GetChildAt(9); + text_level = (GTextField)GetChildAt(10); + btn_money = (GComponent)GetChildAt(11); + btn_rank = (GButton)GetChildAt(12); + btn_task_pass = (GButton)GetChildAt(13); + btn_noads = (GButton)GetChildAt(14); + btn_three_day = (GButton)GetChildAt(16); + btn_failpack = (GButton)GetChildAt(17); + btn_gold = (GButton)GetChildAt(19); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Game_04/com_game_menu.cs b/Assets/ChillConnect/FGUI/package/Game_04/com_game_menu.cs index c1c49a2..c843cd6 100644 --- a/Assets/ChillConnect/FGUI/package/Game_04/com_game_menu.cs +++ b/Assets/ChillConnect/FGUI/package/Game_04/com_game_menu.cs @@ -8,9 +8,9 @@ namespace FGUI.Game_04 public partial class com_game_menu : GComponent { public GTextField title; - public GButton btn_resume; public GButton btn_close; public btn_exit btn_exit; + public btn_continue btn_resume; public const string URL = "ui://g3iqdlgc9wz116"; public static com_game_menu CreateInstance() @@ -22,10 +22,10 @@ namespace FGUI.Game_04 { base.ConstructFromXML(xml); - title = (GTextField)GetChildAt(1); - btn_resume = (GButton)GetChildAt(2); + title = (GTextField)GetChildAt(2); btn_close = (GButton)GetChildAt(3); btn_exit = (btn_exit)GetChildAt(4); + btn_resume = (btn_continue)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Lobby_03/Lobby_03Binder.cs b/Assets/ChillConnect/FGUI/package/Lobby_03/Lobby_03Binder.cs index 872d857..76ef0f0 100644 --- a/Assets/ChillConnect/FGUI/package/Lobby_03/Lobby_03Binder.cs +++ b/Assets/ChillConnect/FGUI/package/Lobby_03/Lobby_03Binder.cs @@ -9,9 +9,9 @@ namespace FGUI.Lobby_03 public static void BindAll() { UIObjectFactory.SetPackageItemExtension(btn_level_play.URL, typeof(btn_level_play)); - UIObjectFactory.SetPackageItemExtension(btn_hall_head.URL, typeof(btn_hall_head)); UIObjectFactory.SetPackageItemExtension(hall_head.URL, typeof(hall_head)); UIObjectFactory.SetPackageItemExtension(com_level_reward.URL, typeof(com_level_reward)); + UIObjectFactory.SetPackageItemExtension(com_level.URL, typeof(com_level)); UIObjectFactory.SetPackageItemExtension(com_hall.URL, typeof(com_hall)); UIObjectFactory.SetPackageItemExtension(com_payloading.URL, typeof(com_payloading)); UIObjectFactory.SetPackageItemExtension(com_faq.URL, typeof(com_faq)); diff --git a/Assets/ChillConnect/FGUI/package/Lobby_03/btn_hall_head.cs b/Assets/ChillConnect/FGUI/package/Lobby_03/btn_hall_head.cs deleted file mode 100644 index b126949..0000000 --- a/Assets/ChillConnect/FGUI/package/Lobby_03/btn_hall_head.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.Lobby_03 -{ - public partial class btn_hall_head : GButton - { - public GButton btn_head; - public GGroup anim; - public Transition t0; - public const string URL = "ui://gytj501ce5ji1x"; - - public static btn_hall_head CreateInstance() - { - return (btn_hall_head)UIPackage.CreateObject("Lobby_03", "btn_hall_head"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - btn_head = (GButton)GetChildAt(0); - anim = (GGroup)GetChildAt(2); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Lobby_03/btn_level_play.cs b/Assets/ChillConnect/FGUI/package/Lobby_03/btn_level_play.cs index a61ac7b..c773aca 100644 --- a/Assets/ChillConnect/FGUI/package/Lobby_03/btn_level_play.cs +++ b/Assets/ChillConnect/FGUI/package/Lobby_03/btn_level_play.cs @@ -9,7 +9,6 @@ namespace FGUI.Lobby_03 { public Controller state; public GTextField text_level; - public btn_hall_head btn_hall_head; public const string URL = "ui://gytj501ccou62y"; public static btn_level_play CreateInstance() @@ -22,8 +21,7 @@ namespace FGUI.Lobby_03 base.ConstructFromXML(xml); state = GetControllerAt(0); - text_level = (GTextField)GetChildAt(3); - btn_hall_head = (btn_hall_head)GetChildAt(4); + text_level = (GTextField)GetChildAt(2); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs b/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs index c5a9426..c208ffb 100644 --- a/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs +++ b/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs @@ -9,17 +9,6 @@ namespace FGUI.Lobby_03 { public Controller state; public GTextField text_name; - public btn_level_play btn_play10; - public btn_level_play btn_play9; - public btn_level_play btn_play8; - public btn_level_play btn_play7; - public btn_level_play btn_play6; - public btn_level_play btn_play5; - public btn_level_play btn_play4; - public btn_level_play btn_play3; - public btn_level_play btn_play2; - public btn_level_play btn_play1; - public GGroup play_node; public GButton bnt_luck_gift; public GButton btn_battle; public GButton btn_noads; @@ -39,8 +28,8 @@ namespace FGUI.Lobby_03 public GComponent btn_money; public GButton btn_head; public GImage head_red; - public GGroup top_group; public GButton btn_start; + public com_level com_level; public const string URL = "ui://gytj501copwg9"; public static com_hall CreateInstance() @@ -54,38 +43,27 @@ namespace FGUI.Lobby_03 state = GetControllerAt(0); text_name = (GTextField)GetChildAt(2); - btn_play10 = (btn_level_play)GetChildAt(3); - btn_play9 = (btn_level_play)GetChildAt(4); - btn_play8 = (btn_level_play)GetChildAt(5); - btn_play7 = (btn_level_play)GetChildAt(6); - btn_play6 = (btn_level_play)GetChildAt(7); - btn_play5 = (btn_level_play)GetChildAt(8); - btn_play4 = (btn_level_play)GetChildAt(9); - btn_play3 = (btn_level_play)GetChildAt(10); - btn_play2 = (btn_level_play)GetChildAt(11); - btn_play1 = (btn_level_play)GetChildAt(12); - play_node = (GGroup)GetChildAt(13); - bnt_luck_gift = (GButton)GetChildAt(14); - btn_battle = (GButton)GetChildAt(16); - btn_noads = (GButton)GetChildAt(17); - btn_task = (GButton)GetChildAt(18); - left_group = (GGroup)GetChildAt(19); - btn_failpack = (GButton)GetChildAt(21); - btn_faq = (GButton)GetChildAt(22); - btn_saveingpot = (GButton)GetChildAt(23); - btn_three_day = (GButton)GetChildAt(24); - btn_shop = (btn_shop)GetChildAt(28); - btn_rank = (GButton)GetChildAt(29); - btn_sign = (btn_sign)GetChildAt(30); - btn_spin = (btn_wheel)GetChildAt(31); - btn_restore = (GButton)GetChildAt(32); - right_group = (GGroup)GetChildAt(33); - btn_gold = (GButton)GetChildAt(35); - btn_money = (GComponent)GetChildAt(36); - btn_head = (GButton)GetChildAt(37); - head_red = (GImage)GetChildAt(39); - top_group = (GGroup)GetChildAt(40); - btn_start = (GButton)GetChildAt(42); + bnt_luck_gift = (GButton)GetChildAt(3); + btn_battle = (GButton)GetChildAt(5); + btn_noads = (GButton)GetChildAt(6); + btn_task = (GButton)GetChildAt(7); + left_group = (GGroup)GetChildAt(8); + btn_failpack = (GButton)GetChildAt(10); + btn_faq = (GButton)GetChildAt(11); + btn_saveingpot = (GButton)GetChildAt(12); + btn_three_day = (GButton)GetChildAt(13); + btn_shop = (btn_shop)GetChildAt(17); + btn_rank = (GButton)GetChildAt(18); + btn_sign = (btn_sign)GetChildAt(19); + btn_spin = (btn_wheel)GetChildAt(20); + btn_restore = (GButton)GetChildAt(22); + right_group = (GGroup)GetChildAt(23); + btn_gold = (GButton)GetChildAt(24); + btn_money = (GComponent)GetChildAt(25); + btn_head = (GButton)GetChildAt(26); + head_red = (GImage)GetChildAt(27); + btn_start = (GButton)GetChildAt(29); + com_level = (com_level)GetChildAt(30); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Lobby_03/com_level.cs b/Assets/ChillConnect/FGUI/package/Lobby_03/com_level.cs new file mode 100644 index 0000000..66ef538 --- /dev/null +++ b/Assets/ChillConnect/FGUI/package/Lobby_03/com_level.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.Lobby_03 +{ + public partial class com_level : GComponent + { + public Controller state; + public btn_level_play btn_play5; + public btn_level_play btn_play4; + public btn_level_play btn_play3; + public btn_level_play btn_play2; + public btn_level_play btn_play1; + public const string URL = "ui://gytj501cnjnv3r"; + + public static com_level CreateInstance() + { + return (com_level)UIPackage.CreateObject("Lobby_03", "com_level"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + btn_play5 = (btn_level_play)GetChildAt(0); + btn_play4 = (btn_level_play)GetChildAt(1); + btn_play3 = (btn_level_play)GetChildAt(2); + btn_play2 = (btn_level_play)GetChildAt(3); + btn_play1 = (btn_level_play)GetChildAt(4); + } + } +} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Lobby_03/btn_hall_head.cs.meta b/Assets/ChillConnect/FGUI/package/Lobby_03/com_level.cs.meta similarity index 83% rename from Assets/ChillConnect/FGUI/package/Lobby_03/btn_hall_head.cs.meta rename to Assets/ChillConnect/FGUI/package/Lobby_03/com_level.cs.meta index 60f407d..99b46b3 100644 --- a/Assets/ChillConnect/FGUI/package/Lobby_03/btn_hall_head.cs.meta +++ b/Assets/ChillConnect/FGUI/package/Lobby_03/com_level.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 221833ce5a1f8423b902a20b7fc1d4d1 +guid: 754e13db13206674a93ea5ff260a8c9c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ChillConnect/FGUI/package/P14_PassView/P14_PassViewBinder.cs b/Assets/ChillConnect/FGUI/package/P14_PassView/P14_PassViewBinder.cs index 1fddf05..816527c 100644 --- a/Assets/ChillConnect/FGUI/package/P14_PassView/P14_PassViewBinder.cs +++ b/Assets/ChillConnect/FGUI/package/P14_PassView/P14_PassViewBinder.cs @@ -9,7 +9,6 @@ namespace FGUI.P14_PassView public static void BindAll() { UIObjectFactory.SetPackageItemExtension(com_pass_view.URL, typeof(com_pass_view)); - UIObjectFactory.SetPackageItemExtension(com_pass_view_old.URL, typeof(com_pass_view_old)); UIObjectFactory.SetPackageItemExtension(progress_pass.URL, typeof(progress_pass)); UIObjectFactory.SetPackageItemExtension(com_pass_item.URL, typeof(com_pass_item)); UIObjectFactory.SetPackageItemExtension(com_item_award.URL, typeof(com_item_award)); diff --git a/Assets/ChillConnect/FGUI/package/P14_PassView/com_item_award.cs b/Assets/ChillConnect/FGUI/package/P14_PassView/com_item_award.cs index d6581cc..54478ca 100644 --- a/Assets/ChillConnect/FGUI/package/P14_PassView/com_item_award.cs +++ b/Assets/ChillConnect/FGUI/package/P14_PassView/com_item_award.cs @@ -26,10 +26,10 @@ namespace FGUI.P14_PassView type = GetControllerAt(0); state = GetControllerAt(1); - item_loader = (GLoader)GetChildAt(3); - number_text = (GTextField)GetChildAt(4); - ani_node = (GGraph)GetChildAt(7); - btn_claim = (GButton)GetChildAt(10); + item_loader = (GLoader)GetChildAt(4); + number_text = (GTextField)GetChildAt(5); + ani_node = (GGraph)GetChildAt(6); + btn_claim = (GButton)GetChildAt(9); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_item.cs b/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_item.cs index 66bfe52..9d4835d 100644 --- a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_item.cs +++ b/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_item.cs @@ -8,13 +8,11 @@ namespace FGUI.P14_PassView public partial class com_pass_item : GComponent { public Controller state; - public Controller is_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 GImage yuan; public GTextField index_text; public com_item_award free_item; public com_item_award pay_item; @@ -30,16 +28,14 @@ namespace FGUI.P14_PassView base.ConstructFromXML(xml); state = GetControllerAt(0); - is_full = GetControllerAt(1); - progress_0_top = (GImage)GetChildAt(6); - progress_0_down = (GImage)GetChildAt(7); - progress_1_top = (GImage)GetChildAt(8); - progress_1_down = (GImage)GetChildAt(9); - progress_2_top = (GImage)GetChildAt(10); - yuan = (GImage)GetChildAt(11); - index_text = (GTextField)GetChildAt(12); - free_item = (com_item_award)GetChildAt(13); - pay_item = (com_item_award)GetChildAt(14); + progress_0_top = (GImage)GetChildAt(5); + progress_0_down = (GImage)GetChildAt(6); + progress_1_top = (GImage)GetChildAt(7); + progress_1_down = (GImage)GetChildAt(8); + progress_2_top = (GImage)GetChildAt(9); + index_text = (GTextField)GetChildAt(11); + free_item = (com_item_award)GetChildAt(12); + pay_item = (com_item_award)GetChildAt(13); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view.cs b/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view.cs index fde32a6..35a0b74 100644 --- a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view.cs +++ b/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view.cs @@ -32,7 +32,7 @@ namespace FGUI.P14_PassView { base.ConstructFromXML(xml); - bg = (GImage)GetChildAt(0); + bg = (GImage)GetChildAt(1); gold = (GButton)GetChildAt(3); close = (GButton)GetChildAt(4); group_top = (GGroup)GetChildAt(5); diff --git a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view_old.cs b/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view_old.cs deleted file mode 100644 index 852ff51..0000000 --- a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view_old.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.P14_PassView -{ - public partial class com_pass_view_old : GComponent - { - public GImage bg; - public GButton gold; - public GButton close; - public GGroup group_top; - public GList pass_list; - public GGraph ani_node; - public GButton btn_recive; - public progress_pass progress_pass; - public GTextField remain_time; - public GTextField text_level; - public const string URL = "ui://wyu9msxws27h0"; - - public static com_pass_view_old CreateInstance() - { - return (com_pass_view_old)UIPackage.CreateObject("P14_PassView", "com_pass_view_old"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - bg = (GImage)GetChildAt(0); - gold = (GButton)GetChildAt(3); - close = (GButton)GetChildAt(4); - group_top = (GGroup)GetChildAt(5); - pass_list = (GList)GetChildAt(6); - ani_node = (GGraph)GetChildAt(7); - btn_recive = (GButton)GetChildAt(8); - progress_pass = (progress_pass)GetChildAt(9); - remain_time = (GTextField)GetChildAt(12); - text_level = (GTextField)GetChildAt(14); - } - } -} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view_old.cs.meta b/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view_old.cs.meta deleted file mode 100644 index 9212c7e..0000000 --- a/Assets/ChillConnect/FGUI/package/P14_PassView/com_pass_view_old.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b03c7e41457ed4c998534e4f6f37d0ba -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ChillConnect/FGUI/package/P14_PassView/com_passunlock.cs b/Assets/ChillConnect/FGUI/package/P14_PassView/com_passunlock.cs index 07a87ca..4c7b63e 100644 --- a/Assets/ChillConnect/FGUI/package/P14_PassView/com_passunlock.cs +++ b/Assets/ChillConnect/FGUI/package/P14_PassView/com_passunlock.cs @@ -27,11 +27,11 @@ namespace FGUI.P14_PassView pay_type = GetControllerAt(0); btn_close = (GButton)GetChildAt(1); - text_allgold = (GTextField)GetChildAt(4); - btn_buypass = (GButton)GetChildAt(5); - tips = (GTextField)GetChildAt(6); - ads = (GTextField)GetChildAt(7); - btn_max_pay = (GButton)GetChildAt(8); + text_allgold = (GTextField)GetChildAt(5); + btn_buypass = (GButton)GetChildAt(6); + tips = (GTextField)GetChildAt(7); + ads = (GTextField)GetChildAt(8); + btn_max_pay = (GButton)GetChildAt(9); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs b/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs index 89f3240..22eb404 100644 --- a/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs +++ b/Assets/ChillConnect/FGUI/package/Pack_16/pack_panel.cs @@ -37,23 +37,23 @@ namespace FGUI.Pack_16 base.ConstructFromXML(xml); pay_type = GetControllerAt(0); - text_goldnum = (GTextField)GetChildAt(10); - text_refreshnum = (GTextField)GetChildAt(11); - text_outnum = (GTextField)GetChildAt(12); - text_backnum1 = (GTextField)GetChildAt(13); - title2 = (GTextField)GetChildAt(17); - tips1 = (GTextField)GetChildAt(18); - ads = (GTextField)GetChildAt(19); - btn_buypack = (GButton)GetChildAt(20); - btn_buyremovead = (GButton)GetChildAt(21); - btn_close0 = (GButton)GetChildAt(23); - btn_close1 = (GButton)GetChildAt(24); - tips2 = (GTextField)GetChildAt(26); - ads1 = (GTextField)GetChildAt(27); - text_goldnum2 = (GTextField)GetChildAt(28); - btn_max_pack = (GButton)GetChildAt(29); - btn_max_remove = (GButton)GetChildAt(30); - text_removetime = (GTextField)GetChildAt(31); + text_goldnum = (GTextField)GetChildAt(9); + text_refreshnum = (GTextField)GetChildAt(10); + text_outnum = (GTextField)GetChildAt(11); + text_backnum1 = (GTextField)GetChildAt(12); + title2 = (GTextField)GetChildAt(16); + tips1 = (GTextField)GetChildAt(17); + ads = (GTextField)GetChildAt(18); + btn_buypack = (GButton)GetChildAt(19); + btn_buyremovead = (GButton)GetChildAt(20); + btn_close0 = (GButton)GetChildAt(22); + btn_close1 = (GButton)GetChildAt(23); + tips2 = (GTextField)GetChildAt(25); + ads1 = (GTextField)GetChildAt(26); + text_goldnum2 = (GTextField)GetChildAt(27); + btn_max_pack = (GButton)GetChildAt(28); + btn_max_remove = (GButton)GetChildAt(29); + text_removetime = (GTextField)GetChildAt(30); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Privacy_24/com_privacy.cs b/Assets/ChillConnect/FGUI/package/Privacy_24/com_privacy.cs index 98a3898..3cc5e34 100644 --- a/Assets/ChillConnect/FGUI/package/Privacy_24/com_privacy.cs +++ b/Assets/ChillConnect/FGUI/package/Privacy_24/com_privacy.cs @@ -24,10 +24,10 @@ namespace FGUI.Privacy_24 base.ConstructFromXML(xml); show = GetControllerAt(0); - btn_close = (GButton)GetChildAt(1); - text_list = (GList)GetChildAt(2); - text_tips = (GTextField)GetChildAt(3); - title = (GTextField)GetChildAt(4); + btn_close = (GButton)GetChildAt(2); + text_list = (GList)GetChildAt(3); + text_tips = (GTextField)GetChildAt(4); + title = (GTextField)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Prop_09/com_choose.cs b/Assets/ChillConnect/FGUI/package/Prop_09/com_choose.cs index 9852e01..dc7aa9f 100644 --- a/Assets/ChillConnect/FGUI/package/Prop_09/com_choose.cs +++ b/Assets/ChillConnect/FGUI/package/Prop_09/com_choose.cs @@ -24,10 +24,10 @@ namespace FGUI.Prop_09 base.ConstructFromXML(xml); state = GetControllerAt(0); - btn_close = (GButton)GetChildAt(2); - btn_gold_buy = (GButton)GetChildAt(3); - btn_ad = (GButton)GetChildAt(4); - btn_thanks = (GButton)GetChildAt(9); + btn_close = (GButton)GetChildAt(3); + btn_gold_buy = (GButton)GetChildAt(4); + btn_ad = (GButton)GetChildAt(5); + btn_thanks = (GButton)GetChildAt(10); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Prop_09/com_prop.cs b/Assets/ChillConnect/FGUI/package/Prop_09/com_prop.cs index 06667b3..81cea6d 100644 --- a/Assets/ChillConnect/FGUI/package/Prop_09/com_prop.cs +++ b/Assets/ChillConnect/FGUI/package/Prop_09/com_prop.cs @@ -8,12 +8,12 @@ namespace FGUI.Prop_09 public partial class com_prop : GComponent { public Controller prop; - public GButton btn_buy; - public GButton btn_back; public btn_add btn_add; public btn_add btn_jian; public GTextField text_add; public GGroup group_add; + public GButton btn_buy; + public GButton btn_back; public const string URL = "ui://ig55ss7kq8ucg"; public static com_prop CreateInstance() @@ -26,12 +26,12 @@ namespace FGUI.Prop_09 base.ConstructFromXML(xml); prop = GetControllerAt(0); - btn_buy = (GButton)GetChildAt(7); - btn_back = (GButton)GetChildAt(8); - btn_add = (btn_add)GetChildAt(10); - btn_jian = (btn_add)GetChildAt(11); - text_add = (GTextField)GetChildAt(12); - group_add = (GGroup)GetChildAt(13); + btn_add = (btn_add)GetChildAt(1); + btn_jian = (btn_add)GetChildAt(2); + text_add = (GTextField)GetChildAt(3); + group_add = (GGroup)GetChildAt(4); + btn_buy = (GButton)GetChildAt(13); + btn_back = (GButton)GetChildAt(14); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Setting_07/Setting_07Binder.cs b/Assets/ChillConnect/FGUI/package/Setting_07/Setting_07Binder.cs index 5c95520..5bc76e7 100644 --- a/Assets/ChillConnect/FGUI/package/Setting_07/Setting_07Binder.cs +++ b/Assets/ChillConnect/FGUI/package/Setting_07/Setting_07Binder.cs @@ -8,8 +8,6 @@ namespace FGUI.Setting_07 { public static void BindAll() { - UIObjectFactory.SetPackageItemExtension(music_slider_grip.URL, typeof(music_slider_grip)); - UIObjectFactory.SetPackageItemExtension(btn_head.URL, typeof(btn_head)); UIObjectFactory.SetPackageItemExtension(com_setting.URL, typeof(com_setting)); UIObjectFactory.SetPackageItemExtension(btn_menu.URL, typeof(btn_menu)); UIObjectFactory.SetPackageItemExtension(com_person.URL, typeof(com_person)); diff --git a/Assets/ChillConnect/FGUI/package/Setting_07/btn_head.cs b/Assets/ChillConnect/FGUI/package/Setting_07/btn_head.cs deleted file mode 100644 index a3b7dcc..0000000 --- a/Assets/ChillConnect/FGUI/package/Setting_07/btn_head.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.Setting_07 -{ - public partial class btn_head : GButton - { - public GButton head; - public const string URL = "ui://8rcjs2ucob5c2m"; - - public static btn_head CreateInstance() - { - return (btn_head)UIPackage.CreateObject("Setting_07", "btn_head"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - head = (GButton)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Setting_07/com_person.cs b/Assets/ChillConnect/FGUI/package/Setting_07/com_person.cs index 45b3d4e..b46add8 100644 --- a/Assets/ChillConnect/FGUI/package/Setting_07/com_person.cs +++ b/Assets/ChillConnect/FGUI/package/Setting_07/com_person.cs @@ -7,7 +7,6 @@ namespace FGUI.Setting_07 { public partial class com_person : GComponent { - public GTextField title; public com_edit_name edit_name; public GList list; public GButton btn_close; @@ -21,7 +20,6 @@ namespace FGUI.Setting_07 public btn_on_off btn_sound; public btn_menu btn_us; public btn_menu btn_restore; - public GGroup panel; public Transition show; public Transition hide; public const string URL = "ui://8rcjs2ucsebxf"; @@ -35,21 +33,19 @@ namespace FGUI.Setting_07 { base.ConstructFromXML(xml); - title = (GTextField)GetChildAt(2); edit_name = (com_edit_name)GetChildAt(3); list = (GList)GetChildAt(4); btn_close = (GButton)GetChildAt(5); text_uid = (GTextField)GetChildAt(6); text_version = (GTextField)GetChildAt(7); head = (GButton)GetChildAt(12); - btn_official = (btn_menu)GetChildAt(14); - btn_privacy = (btn_menu)GetChildAt(15); - btn_terms = (btn_menu)GetChildAt(16); - btn_music = (btn_on_off)GetChildAt(17); - btn_sound = (btn_on_off)GetChildAt(18); - btn_us = (btn_menu)GetChildAt(19); - btn_restore = (btn_menu)GetChildAt(20); - panel = (GGroup)GetChildAt(21); + btn_official = (btn_menu)GetChildAt(13); + btn_privacy = (btn_menu)GetChildAt(14); + btn_terms = (btn_menu)GetChildAt(15); + btn_music = (btn_on_off)GetChildAt(16); + btn_sound = (btn_on_off)GetChildAt(17); + btn_us = (btn_menu)GetChildAt(18); + btn_restore = (btn_menu)GetChildAt(19); show = GetTransitionAt(0); hide = GetTransitionAt(1); } diff --git a/Assets/ChillConnect/FGUI/package/Setting_07/com_setting.cs b/Assets/ChillConnect/FGUI/package/Setting_07/com_setting.cs index 732377c..7313dd3 100644 --- a/Assets/ChillConnect/FGUI/package/Setting_07/com_setting.cs +++ b/Assets/ChillConnect/FGUI/package/Setting_07/com_setting.cs @@ -7,20 +7,9 @@ namespace FGUI.Setting_07 { public partial class com_setting : GComponent { - public GButton btn_back; - public btn_menu btn_official; - public GTextField text_uid; - public GTextField text_version; - public GTextField title; - public btn_head btn_head; - public com_edit_name edit_name; - public GSlider music_slider; - public GSlider sound_slider; - public btn_menu btn_privacy; - public btn_menu btn_terms; - public btn_menu btn_exit; - public btn_menu btn_email; - public btn_menu btn_restore; + public GButton btn_close; + public GList list; + public GButton btn_select; public const string URL = "ui://8rcjs2ucsebx10"; public static com_setting CreateInstance() @@ -32,20 +21,9 @@ namespace FGUI.Setting_07 { base.ConstructFromXML(xml); - btn_back = (GButton)GetChildAt(2); - btn_official = (btn_menu)GetChildAt(3); - text_uid = (GTextField)GetChildAt(4); - text_version = (GTextField)GetChildAt(5); - title = (GTextField)GetChildAt(6); - btn_head = (btn_head)GetChildAt(7); - edit_name = (com_edit_name)GetChildAt(8); - music_slider = (GSlider)GetChildAt(9); - sound_slider = (GSlider)GetChildAt(10); - btn_privacy = (btn_menu)GetChildAt(13); - btn_terms = (btn_menu)GetChildAt(14); - btn_exit = (btn_menu)GetChildAt(15); - btn_email = (btn_menu)GetChildAt(16); - btn_restore = (btn_menu)GetChildAt(17); + btn_close = (GButton)GetChildAt(4); + list = (GList)GetChildAt(5); + btn_select = (GButton)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Setting_07/music_slider_grip.cs b/Assets/ChillConnect/FGUI/package/Setting_07/music_slider_grip.cs deleted file mode 100644 index 065ec15..0000000 --- a/Assets/ChillConnect/FGUI/package/Setting_07/music_slider_grip.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.Setting_07 -{ - public partial class music_slider_grip : GButton - { - public Controller state; - public const string URL = "ui://8rcjs2ucob5c2g"; - - public static music_slider_grip CreateInstance() - { - return (music_slider_grip)UIPackage.CreateObject("Setting_07", "music_slider_grip"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Signin_19/btn_sign.cs b/Assets/ChillConnect/FGUI/package/Signin_19/btn_sign.cs index 927d4c0..3cde572 100644 --- a/Assets/ChillConnect/FGUI/package/Signin_19/btn_sign.cs +++ b/Assets/ChillConnect/FGUI/package/Signin_19/btn_sign.cs @@ -10,11 +10,11 @@ namespace FGUI.Signin_19 public Controller status; public Controller day; public GTextField reward_num; - public GImage gou; public GGraph anim_sign; public GLoader loader_icon0; public GTextField text_prop; public GTextField reward_num1; + public GImage gou; public const string URL = "ui://a98xmhwkebok1z"; public static btn_sign CreateInstance() @@ -28,12 +28,12 @@ namespace FGUI.Signin_19 status = GetControllerAt(0); day = GetControllerAt(1); - reward_num = (GTextField)GetChildAt(4); - gou = (GImage)GetChildAt(7); + reward_num = (GTextField)GetChildAt(5); anim_sign = (GGraph)GetChildAt(8); loader_icon0 = (GLoader)GetChildAt(9); text_prop = (GTextField)GetChildAt(10); reward_num1 = (GTextField)GetChildAt(11); + gou = (GImage)GetChildAt(12); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Turntable_11/Turntable_11Binder.cs b/Assets/ChillConnect/FGUI/package/Turntable_11/Turntable_11Binder.cs index 9081430..def9590 100644 --- a/Assets/ChillConnect/FGUI/package/Turntable_11/Turntable_11Binder.cs +++ b/Assets/ChillConnect/FGUI/package/Turntable_11/Turntable_11Binder.cs @@ -10,6 +10,7 @@ namespace FGUI.Turntable_11 { UIObjectFactory.SetPackageItemExtension(btn_go1.URL, typeof(btn_go1)); UIObjectFactory.SetPackageItemExtension(com_wheel.URL, typeof(com_wheel)); + UIObjectFactory.SetPackageItemExtension(btn_go.URL, typeof(btn_go)); UIObjectFactory.SetPackageItemExtension(com_coin.URL, typeof(com_coin)); UIObjectFactory.SetPackageItemExtension(com_disc.URL, typeof(com_disc)); } diff --git a/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go.cs b/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go.cs new file mode 100644 index 0000000..367c424 --- /dev/null +++ b/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go.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.Turntable_11 +{ + public partial class btn_go : GButton + { + public GTextField text_spintimes; + public const string URL = "ui://8k6ttzvxsebxb"; + + public static btn_go CreateInstance() + { + return (btn_go)UIPackage.CreateObject("Turntable_11", "btn_go"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_spintimes = (GTextField)GetChildAt(1); + } + } +} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Setting_07/music_slider_grip.cs.meta b/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go.cs.meta similarity index 83% rename from Assets/ChillConnect/FGUI/package/Setting_07/music_slider_grip.cs.meta rename to Assets/ChillConnect/FGUI/package/Turntable_11/btn_go.cs.meta index a8c5a42..0163401 100644 --- a/Assets/ChillConnect/FGUI/package/Setting_07/music_slider_grip.cs.meta +++ b/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e582b4fb4b303bb4489d01b7604e56df +guid: ab208e0ed4591c840a0860906aa126e0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go1.cs b/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go1.cs index 28e7c68..804f73f 100644 --- a/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go1.cs +++ b/Assets/ChillConnect/FGUI/package/Turntable_11/btn_go1.cs @@ -10,7 +10,6 @@ namespace FGUI.Turntable_11 public Controller cont_spin; public Controller cont_state; public GTextField text_time; - public GImage img_saveingpot; public const string URL = "ui://8k6ttzvxn6lkt"; public static btn_go1 CreateInstance() @@ -25,7 +24,6 @@ namespace FGUI.Turntable_11 cont_spin = GetControllerAt(0); cont_state = GetControllerAt(1); text_time = (GTextField)GetChildAt(3); - img_saveingpot = (GImage)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Turntable_11/com_coin.cs b/Assets/ChillConnect/FGUI/package/Turntable_11/com_coin.cs index 5993b2c..5d6ce50 100644 --- a/Assets/ChillConnect/FGUI/package/Turntable_11/com_coin.cs +++ b/Assets/ChillConnect/FGUI/package/Turntable_11/com_coin.cs @@ -9,11 +9,7 @@ namespace FGUI.Turntable_11 { public Controller more_coin; public Controller status; - public GImage light1; - public GGraph light_anim; public GTextField text_num; - public GLoader item_icon; - public GImage light; public const string URL = "ui://8k6ttzvxsebxc"; public static com_coin CreateInstance() @@ -27,11 +23,7 @@ namespace FGUI.Turntable_11 more_coin = GetControllerAt(0); status = GetControllerAt(1); - light1 = (GImage)GetChildAt(3); - light_anim = (GGraph)GetChildAt(4); - text_num = (GTextField)GetChildAt(5); - item_icon = (GLoader)GetChildAt(8); - light = (GImage)GetChildAt(9); + text_num = (GTextField)GetChildAt(0); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Turntable_11/com_disc.cs b/Assets/ChillConnect/FGUI/package/Turntable_11/com_disc.cs index 1d783ff..96d02b7 100644 --- a/Assets/ChillConnect/FGUI/package/Turntable_11/com_disc.cs +++ b/Assets/ChillConnect/FGUI/package/Turntable_11/com_disc.cs @@ -15,10 +15,6 @@ namespace FGUI.Turntable_11 public com_coin award6; public com_coin award7; public com_coin award8; - public com_coin award9; - public com_coin award10; - public com_coin award11; - public com_coin award12; public const string URL = "ui://8k6ttzvxsebxf"; public static com_disc CreateInstance() @@ -30,18 +26,14 @@ namespace FGUI.Turntable_11 { base.ConstructFromXML(xml); - award1 = (com_coin)GetChildAt(0); - award2 = (com_coin)GetChildAt(1); - award3 = (com_coin)GetChildAt(2); - award4 = (com_coin)GetChildAt(3); - award5 = (com_coin)GetChildAt(4); - award6 = (com_coin)GetChildAt(5); - award7 = (com_coin)GetChildAt(6); - award8 = (com_coin)GetChildAt(7); - award9 = (com_coin)GetChildAt(8); - award10 = (com_coin)GetChildAt(9); - award11 = (com_coin)GetChildAt(10); - award12 = (com_coin)GetChildAt(11); + award1 = (com_coin)GetChildAt(1); + award2 = (com_coin)GetChildAt(2); + award3 = (com_coin)GetChildAt(3); + award4 = (com_coin)GetChildAt(4); + award5 = (com_coin)GetChildAt(5); + award6 = (com_coin)GetChildAt(6); + award7 = (com_coin)GetChildAt(7); + award8 = (com_coin)GetChildAt(8); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Turntable_11/com_wheel.cs b/Assets/ChillConnect/FGUI/package/Turntable_11/com_wheel.cs index f738038..34013c5 100644 --- a/Assets/ChillConnect/FGUI/package/Turntable_11/com_wheel.cs +++ b/Assets/ChillConnect/FGUI/package/Turntable_11/com_wheel.cs @@ -7,12 +7,13 @@ namespace FGUI.Turntable_11 { public partial class com_wheel : GComponent { - public com_disc disc; - public GGraph light_parent; - public btn_go1 btn_spin; - public GTextField text_spin; public GGraph point; - public GButton btn_close; + public com_disc disc; + public btn_go spin; + public GGraph light_parent; + public GButton close; + public btn_go1 btn_spin; + public GTextField text_spintimes; public const string URL = "ui://8k6ttzvxsebxa"; public static com_wheel CreateInstance() @@ -24,12 +25,13 @@ namespace FGUI.Turntable_11 { base.ConstructFromXML(xml); - disc = (com_disc)GetChildAt(1); - light_parent = (GGraph)GetChildAt(2); - btn_spin = (btn_go1)GetChildAt(3); - text_spin = (GTextField)GetChildAt(4); - point = (GGraph)GetChildAt(5); - btn_close = (GButton)GetChildAt(6); + point = (GGraph)GetChildAt(1); + disc = (com_disc)GetChildAt(2); + spin = (btn_go)GetChildAt(3); + light_parent = (GGraph)GetChildAt(4); + close = (GButton)GetChildAt(5); + btn_spin = (btn_go1)GetChildAt(6); + text_spintimes = (GTextField)GetChildAt(7); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/store_17/buygold_item.cs b/Assets/ChillConnect/FGUI/package/store_17/buygold_item.cs index d4f969c..089e7e9 100644 --- a/Assets/ChillConnect/FGUI/package/store_17/buygold_item.cs +++ b/Assets/ChillConnect/FGUI/package/store_17/buygold_item.cs @@ -8,12 +8,12 @@ namespace FGUI.store_17 public partial class buygold_item : GComponent { public Controller index; + public GTextField text_ads; public GTextField coin_text; + public btn_buy btn_buy; public GTextField off_text; public GTextField content_text; public GGroup discount; - public btn_buy btn_buy; - public GTextField text_ads; public const string URL = "ui://5crzgdh6d3a91"; public static buygold_item CreateInstance() @@ -26,12 +26,12 @@ namespace FGUI.store_17 base.ConstructFromXML(xml); index = GetControllerAt(0); - coin_text = (GTextField)GetChildAt(3); - off_text = (GTextField)GetChildAt(5); - content_text = (GTextField)GetChildAt(6); - discount = (GGroup)GetChildAt(7); - btn_buy = (btn_buy)GetChildAt(8); - text_ads = (GTextField)GetChildAt(9); + text_ads = (GTextField)GetChildAt(1); + coin_text = (GTextField)GetChildAt(4); + btn_buy = (btn_buy)GetChildAt(5); + off_text = (GTextField)GetChildAt(7); + content_text = (GTextField)GetChildAt(8); + discount = (GGroup)GetChildAt(9); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs b/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs index 0ff1103..6176c58 100644 --- a/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs +++ b/Assets/ChillConnect/FGUI/package/store_17/com_buygold.cs @@ -8,11 +8,11 @@ namespace FGUI.store_17 public partial class com_buygold : GComponent { public Controller state; - public shop_panel_partent shop_panel_parent; public GTextField ads; public btn_watchAd2 btn_watch; public GButton top_gold; public GButton btn_close; + public GList gold_list; public const string URL = "ui://5crzgdh6d3a92"; public static com_buygold CreateInstance() @@ -25,11 +25,11 @@ namespace FGUI.store_17 base.ConstructFromXML(xml); state = GetControllerAt(0); - shop_panel_parent = (shop_panel_partent)GetChildAt(3); - ads = (GTextField)GetChildAt(4); - btn_watch = (btn_watchAd2)GetChildAt(5); - top_gold = (GButton)GetChildAt(6); - btn_close = (GButton)GetChildAt(7); + ads = (GTextField)GetChildAt(8); + btn_watch = (btn_watchAd2)GetChildAt(9); + top_gold = (GButton)GetChildAt(10); + btn_close = (GButton)GetChildAt(11); + gold_list = (GList)GetChildAt(12); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/store_17/shop_panel.cs b/Assets/ChillConnect/FGUI/package/store_17/shop_panel.cs deleted file mode 100644 index b54623b..0000000 --- a/Assets/ChillConnect/FGUI/package/store_17/shop_panel.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.store_17 -{ - public partial class shop_panel : GComponent - { - public Controller pay_type; - public GList gold_list; - public GGroup group_all; - public const string URL = "ui://5crzgdh6ty4r2p"; - - public static shop_panel CreateInstance() - { - return (shop_panel)UIPackage.CreateObject("store_17", "shop_panel"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - pay_type = GetControllerAt(0); - gold_list = (GList)GetChildAt(0); - group_all = (GGroup)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/store_17/shop_panel.cs.meta b/Assets/ChillConnect/FGUI/package/store_17/shop_panel.cs.meta deleted file mode 100644 index c01efce..0000000 --- a/Assets/ChillConnect/FGUI/package/store_17/shop_panel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6f7e294a767f51b4bbeb9f2903219ea2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ChillConnect/FGUI/package/store_17/shop_panel_partent.cs b/Assets/ChillConnect/FGUI/package/store_17/shop_panel_partent.cs deleted file mode 100644 index bcd1749..0000000 --- a/Assets/ChillConnect/FGUI/package/store_17/shop_panel_partent.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.store_17 -{ - public partial class shop_panel_partent : GComponent - { - public shop_panel shopPanel; - public const string URL = "ui://5crzgdh6ty4r3e"; - - public static shop_panel_partent CreateInstance() - { - return (shop_panel_partent)UIPackage.CreateObject("store_17", "shop_panel_partent"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - shopPanel = (shop_panel)GetChildAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/store_17/shop_panel_partent.cs.meta b/Assets/ChillConnect/FGUI/package/store_17/shop_panel_partent.cs.meta deleted file mode 100644 index 69daa9c..0000000 --- a/Assets/ChillConnect/FGUI/package/store_17/shop_panel_partent.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 213bcecc33c56e94f838b3c8a3cda273 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ChillConnect/FGUI/package/store_17/store_17Binder.cs b/Assets/ChillConnect/FGUI/package/store_17/store_17Binder.cs index 6c2cf4c..7eb177f 100644 --- a/Assets/ChillConnect/FGUI/package/store_17/store_17Binder.cs +++ b/Assets/ChillConnect/FGUI/package/store_17/store_17Binder.cs @@ -14,8 +14,6 @@ namespace FGUI.store_17 UIObjectFactory.SetPackageItemExtension(btn_watchAd1.URL, typeof(btn_watchAd1)); UIObjectFactory.SetPackageItemExtension(btn_get.URL, typeof(btn_get)); UIObjectFactory.SetPackageItemExtension(btn_watchAd2.URL, typeof(btn_watchAd2)); - UIObjectFactory.SetPackageItemExtension(shop_panel.URL, typeof(shop_panel)); - UIObjectFactory.SetPackageItemExtension(shop_panel_partent.URL, typeof(shop_panel_partent)); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Common_01/btn_get.cs b/Assets/ChillConnect/FGUI/package/tixian/btn_get.cs similarity index 77% rename from Assets/ChillConnect/FGUI/package/Common_01/btn_get.cs rename to Assets/ChillConnect/FGUI/package/tixian/btn_get.cs index ce4bde5..24072dd 100644 --- a/Assets/ChillConnect/FGUI/package/Common_01/btn_get.cs +++ b/Assets/ChillConnect/FGUI/package/tixian/btn_get.cs @@ -3,17 +3,17 @@ using FairyGUI; using FairyGUI.Utils; -namespace FGUI.Common_01 +namespace FGUI.tixian { public partial class btn_get : GButton { public Controller state; public GImage img_saveingpot; - public const string URL = "ui://o9974uc5cphly"; + public const string URL = "ui://md8tkwlzcphly"; public static btn_get CreateInstance() { - return (btn_get)UIPackage.CreateObject("Common_01", "btn_get"); + return (btn_get)UIPackage.CreateObject("tixian", "btn_get"); } public override void ConstructFromXML(XML xml) diff --git a/Assets/ChillConnect/FGUI/package/Common_01/btn_get.cs.meta b/Assets/ChillConnect/FGUI/package/tixian/btn_get.cs.meta similarity index 83% rename from Assets/ChillConnect/FGUI/package/Common_01/btn_get.cs.meta rename to Assets/ChillConnect/FGUI/package/tixian/btn_get.cs.meta index 46a5fe6..198ae90 100644 --- a/Assets/ChillConnect/FGUI/package/Common_01/btn_get.cs.meta +++ b/Assets/ChillConnect/FGUI/package/tixian/btn_get.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d9b23d5755a67043a78e4d82087987b +guid: 58c65548754968a4984d1cd880649055 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ChillConnect/FGUI/package/tixian/com_confirm.cs b/Assets/ChillConnect/FGUI/package/tixian/com_confirm.cs index 81d1c70..05bf6b6 100644 --- a/Assets/ChillConnect/FGUI/package/tixian/com_confirm.cs +++ b/Assets/ChillConnect/FGUI/package/tixian/com_confirm.cs @@ -36,11 +36,11 @@ namespace FGUI.tixian public GTextField text_number2; public btn_pay btn_watch; public GButton btn_close; - public GButton btn_tab; - public GButton btn_earn; - public GButton btn_chout; - public GButton btn_confirm; - public GButton btn_check_level; + 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 GButton btn_task_watch; public GTextField text_cashneedlv; @@ -58,7 +58,7 @@ namespace FGUI.tixian public btn_code btn_contact_us; public GButton btn_back; public GTextField lab_ads; - public GButton btn_inline_ok; + public btn_get btn_inline_ok; public GRichTextField text_condi1; public GRichTextField text_ch_number; public Transition t0; @@ -102,11 +102,11 @@ namespace FGUI.tixian text_number2 = (GTextField)GetChildAt(41); btn_watch = (btn_pay)GetChildAt(42); btn_close = (GButton)GetChildAt(43); - btn_tab = (GButton)GetChildAt(44); - btn_earn = (GButton)GetChildAt(45); - btn_chout = (GButton)GetChildAt(46); - btn_confirm = (GButton)GetChildAt(47); - btn_check_level = (GButton)GetChildAt(48); + btn_tab = (btn_get)GetChildAt(44); + btn_earn = (btn_get)GetChildAt(45); + btn_chout = (btn_get)GetChildAt(46); + btn_confirm = (btn_get)GetChildAt(47); + btn_check_level = (btn_get)GetChildAt(48); text_nowch = (GTextField)GetChildAt(51); btn_task_watch = (GButton)GetChildAt(52); text_cashneedlv = (GTextField)GetChildAt(53); @@ -124,7 +124,7 @@ namespace FGUI.tixian btn_contact_us = (btn_code)GetChildAt(87); btn_back = (GButton)GetChildAt(91); lab_ads = (GTextField)GetChildAt(94); - btn_inline_ok = (GButton)GetChildAt(95); + btn_inline_ok = (btn_get)GetChildAt(95); text_condi1 = (GRichTextField)GetChildAt(96); text_ch_number = (GRichTextField)GetChildAt(97); t0 = GetTransitionAt(0); diff --git a/Assets/ChillConnect/FGUI/package/tixian/com_saveingpot.cs b/Assets/ChillConnect/FGUI/package/tixian/com_saveingpot.cs index 6ab66d3..1c03063 100644 --- a/Assets/ChillConnect/FGUI/package/tixian/com_saveingpot.cs +++ b/Assets/ChillConnect/FGUI/package/tixian/com_saveingpot.cs @@ -48,7 +48,7 @@ namespace FGUI.tixian public btn_code btn_contact_us; public GButton btn_back; public GButton btn_task_watch; - public GButton btn_inline_ok; + public btn_get btn_inline_ok; public com_broadcast broad; public GButton btn_close; public const string URL = "ui://md8tkwlzupx71p"; @@ -103,7 +103,7 @@ namespace FGUI.tixian btn_contact_us = (btn_code)GetChildAt(66); btn_back = (GButton)GetChildAt(70); btn_task_watch = (GButton)GetChildAt(75); - btn_inline_ok = (GButton)GetChildAt(76); + btn_inline_ok = (btn_get)GetChildAt(76); broad = (com_broadcast)GetChildAt(77); btn_close = (GButton)GetChildAt(78); } diff --git a/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs b/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs index 132749d..69f6f19 100644 --- a/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs +++ b/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs @@ -9,6 +9,7 @@ namespace FGUI.tixian 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)); diff --git a/Assets/ChillConnect/Helper/GameHelper.cs b/Assets/ChillConnect/Helper/GameHelper.cs index f7bd134..0d58ba5 100644 --- a/Assets/ChillConnect/Helper/GameHelper.cs +++ b/Assets/ChillConnect/Helper/GameHelper.cs @@ -430,7 +430,7 @@ namespace ChillConnect //is debug test-------- - return true;//zhushi + // return true;//zhushi return false;//zhushi return GetLoginModel().IsMagic; } diff --git a/Assets/ChillConnect/Plugins/FairyGUI/Scripts/UI/UIConfig.cs b/Assets/ChillConnect/Plugins/FairyGUI/Scripts/UI/UIConfig.cs index 90b8670..439b6de 100644 --- a/Assets/ChillConnect/Plugins/FairyGUI/Scripts/UI/UIConfig.cs +++ b/Assets/ChillConnect/Plugins/FairyGUI/Scripts/UI/UIConfig.cs @@ -15,7 +15,7 @@ namespace FairyGUI /// 4.x: Put the xxx.ttf into /Resources or /Resources/Fonts, and set defaultFont="xxx". /// 5.x: set defaultFont to system font name(or names joint with comma). e.g. defaultFont="Microsoft YaHei, SimHei" /// - public static string defaultFont = "Helvetica"; + public static string defaultFont = "LilitaOne-Regular"; [Obsolete("No use anymore")] public static bool renderingTextBrighterOnDesktop = true; diff --git a/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json b/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json index 8dced93..510b2a5 100644 --- a/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json +++ b/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json @@ -95,6 +95,12 @@ "Key" : "Obfuscate_Assembly_In_Assets_AssemblyDefinitionFiles", "Value" : "True", "Values" : null + }, + { + "Type" : "Bool", + "Key" : "Obfuscate_Assembly_In_Packages_AssemblyDefinitionFiles", + "Value" : "False", + "Values" : null } ] }, diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/1.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/1.png index 2afa281..4220588 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/1.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/1.png differ diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/2.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/2.png index 9e6a401..e677a83 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/2.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/2.png differ diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/3.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/3.png index dfd01dd..4813f0f 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/3.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/3.png differ diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/4.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/4.png index 9a3cf4d..eb82300 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/4.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/4.png differ diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/5.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/5.png index 7ef1625..01e461e 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/5.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/5.png differ diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/6.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/6.png index 9cdc940..b40fcce 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/6.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/6.png differ diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/7.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/7.png index cd002d3..7c30aa1 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/7.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/7.png differ diff --git a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/8.png b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/8.png index 542d5b4..79004ff 100644 Binary files a/Assets/Resources/ChillConnectAssets/Atlas/Avatar/8.png and b/Assets/Resources/ChillConnectAssets/Atlas/Avatar/8.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_atlas0.png index f13f97e..55680ee 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_fui.bytes index 6d9e93b..153b8d3 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/AddCell_12_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Coins_101_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Coins_101_fui.bytes index 72e9bc2..9f1a0c7 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Coins_101_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Coins_101_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png index 77af9e6..2995d8b 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes index d004c01..f2c0c17 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Fx_502_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Fx_502_fui.bytes index 14a8221..d16e36e 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Fx_502_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Fx_502_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_atlas0.png index 089802b..f691470 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_fui.bytes index 66e7c0c..cb15683 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/GameResult_08_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png index a18cb6a..8fb137f 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes index 7374280..89a4d49 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png index 39bce89..2feb481 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes index 78456f7..254fbe2 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_atlas0.png index 8991b66..456b4d7 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_fui.bytes index 159feea..8a8097b 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Loading_25_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_atlas0.png index 918994d..0df0f4d 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes index b0fc835..2a3fa0c 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Login_05_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Login_05_atlas0.png index 3751dca..9bac0ed 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Login_05_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Login_05_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes index f7eb5d2..428cb0e 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_atlas0.png index d411862..80d52d5 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_fui.bytes index 242d45b..0917b1b 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/NetIdle_22_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0.png index 0fb95a5..c27df00 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0_1.png b/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0_1.png index 611b3fa..c70693c 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0_1.png and b/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_atlas0_1.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_fui.bytes index cd64ac9..a8eceab 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/P14_PassView_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_atlas0.png index c99b4a5..0b88dce 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes index 87015d5..dd1131c 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Pack_16_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Privacy_24_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Privacy_24_fui.bytes index 326dde9..d71b960 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Privacy_24_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Privacy_24_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_atlas0.png index 6479dac..8815f35 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_fui.bytes index b685773..dc9c30a 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Prop_09_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Reward_10_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Reward_10_fui.bytes index 98533d2..128f167 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Reward_10_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Reward_10_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_atlas0.png index 12c07eb..a41d506 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes index 1a82532..20884b3 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_atlas0.png index b486d49..5d583eb 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_fui.bytes index 8249ac9..c9f8547 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Signin_19_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Toast_23_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Toast_23_fui.bytes index 18d1222..2259c7f 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Toast_23_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Toast_23_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_atlas0.png index f285524..a9d1a93 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_fui.bytes index f5a5b48..050fd5c 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Turntable_11_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0.png index d233cbb..a1511c6 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0_1.png b/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0_1.png index d2c2933..288f834 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0_1.png and b/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_atlas0_1.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_fui.bytes index 76b5e54..fb19e1e 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/ZM_AddCell_12_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_atlas0.png index 7d184d1..e538ab6 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_fui.bytes index 7f4e36f..6b1d3b3 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Pass_14_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_atlas0.png index a02a71f..5cd472f 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_fui.bytes index cd1cf9c..1fe8308 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/ZM_Tasks_13_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_atlas0.png index 320235b..bd16f6c 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_fui.bytes index c6bce8e..3fd82ac 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/bkg_reward_new_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/bkg_reward_new_fui.bytes index adb8205..85462ad 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/bkg_reward_new_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/bkg_reward_new_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/failpack_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/failpack_atlas0.png index 6e90892..3594595 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/failpack_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/failpack_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/failpack_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/failpack_fui.bytes index 56b7acc..0450795 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/failpack_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/failpack_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0.png index 880f8e7..2ea00d2 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0_1.png b/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0_1.png index ea65796..d64a11c 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0_1.png and b/Assets/Resources/ChillConnectAssets/FGUI/rank_atlas0_1.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/rank_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/rank_fui.bytes index 802a9ba..027e357 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/rank_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/rank_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/store_17_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/store_17_atlas0.png index e72eae1..f969df6 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/store_17_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/store_17_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes index 8f6b8a5..6f69cf1 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/store_17_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_atlas0.png index 482a780..f265cfd 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_fui.bytes index 2ebc14b..a42ea24 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/threeDaysGift_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0.png index c4215a7..87b094c 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0_1.png b/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0_1.png index d0ab864..ce15045 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0_1.png and b/Assets/Resources/ChillConnectAssets/FGUI/tixian_atlas0_1.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/tixian_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/tixian_fui.bytes index 583070f..f77513d 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/tixian_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/tixian_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/Font/LilitaOne-Regular.ttf b/Assets/Resources/ChillConnectAssets/Font/LilitaOne-Regular.ttf new file mode 100644 index 0000000..fdec368 Binary files /dev/null and b/Assets/Resources/ChillConnectAssets/Font/LilitaOne-Regular.ttf differ diff --git a/Assets/Resources/ChillConnectAssets/Font/LilitaOne-Regular.ttf.meta b/Assets/Resources/ChillConnectAssets/Font/LilitaOne-Regular.ttf.meta new file mode 100644 index 0000000..063e976 --- /dev/null +++ b/Assets/Resources/ChillConnectAssets/Font/LilitaOne-Regular.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 1a8374479ef942c4da0f5801ff924369 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Lilita One + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/card/bg_img/play_bg.jpg b/Assets/Resources/card/bg_img/play_bg.jpg index 98e2b00..4b39b69 100644 Binary files a/Assets/Resources/card/bg_img/play_bg.jpg and b/Assets/Resources/card/bg_img/play_bg.jpg differ diff --git a/Assets/Resources/card/card_sprite/0.png b/Assets/Resources/card/card_sprite/0.png index c9caeb7..8edee1e 100644 Binary files a/Assets/Resources/card/card_sprite/0.png and b/Assets/Resources/card/card_sprite/0.png differ diff --git a/Assets/Resources/card/card_sprite/1.png b/Assets/Resources/card/card_sprite/1.png index 9663b06..4e66018 100644 Binary files a/Assets/Resources/card/card_sprite/1.png and b/Assets/Resources/card/card_sprite/1.png differ diff --git a/Assets/Resources/card/card_sprite/10.png b/Assets/Resources/card/card_sprite/10.png index e41a9f7..7feb0fc 100644 Binary files a/Assets/Resources/card/card_sprite/10.png and b/Assets/Resources/card/card_sprite/10.png differ diff --git a/Assets/Resources/card/card_sprite/11.png b/Assets/Resources/card/card_sprite/11.png index 97e8da3..f8d7a8c 100644 Binary files a/Assets/Resources/card/card_sprite/11.png and b/Assets/Resources/card/card_sprite/11.png differ diff --git a/Assets/Resources/card/card_sprite/12.png b/Assets/Resources/card/card_sprite/12.png index a6bfa5e..c89896f 100644 Binary files a/Assets/Resources/card/card_sprite/12.png and b/Assets/Resources/card/card_sprite/12.png differ diff --git a/Assets/Resources/card/card_sprite/13.png b/Assets/Resources/card/card_sprite/13.png index 4b59282..3b42074 100644 Binary files a/Assets/Resources/card/card_sprite/13.png and b/Assets/Resources/card/card_sprite/13.png differ diff --git a/Assets/Resources/card/card_sprite/14.png b/Assets/Resources/card/card_sprite/14.png index 43aff3c..24ca394 100644 Binary files a/Assets/Resources/card/card_sprite/14.png and b/Assets/Resources/card/card_sprite/14.png differ diff --git a/Assets/Resources/card/card_sprite/2.png b/Assets/Resources/card/card_sprite/2.png index f2612c3..d16a7c6 100644 Binary files a/Assets/Resources/card/card_sprite/2.png and b/Assets/Resources/card/card_sprite/2.png differ diff --git a/Assets/Resources/card/card_sprite/3.png b/Assets/Resources/card/card_sprite/3.png index 38812f8..3bf2864 100644 Binary files a/Assets/Resources/card/card_sprite/3.png and b/Assets/Resources/card/card_sprite/3.png differ diff --git a/Assets/Resources/card/card_sprite/4.png b/Assets/Resources/card/card_sprite/4.png index d419552..e99eb54 100644 Binary files a/Assets/Resources/card/card_sprite/4.png and b/Assets/Resources/card/card_sprite/4.png differ diff --git a/Assets/Resources/card/card_sprite/5.png b/Assets/Resources/card/card_sprite/5.png index b85f87f..c3ea7b1 100644 Binary files a/Assets/Resources/card/card_sprite/5.png and b/Assets/Resources/card/card_sprite/5.png differ diff --git a/Assets/Resources/card/card_sprite/6.png b/Assets/Resources/card/card_sprite/6.png index 4525e82..e4db8c1 100644 Binary files a/Assets/Resources/card/card_sprite/6.png and b/Assets/Resources/card/card_sprite/6.png differ diff --git a/Assets/Resources/card/card_sprite/7.png b/Assets/Resources/card/card_sprite/7.png index dcb127a..1d6975c 100644 Binary files a/Assets/Resources/card/card_sprite/7.png and b/Assets/Resources/card/card_sprite/7.png differ diff --git a/Assets/Resources/card/card_sprite/8.png b/Assets/Resources/card/card_sprite/8.png index e016198..cf747fb 100644 Binary files a/Assets/Resources/card/card_sprite/8.png and b/Assets/Resources/card/card_sprite/8.png differ diff --git a/Assets/Resources/card/card_sprite/9.png b/Assets/Resources/card/card_sprite/9.png index d19f0bf..8695308 100644 Binary files a/Assets/Resources/card/card_sprite/9.png and b/Assets/Resources/card/card_sprite/9.png differ diff --git a/Assets/Scripts/AdRedeemManager.cs b/Assets/Scripts/AdRedeemManager.cs index fbaf7b7..674ed5a 100644 --- a/Assets/Scripts/AdRedeemManager.cs +++ b/Assets/Scripts/AdRedeemManager.cs @@ -369,11 +369,11 @@ public class AdRedeemManager if (type == "success" && successTrackKey != null) { - TrackKit.SendEvent(Property.adEvent, successTrackKey, Int32.Parse(suffix)); + // TrackKit.SendEvent(Property.adEvent, successTrackKey, Int32.Parse(suffix)); } else if (type == "click" && clickTrackKey != null) { - TrackKit.SendEvent(Property.adEvent, clickTrackKey, Int32.Parse(suffix)); + // TrackKit.SendEvent(Property.adEvent, clickTrackKey, Int32.Parse(suffix)); } } diff --git a/Assets/Scripts/ModuleUI/Hall/HallUI.cs b/Assets/Scripts/ModuleUI/Hall/HallUI.cs index b0690e5..4b3dedd 100644 --- a/Assets/Scripts/ModuleUI/Hall/HallUI.cs +++ b/Assets/Scripts/ModuleUI/Hall/HallUI.cs @@ -81,7 +81,7 @@ namespace ChillConnect { if (Screen.safeArea.y != 0) { - ui.top_group.y += 68; + // ui.top_group.y += 68; ui.left_group.y += 68; ui.right_group.y += 68; } @@ -266,8 +266,7 @@ namespace ChillConnect // Fx_Type.fx_btn_play, ref closeCallback); // anim_paly.state.SetAnimation(0, "animation", true); - btn_play_list = new List { ui.btn_play1, ui.btn_play2, ui.btn_play3, ui.btn_play4, ui.btn_play5, ui.btn_play6, ui.btn_play7, ui.btn_play8 - , ui.btn_play9,ui.btn_play10}; + btn_play_list = new List { ui.com_level.btn_play1, ui.com_level.btn_play2, ui.com_level.btn_play3, ui.com_level.btn_play4, ui.com_level.btn_play5 }; InitBtn(); Set101(); @@ -453,16 +452,27 @@ namespace ChillConnect private void InitBtn() { int level_ = GameHelper.GetLevel(); - int stage_ = (level_ - 1) / 10; - for (int i = 0; i < 10; i++) + int start_level = 0; + if (level_ >= 3) { - int lv = stage_ * 10 + 1 + i; + start_level = level_ - 2; + ui.com_level.state.selectedIndex = 2; + } + else + { + ui.com_level.state.selectedIndex = level_ - 1; + start_level = 1; + } + + for (int i = 0; i < 5; i++) + { + int lv = start_level + i; btn_play_list[i].text_level.text = lv.ToString(); if (lv < level_) { btn_play_list[i].state.selectedIndex = 2; } - else if ((stage_ * 10 + 1 + i) == level_) + else if (lv == level_) { btn_play_list[i].state.selectedIndex = 1; btn_play_list[i].SetClick(() => @@ -629,13 +639,13 @@ namespace ChillConnect var head = ui.btn_head as btn_head; GameHelper.SetSelfAvatar(head.load_avatar); - if (btn_play_list.Count == 0) return; - for (int i = 0; i < btn_play_list.Count; i++) - { - var head1 = btn_play_list[i].btn_hall_head.btn_head as btn_head; - GameHelper.SetSelfAvatar(head1.load_avatar); + // if (btn_play_list.Count == 0) return; + // for (int i = 0; i < btn_play_list.Count; i++) + // { + // var head1 = btn_play_list[i].btn_hall_head.btn_head as btn_head; + // GameHelper.SetSelfAvatar(head1.load_avatar); - } + // } ; } void reCreatPur(object a = null) diff --git a/Assets/Scripts/ModuleUI/Menu/MenuUI.cs b/Assets/Scripts/ModuleUI/Menu/MenuUI.cs index ed549c4..81b4969 100644 --- a/Assets/Scripts/ModuleUI/Menu/MenuUI.cs +++ b/Assets/Scripts/ModuleUI/Menu/MenuUI.cs @@ -104,18 +104,18 @@ namespace ChillConnect private void UpdataAvatar(object obj = null) { - var head = ui.btn_head.head as btn_head; + // var head = ui.btn_head.head as btn_head; // GameHelper.SetSelfAvatar(head.load_avatar); } private void InitView() { - var namStr = GameHelper.GetUserName(); - ui.edit_name.input.text = namStr; - ui.edit_name.btn_amend.SetClick(SaveName); + // var namStr = GameHelper.GetUserName(); + // ui.edit_name.input.text = namStr; + // ui.edit_name.btn_amend.SetClick(SaveName); - ui.btn_back.SetClick(OnCloseView); + // ui.btn_back.SetClick(OnCloseView); // ui.btn_music.SetClick(OnClickSetMusic); // ui.btn_sound.SetClick(OnClickSoundBtn); @@ -123,74 +123,74 @@ namespace ChillConnect // ui.btn_terms.menus.selectedIndex = btn_menu.Menus_terms; // ui.btn_official.menus.selectedIndex = btn_menu.Menus_official; // ui.btn_credits.menus.selectedIndex = btn_menu.Menus_credits; - ui.btn_privacy.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 0); }); - ui.btn_terms.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 1); }); - ui.btn_official.SetClick(() => { OpenBrowser.OpenURL("https://www.chillconnect.fun"); }); - ui.btn_email.SetClick(() => { - //OpenBrowser.OpenEmailClient(ConfigSystem.GetConfig().contactUs, "Please select an email application"); - GameHelper.OpenEmail(); - }); - ui.btn_exit.SetClick(OnCloseView); + // ui.btn_privacy.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 0); }); + // ui.btn_terms.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 1); }); + // ui.btn_official.SetClick(() => { OpenBrowser.OpenURL("https://www.chillconnect.fun"); }); + // ui.btn_email.SetClick(() => { + // //OpenBrowser.OpenEmailClient(ConfigSystem.GetConfig().contactUs, "Please select an email application"); + // GameHelper.OpenEmail(); + // }); + // ui.btn_exit.SetClick(OnCloseView); // ui.btn_credits.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 2); }); - SetUID(); - SetVersion(); - RefreshMusicUI(); + // SetUID(); + // SetVersion(); + // RefreshMusicUI(); - // 初始化滑动条位置 - ui.sound_slider.min = 0f; - ui.sound_slider.max = 1f; + // // 初始化滑动条位置 + // ui.sound_slider.min = 0f; + // ui.sound_slider.max = 1f; - // 添加滑动条变化事件监听 - ui.sound_slider.onChanged.Add(() => - { - var sound = (float)Math.Round(ui.sound_slider.value, 2); - Debug.Log("sound 滑动条当前的值=== " + sound); + // // 添加滑动条变化事件监听 + // ui.sound_slider.onChanged.Add(() => + // { + // var sound = (float)Math.Round(ui.sound_slider.value, 2); + // Debug.Log("sound 滑动条当前的值=== " + sound); - GRoot.inst.soundVolume = sound; - PlayerPrefs.SetFloat("soundVolume", sound); - }); + // GRoot.inst.soundVolume = sound; + // PlayerPrefs.SetFloat("soundVolume", sound); + // }); - ui.music_slider.min = 0f; - ui.music_slider.max = 1f; - ui.music_slider.onChanged.Add(() => - { - var sound = (float)Math.Round(ui.music_slider.value, 2); - Debug.Log("music 滑动条当前的值=== " + sound); - PlayerPrefs.SetFloat("musicSound", sound); - AudioManager.Instance.SetBGMSound(); + // ui.music_slider.min = 0f; + // ui.music_slider.max = 1f; + // ui.music_slider.onChanged.Add(() => + // { + // var sound = (float)Math.Round(ui.music_slider.value, 2); + // Debug.Log("music 滑动条当前的值=== " + sound); + // PlayerPrefs.SetFloat("musicSound", sound); + // AudioManager.Instance.SetBGMSound(); - }); + // }); - ui.btn_head.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PersonViewUI_Open); }); + // ui.btn_head.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PersonViewUI_Open); }); - if (GameHelper.IsGiftSwitch()) { - ui.btn_restore.visible = false; - } - ui.btn_restore.SetClick(() => - { - // ApplePayManager.Instance.AppleRestore((success,message)=>{ - // Debug.Log("[barry] restore success message: " + message); - // if (success) - // { - // Debug.Log("[barry] restore success: " + success); - // GameHelper.ShowTips("Restore Purchases Success!"); - // // SaveData.GetSaveObject().is_get_packreward = success; - // if (!GameHelper.IsGiftSwitch()) - // { - // SaveData.GetSaveObject().is_get_removead = success; - // } - // SaveData.GetSaveObject().have_slot = success; - // GameDispatcher.Instance.Dispatch(GameMsg.noads_refresh); - // } - // else - // { - // // Debug.Log("[barry] restore failed: " + success); - // GameHelper.ShowTips("There are no recoverable transactions"); - // } - // }); - CtrlCloseUI(); - }); + // if (GameHelper.IsGiftSwitch()) { + // ui.btn_restore.visible = false; + // } + // ui.btn_restore.SetClick(() => + // { + // // ApplePayManager.Instance.AppleRestore((success,message)=>{ + // // Debug.Log("[barry] restore success message: " + message); + // // if (success) + // // { + // // Debug.Log("[barry] restore success: " + success); + // // GameHelper.ShowTips("Restore Purchases Success!"); + // // // SaveData.GetSaveObject().is_get_packreward = success; + // // if (!GameHelper.IsGiftSwitch()) + // // { + // // SaveData.GetSaveObject().is_get_removead = success; + // // } + // // SaveData.GetSaveObject().have_slot = success; + // // GameDispatcher.Instance.Dispatch(GameMsg.noads_refresh); + // // } + // // else + // // { + // // // Debug.Log("[barry] restore failed: " + success); + // // GameHelper.ShowTips("There are no recoverable transactions"); + // // } + // // }); + // CtrlCloseUI(); + // }); } @@ -199,12 +199,12 @@ namespace ChillConnect private void SetVersion() { // Debug.Log($"SetVersion====== {Application.version}"); - ui.text_version.SetVar("count", Application.version).FlushVars(); + // ui.text_version.SetVar("count", Application.version).FlushVars(); } private void SetUID() { - ui.text_uid.SetVar("UID", GameHelper.GetLoginModel().Uid.ToString()).FlushVars(); + // ui.text_uid.SetVar("UID", GameHelper.GetLoginModel().Uid.ToString()).FlushVars(); } public override void OnSwitchLanguage() @@ -229,23 +229,23 @@ namespace ChillConnect private void SaveName() { - var name = ui.edit_name.input.text; - Debug.Log($"SaveName=== {name}"); - if (string.IsNullOrEmpty(name) || name.IsNullOrWhiteSpace()) - { - GameHelper.ShowTips("The input cannot be null", true); - return; - } - - // if (name.Equals(GameHelper.GetPlayerInviteCode())) + // var name = ui.edit_name.input.text; + // Debug.Log($"SaveName=== {name}"); + // if (string.IsNullOrEmpty(name) || name.IsNullOrWhiteSpace()) // { + // GameHelper.ShowTips("The input cannot be null", true); // return; // } - if (name.Equals(DataMgr.PlayerName)) return; + // // if (name.Equals(GameHelper.GetPlayerInviteCode())) + // // { + // // return; + // // } - GameHelper.ShowTips("Name changed successfully"); - DataMgr.PlayerName.Value = name; + // if (name.Equals(DataMgr.PlayerName)) return; + + // GameHelper.ShowTips("Name changed successfully"); + // DataMgr.PlayerName.Value = name; } private void OnClickSetMusic() @@ -268,10 +268,10 @@ namespace ChillConnect // model.IsOpenEffect ? btn_sound_on_off.On_off_on : btn_sound_on_off.On_off_off; // Debug.Log("barry GRoot.inst.soundVolume的值=== " + GRoot.inst.soundVolume); - ui.sound_slider.value = GRoot.inst.soundVolume; + // ui.sound_slider.value = GRoot.inst.soundVolume; - // Debug.Log("barry music volume的值=== " + PlayerPrefs.GetFloat("musicSound", 1.0f)); - ui.music_slider.value = PlayerPrefs.GetFloat("musicSound", 1.0f); + // // Debug.Log("barry music volume的值=== " + PlayerPrefs.GetFloat("musicSound", 1.0f)); + // ui.music_slider.value = PlayerPrefs.GetFloat("musicSound", 1.0f); } } } diff --git a/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs b/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs index 2d956c1..cfb145a 100644 --- a/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs +++ b/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs @@ -490,7 +490,6 @@ namespace ChillConnect - item.is_full.selectedIndex = 0; // if (index < pass_level)//进度条 // { // @@ -517,23 +516,23 @@ namespace ChillConnect if (pass_level > 0) { - item.progress_0_top.height = 204; - item.is_full.selectedIndex = 2; + item.progress_0_top.height = top_progress; + 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 = 204; + item.progress_0_down.height = down_progress; } 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 * 204; + item.progress_0_down.height = (float)(GameHelper.GetGameExp() - Passportrewards_list[0].Eliminating_quantity) / (Passportrewards_list[1].Eliminating_quantity - Passportrewards_list[0].Eliminating_quantity) * 2 * down_progress; } } else { - item.progress_0_top.height = (float)GameHelper.GetGameExp() / Passportrewards_list[0].Eliminating_quantity * 226; + item.progress_0_top.height = (float)GameHelper.GetGameExp() / Passportrewards_list[0].Eliminating_quantity * top_progress; item.progress_0_down.height = 0; } @@ -545,11 +544,11 @@ namespace ChillConnect 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 * 226; - if (height > 226) + 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 * top_progress; + if (height > top_progress) { - height = 226; - item.is_full.selectedIndex = 2; + height = top_progress; + } item.progress_2_top.height = height; } @@ -563,8 +562,8 @@ namespace ChillConnect if (pass_level >= index) { - item.is_full.selectedIndex = 2; - item.progress_1_top.height = 229; + + item.progress_1_top.height = top_progress; } else { @@ -573,9 +572,9 @@ namespace ChillConnect if (((float)(GameHelper.GetGameExp() - Passportrewards_list[index - 2].Eliminating_quantity) / (Passportrewards_list[index - 1].Eliminating_quantity - Passportrewards_list[index - 2].Eliminating_quantity)) > 0.5) { - item.is_full.selectedIndex = 2; - 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 * 229; - if (height > 229) height = 229; + + 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 * top_progress; + if (height > top_progress) height = top_progress; item.progress_1_top.height = height; } else item.progress_1_top.height = 0; @@ -592,16 +591,16 @@ namespace ChillConnect { 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 * 229; - if (height > 229) + float height = (float)(GameHelper.GetGameExp() - Passportrewards_list[index - 1].Eliminating_quantity) / (Passportrewards_list[index].Eliminating_quantity - Passportrewards_list[index - 1].Eliminating_quantity) * 2 * down_progress; + if (height > down_progress) { - height = 229; + height = down_progress; } item.progress_1_down.height = height; } else { - item.progress_1_down.height = 229; + item.progress_1_down.height = down_progress; } } @@ -609,11 +608,13 @@ namespace ChillConnect { if (pass_level > index) { - item.progress_1_down.height = 229; + item.progress_1_down.height = down_progress; } else item.progress_1_down.height = 0; } } } + private int top_progress=105; + private int down_progress=116; } } diff --git a/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs b/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs index 6a5271e..a93dd1b 100644 --- a/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs +++ b/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs @@ -156,7 +156,7 @@ namespace ChillConnect if (Screen.safeArea.y != 0) { - ui.top_group.y += 68; + // ui.top_group.y += 68; } ui.btn_add.y += 35; diff --git a/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs b/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs index 62cf08f..45290da 100644 --- a/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs +++ b/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs @@ -76,7 +76,7 @@ namespace ChillConnect ui.title.text = isTerm == 2 ? "View Credits" : title; MarkdownKit.Instance.ShowAsRichText(ui.text_list, BisTerm ? "user" : "privacy", - new Color(0.42f, 0.53f, 0.62f), (b, state) => + new Color(171f/255, 142f/255, 122f/255), (b, state) => { }); diff --git a/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs b/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs index 61f983b..8917794 100644 --- a/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs +++ b/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs @@ -107,7 +107,7 @@ namespace ChillConnect TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.GoldShow); ui.top_gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber()); - ui.shop_panel_parent.shopPanel.pay_type.selectedIndex = !GameHelper.IsAdModelOfPay() ? 1 : 0; + // ui.shop_panel_parent.shopPanel.pay_type.selectedIndex = !GameHelper.IsAdModelOfPay() ? 1 : 0; if (GameHelper.IsAdModelOfPay()) { @@ -172,7 +172,7 @@ namespace ChillConnect void GetAward(decimal gold, int index) { - var item = ui.shop_panel_parent.shopPanel.gold_list.GetChildAt(index); + var item = ui.gold_list.GetChildAt(index); var start = GameHelper.GetUICenterPosition(item); var end = GameHelper.GetUICenterPosition(ui.top_gold.GetChild("gold_anim")); @@ -271,8 +271,8 @@ namespace ChillConnect void initList() { - ui.shop_panel_parent.shopPanel.gold_list.itemRenderer = setRemaintime; - ui.shop_panel_parent.shopPanel.gold_list.numItems = list.Count > 6 ? 6 : list.Count; + ui.gold_list.itemRenderer = setRemaintime; + ui.gold_list.numItems = list.Count > 6 ? 6 : list.Count; SetTextString(); } diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs b/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs index 42a9121..fd74732 100644 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs +++ b/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs @@ -2,12 +2,10 @@ using System; using System.Collections.Generic; -using System.Linq; using DG.Tweening; using FairyGUI; using FGUI.Common_01; using FGUI.Turntable_11; -using IgnoreOPS; using Spine.Unity; using UnityEngine; @@ -17,15 +15,16 @@ namespace ChillConnect { private WheelViewUICtrl ctrl; private WheelViewModel model; - private readonly int[] vidieWeight = new int[12]; + private readonly int[] vidieWeight = new int[8]; private TurntableModel turntableData; private List ItemList = new(); private bool isClickSpin; private bool isClickAbleWatchAD = true; + private SkeletonAnimation normalAnim; // private SkeletonAnimation turnAnim; - private SkeletonAnimation awardAnim; + // private SkeletonAnimation awardAnim; private Action closeCallback; @@ -68,10 +67,6 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { - // if (Screen.safeArea.y != 0) - // { - // // ui..y += Screen.safeArea.y; - // } LoadLastCheckDate(); @@ -87,15 +82,14 @@ namespace ChillConnect ItemList.Add(disc.award6); ItemList.Add(disc.award7); ItemList.Add(disc.award8); - ItemList.Add(disc.award9); - ItemList.Add(disc.award10); - ItemList.Add(disc.award11); - ItemList.Add(disc.award12); HallManager.Instance.UpdateSecondEvent += UpdateTime; turntableData = ConfigSystem.GetConfig(); + + normalAnim = FXManager.Instance.SetFx(ui.light_parent, Fx_Type.fx_wheel, ref closeCallback); + UpdateTime(); refreshData(); @@ -146,14 +140,16 @@ namespace ChillConnect //初始化页面逻辑 private void InitView() { + + normalAnim.state.SetAnimation(0, "zhuanpan_zhizhen_idle", true); for (var i = 0; i < ItemList.Count; i++) { vidieWeight[i] = turntableData.DataList[i].weight; } ui.disc.rotation = 0; ui.btn_spin.SetClick(SpineAnim); - - ui.btn_close.SetClick(() => + ui.spin.touchable = false; + ui.close.SetClick(() => { CtrlCloseUI(); }); @@ -170,52 +166,24 @@ namespace ChillConnect var id = turntable.wheel_item; var quantity = turntable.quantity; - item.text_num.text = "x" + (id == 0 ? GameHelper.Get101Str((decimal)quantity) : quantity.ToString()); + if (!GameHelper.IsGiftSwitch() && id == 102) + { + id = 101; + quantity *= 10; + } - setItemUrl(item.item_icon, id, (int)quantity); + item.text_num.text = id == 102 ? GameHelper.Get102Str((decimal)quantity) : GameHelper.Get101Str((decimal)quantity); + item.status.selectedIndex = id == 102 ? com_coin.Status_b : com_coin.Status_a; } var times = DataMgr.ThisDayWatchSlyderVideoNum.Value; var limits = GameHelper.GetCommonModel().wheelTimes[0]; - ui.text_spin.SetVar("times", times.ToString()).FlushVars(); - ui.text_spin.SetVar("limits", limits.ToString()).FlushVars(); + ui.spin.text_spintimes.SetVar("times", times.ToString()).FlushVars(); + ui.spin.text_spintimes.SetVar("limits", limits.ToString()).FlushVars(); } - public string GetIndex(int quantity) - { - // 验证输入是否为有效数值 - if (quantity < 0) - { - throw new ArgumentException("Quantity must be a non-negative integer."); - } - - // 使用 switch 表达式明确处理边界条件 - return quantity switch - { - <= 80 => "1", - > 80 and <= 150 => "2", - > 150 => "3", - }; - } - - void setItemUrl(GLoader loader, int urltype, int quantity) - { - if (urltype == 0) - { - string idx = GetIndex(quantity); - - loader.url = $"ui://Turntable_11/spin_gold{idx}"; - } - else if (urltype == 1) loader.url = "ui://Common_01/spin_remove"; - else if (urltype == 2) loader.url = "ui://Common_01/spin_undo"; - else if (urltype == 3) loader.url = "ui://Common_01/spin_refresh"; - // if(urltype > 0) loader.SetScale(0.7f, 0.7f); - - } - - protected override void OnOpen(object args) { } @@ -268,160 +236,72 @@ namespace ChillConnect } } - void hideAllLight() - { - for (int i = 0; i < ItemList.Count; i++) - { - ItemList[i].light.visible = false; - ItemList[i].light1.visible = false; - ItemList[i].light_anim.visible = false; - } - } - private void Spin() { // normalAnim.SetActive(false); - - if (awardAnim != null) - { - // 停止之前的动画并释放资源 - awardAnim.state.ClearTracks(); - awardAnim = null; - } - - hideAllLight(); - + ui.disc.rotation = 0; + normalAnim.state.SetAnimation(0, "zhuanpan_zhizhen_run", true); isClickSpin = true; - ui.btn_close.touchable = false; - ui.btn_close.grayed = false; + ui.close.touchable = false; + ui.close.grayed = false; ui.btn_spin.touchable = false; var index = CommonHelper.GetIndexByChanceList(vidieWeight); - AudioManager.Instance.PlayDynamicEffect(AudioConst.wheel_spin); var data = turntableData.DataList[index]; - Debug.Log("spin index=== : " + index); - int allNum = ItemList.Count * 6 + index; - int itemCount = ItemList.Count; - float[] timess = (float[])ReceivePlanes(allNum); + var angle = 3600 - (data.Seq - 1) * 45; + AudioManager.Instance.PlayDynamicEffect(AudioConst.wheel_spin); + DOTween.To(() => ui.disc.rotation, e => ui.disc.rotation = e, angle, turnTime) + .SetEase(Ease.OutQuad); - float totalTimes = timess.Last(); - for (int i = 0; i < allNum; i++) - { - int currentIndex = i % itemCount; - float time = timess[i]; - - DOVirtual.DelayedCall(time, () => - { - int selectI = currentIndex + 1; - if (currentIndex + 1 > itemCount - 1) - { - selectI = 0; - } - ItemList[selectI].light.visible = true; - ItemList[selectI].light1.visible = true; - - ItemList[currentIndex].light.visible = false; - ItemList[currentIndex].light1.visible = false; - - }); - - } - - ResultTween = DOVirtual.DelayedCall(totalTimes, () => ReceivePlane(data, index)); + ResultTween = DOVirtual.DelayedCall(turnTime, () => ReceivePlane(data)); } - private Array ReceivePlanes(int nums) + private void ReceivePlane(Turntable vo) { - float start = 0.25f; - float end = 0.06f; - float delta = 0.02f; - float lastDelta = 0.1f; - - float delay = start; - float[] sum = new float[nums]; - for (int i = 0; i < nums; i++) - { - if (i == 0) - { - sum[i] = delay; - } - else - { - sum[i] = sum[i - 1] + delay; - } - - if (delay > end) - { - delay -= delta; - } - else - { - delay = end; - } - - //后8个间隔变慢 - if (i >= nums - 8) - { - sum[i] += lastDelta; - } - } - - return sum; - } - - private void ReceivePlane(Turntable vo, int index) - { - ItemList[index].light1.visible = false; - - ItemList[index].light_anim.visible = true; - awardAnim = FXManager.Instance.SetFx(ItemList[index].light_anim, Fx_Type.fx_wheel, ref closeCallback); - awardAnim.state.SetAnimation(0, "animation", true); + normalAnim.state.SetAnimation(0, "zhuanpan_win", true); DOVirtual.DelayedCall(1.5f, () => { isClickSpin = false; ResultTween = null; - ui.btn_close.touchable = true; - ui.btn_close.grayed = false; + ui.close.touchable = true; + ui.close.grayed = false; - ui.btn_spin.cont_spin.selectedIndex = btn_go1.Spin_grey; + ui.btn_spin.cont_spin.selectedIndex = 1; - ui.btn_spin.cont_state.selectedIndex = btn_go1.State_Video; + ui.btn_spin.cont_state.selectedIndex = 1; var id = vo.wheel_item; var quantity = vo.quantity; - Debug.Log($"barry ReceivePlane===: {id} {quantity}"); - if (id == 0) - { - var startPoint = GameHelper.GetUICenterPosition(ItemList[index]); - var endPoint = GameHelper.GetUICenterPosition(ui.point); - var rewardData = new RewardData(); - var rewardSingleData = new RewardSingleData(101, (decimal)quantity, RewardOrigin.LuckyWheel, index) - { - startPosition = startPoint, - endPosition = new Vector2(endPoint.x - 150, endPoint.y - 136), - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.Dialog | - RewardDisplayType.ValueChange; - rewardData.AddCompleted((isScu) => - { - - }); - GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - } - else + if (!GameHelper.IsGiftSwitch() && id == 102) { - GameHelper.AddItemNumber(id - 1, (int)quantity); - GameHelper.ShowTips("Successfully received"); + id = 101; + quantity *= 10; } + var endPoint = GameHelper.GetUICenterPosition(ui.point); + + var rewardData = new RewardData(); + var rewardSingleData = new RewardSingleData(id, (decimal)quantity, RewardOrigin.LuckyWheel) + { + endPosition = new Vector2(endPoint.x - 150, endPoint.y - 136), + }; + rewardData.AddReward(rewardSingleData); + rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; + rewardData.AddCompleted((isScu) => + { + normalAnim.state.SetAnimation(0, "zhuanpan_zhizhen_idle", true); + + }); + + GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); + DataMgr.NextOpenWheelStampTime.Value = GameHelper.GetNowTime() + GameHelper.GetCommonModel().wheelTimes[1]; - DataMgr.ThisDayWatchSlyderVideoNum.Value++; + DataMgr.ThisDayWatchSlyderVideoNum.Value = DataMgr.ThisDayWatchSlyderVideoNum.Value + 1; UpdateTime(); refreshData(); @@ -435,11 +315,10 @@ namespace ChillConnect DateTime currentTime = DateTime.Now; - ui.btn_spin.cont_state.selectedIndex = btn_go1.State_Limit; + ui.btn_spin.cont_state.selectedIndex = 2; ui.btn_spin.touchable = false; ui.btn_spin.enabled = false; - ui.btn_spin.cont_spin.selectedIndex = btn_go1.Spin_grey; - ui.btn_spin.img_saveingpot.visible = false; + ui.btn_spin.cont_spin.selectedIndex = 1; } else { @@ -447,24 +326,15 @@ namespace ChillConnect { ui.btn_spin.touchable = true; ui.btn_spin.enabled = true; - ui.btn_spin.cont_spin.selectedIndex = btn_go1.Spin_none; - ui.btn_spin.cont_state.selectedIndex = btn_go1.State_None; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_spin.img_saveingpot.visible = true; - } - else - { - ui.btn_spin.img_saveingpot.visible = false; - } + ui.btn_spin.cont_spin.selectedIndex = 0; + ui.btn_spin.cont_state.selectedIndex = 0; } else { ui.btn_spin.touchable = false; ui.btn_spin.enabled = false; - ui.btn_spin.cont_spin.selectedIndex = btn_go1.Spin_grey; - ui.btn_spin.cont_state.selectedIndex = btn_go1.State_Video; - ui.btn_spin.img_saveingpot.visible = false; + ui.btn_spin.cont_spin.selectedIndex = 1; + ui.btn_spin.cont_state.selectedIndex = 1; } ui.btn_spin.text_time.text = model.NextOpenWheelTimeStr; diff --git a/Assets/Scripts/Register/AppManagerRegister.cs b/Assets/Scripts/Register/AppManagerRegister.cs index cf73df7..6190caf 100644 --- a/Assets/Scripts/Register/AppManagerRegister.cs +++ b/Assets/Scripts/Register/AppManagerRegister.cs @@ -25,8 +25,8 @@ namespace ChillConnect private static void RegisterFont() { UIManager uiManager = UIManager.Instance; - uiManager.RegisterDefaultFont("Helvetica"); - uiManager.RegisterFont("Helvetica"); + uiManager.RegisterDefaultFont("LilitaOne-Regular"); + uiManager.RegisterFont("LilitaOne-Regular"); } } } \ No newline at end of file diff --git a/Assets/Scripts/WebviewManager.cs b/Assets/Scripts/WebviewManager.cs index 26938d2..ac0402c 100644 --- a/Assets/Scripts/WebviewManager.cs +++ b/Assets/Scripts/WebviewManager.cs @@ -26,7 +26,6 @@ namespace Dont_Confuse } public void haveSimCard(string have) { - Debug.Log("ppppppppppppppppppppp" + have); if (have == "TRUE") NetworkManager.haveSimCard = true; } diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml index b711564..81d78a4 100644 --- a/ProjectSettings/GvhProjectSettings.xml +++ b/ProjectSettings/GvhProjectSettings.xml @@ -2,7 +2,7 @@ - + diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 43e7638..591f701 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0.2 + bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -163,7 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - iPhone: changyunjia0017 + iPhone: changyunjia002 buildNumber: Standalone: 0 VisionOS: 0