diff --git a/Assets/Legend/Define/Message/UICtrlMsg_OpenClose.cs b/Assets/Legend/Define/Message/UICtrlMsg_OpenClose.cs index f92dec95..5aa90e34 100644 --- a/Assets/Legend/Define/Message/UICtrlMsg_OpenClose.cs +++ b/Assets/Legend/Define/Message/UICtrlMsg_OpenClose.cs @@ -149,5 +149,8 @@ namespace LoveLegend public static uint UnlockLevelNewUI_Close = ++cursor_OpenClose; public static uint BroadcastUI_Open = ++cursor_OpenClose; public static uint BroadcastUI_Close = ++cursor_OpenClose; + + public static uint EggUI_Open = ++cursor_OpenClose; + public static uint EggUI_Close = ++cursor_OpenClose; } } \ No newline at end of file diff --git a/Assets/Legend/Define/Model/Config/Game/CommonModel.cs b/Assets/Legend/Define/Model/Config/Game/CommonModel.cs index 9ae8632b..f687b735 100644 --- a/Assets/Legend/Define/Model/Config/Game/CommonModel.cs +++ b/Assets/Legend/Define/Model/Config/Game/CommonModel.cs @@ -62,5 +62,7 @@ namespace LoveLegend public int CoinsDownload; public string ResVersion; public int MultiModal; + public int[] eggReward; + public int eggCD; } } diff --git a/Assets/Legend/FGUI/package/LG_End/com_newend.cs b/Assets/Legend/FGUI/package/LG_End/com_newend.cs index b4ae72ea..a0def827 100644 --- a/Assets/Legend/FGUI/package/LG_End/com_newend.cs +++ b/Assets/Legend/FGUI/package/LG_End/com_newend.cs @@ -33,6 +33,7 @@ namespace FGUI.LG_End public GButton btn_download_coin; public GButton btn_continue; public Transition t0; + public Transition t1; public const string URL = "ui://tiispqmpcv0e0"; public static com_newend CreateInstance() @@ -48,28 +49,29 @@ namespace FGUI.LG_End step = GetControllerAt(1); gift_switch = GetControllerAt(2); is_vip = GetControllerAt(3); - loader_bgimg = (GLoader)GetChildAt(0); - remain_time = (GTextField)GetChildAt(2); - tetx_level = (GTextField)GetChildAt(4); - btn_setting = (GButton)GetChildAt(5); - congra_parent = (GGraph)GetChildAt(10); - text_levelType = (GTextField)GetChildAt(11); - bg_parent = (GGraph)GetChildAt(12); - congra_parent_2 = (GGraph)GetChildAt(13); - coin_parent = (GGraph)GetChildAt(14); - text_award = (GTextField)GetChildAt(16); - btn_gold = (GButton)GetChildAt(19); - com_loader = (GComponent)GetChildAt(22); - btn_download = (GButton)GetChildAt(24); - btn_restart = (GButton)GetChildAt(25); - wheel = (GComponent)GetChildAt(26); - progress_level = (GProgressBar)GetChildAt(27); - btn_mult = (GButton)GetChildAt(28); - btn_claim = (GButton)GetChildAt(29); - logo = (GImage)GetChildAt(30); - btn_download_coin = (GButton)GetChildAt(31); - btn_continue = (GButton)GetChildAt(33); + loader_bgimg = (GLoader)GetChildAt(1); + remain_time = (GTextField)GetChildAt(5); + tetx_level = (GTextField)GetChildAt(7); + btn_setting = (GButton)GetChildAt(8); + congra_parent = (GGraph)GetChildAt(13); + text_levelType = (GTextField)GetChildAt(14); + bg_parent = (GGraph)GetChildAt(15); + congra_parent_2 = (GGraph)GetChildAt(16); + coin_parent = (GGraph)GetChildAt(17); + text_award = (GTextField)GetChildAt(22); + btn_gold = (GButton)GetChildAt(25); + com_loader = (GComponent)GetChildAt(28); + btn_download = (GButton)GetChildAt(30); + btn_restart = (GButton)GetChildAt(31); + wheel = (GComponent)GetChildAt(32); + progress_level = (GProgressBar)GetChildAt(33); + btn_mult = (GButton)GetChildAt(34); + btn_claim = (GButton)GetChildAt(35); + logo = (GImage)GetChildAt(36); + btn_download_coin = (GButton)GetChildAt(37); + btn_continue = (GButton)GetChildAt(39); t0 = GetTransitionAt(0); + t1 = GetTransitionAt(1); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/LG_LuckyGift/com_lucky.cs b/Assets/Legend/FGUI/package/LG_LuckyGift/com_lucky.cs index 9f5dd2d9..d8e1e4f3 100644 --- a/Assets/Legend/FGUI/package/LG_LuckyGift/com_lucky.cs +++ b/Assets/Legend/FGUI/package/LG_LuckyGift/com_lucky.cs @@ -10,8 +10,6 @@ namespace FGUI.LG_LuckyGift public Controller type; public Controller pay_type; public Controller gift_switch; - public GButton btn_close; - public GTextField ads; public com_pic lucky_pic; public GTextField tips1; public GTextField text_goldnum; @@ -19,13 +17,16 @@ namespace FGUI.LG_LuckyGift public GTextField text_outnum; public GTextField text_backnum1; public GButton btn_buypack; + public GButton btn_luck_close; public GGroup lucky; + public GButton btn_close; + public com_pic no_ad_pic; public GTextField text_goldnum2; public GTextField text_time; public GButton btn_buyremovead; - public com_pic no_ad_pic; public GTextField tips2; public GGroup ad_panel; + public GTextField ads; public GButton btn_max_pack; public GButton btn_go_ad; public GButton btn_go_lucky; @@ -45,27 +46,28 @@ namespace FGUI.LG_LuckyGift type = GetControllerAt(0); pay_type = GetControllerAt(1); gift_switch = GetControllerAt(2); - btn_close = (GButton)GetChildAt(5); - ads = (GTextField)GetChildAt(7); - lucky_pic = (com_pic)GetChildAt(15); - tips1 = (GTextField)GetChildAt(16); - text_goldnum = (GTextField)GetChildAt(18); - text_refreshnum = (GTextField)GetChildAt(19); - text_outnum = (GTextField)GetChildAt(20); - text_backnum1 = (GTextField)GetChildAt(21); - btn_buypack = (GButton)GetChildAt(26); - lucky = (GGroup)GetChildAt(27); - text_goldnum2 = (GTextField)GetChildAt(33); - text_time = (GTextField)GetChildAt(34); - btn_buyremovead = (GButton)GetChildAt(35); - no_ad_pic = (com_pic)GetChildAt(36); - tips2 = (GTextField)GetChildAt(37); - ad_panel = (GGroup)GetChildAt(39); - btn_max_pack = (GButton)GetChildAt(40); - btn_go_ad = (GButton)GetChildAt(41); - btn_go_lucky = (GButton)GetChildAt(42); - btn_max_remove = (GButton)GetChildAt(43); - gold = (GButton)GetChildAt(44); + lucky_pic = (com_pic)GetChildAt(7); + tips1 = (GTextField)GetChildAt(9); + text_goldnum = (GTextField)GetChildAt(10); + text_refreshnum = (GTextField)GetChildAt(11); + text_outnum = (GTextField)GetChildAt(12); + text_backnum1 = (GTextField)GetChildAt(13); + btn_buypack = (GButton)GetChildAt(18); + btn_luck_close = (GButton)GetChildAt(19); + lucky = (GGroup)GetChildAt(20); + btn_close = (GButton)GetChildAt(23); + no_ad_pic = (com_pic)GetChildAt(26); + text_goldnum2 = (GTextField)GetChildAt(27); + text_time = (GTextField)GetChildAt(28); + btn_buyremovead = (GButton)GetChildAt(29); + tips2 = (GTextField)GetChildAt(30); + ad_panel = (GGroup)GetChildAt(33); + ads = (GTextField)GetChildAt(34); + btn_max_pack = (GButton)GetChildAt(35); + btn_go_ad = (GButton)GetChildAt(36); + btn_go_lucky = (GButton)GetChildAt(37); + btn_max_remove = (GButton)GetChildAt(38); + gold = (GButton)GetChildAt(39); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_AddCell_12/ZM_AddCell_12Binder.cs b/Assets/Legend/FGUI/package/ZM_AddCell_12/ZM_AddCell_12Binder.cs index 1f55ac0f..22c8cbc7 100644 --- a/Assets/Legend/FGUI/package/ZM_AddCell_12/ZM_AddCell_12Binder.cs +++ b/Assets/Legend/FGUI/package/ZM_AddCell_12/ZM_AddCell_12Binder.cs @@ -10,7 +10,6 @@ namespace FGUI.ZM_AddCell_12 { UIObjectFactory.SetPackageItemExtension(btn_claim.URL, typeof(btn_claim)); UIObjectFactory.SetPackageItemExtension(com_addView.URL, typeof(com_addView)); - UIObjectFactory.SetPackageItemExtension(btn_buy_one.URL, typeof(btn_buy_one)); UIObjectFactory.SetPackageItemExtension(com_goldreward.URL, typeof(com_goldreward)); } } diff --git a/Assets/Legend/FGUI/package/ZM_AddCell_12/btn_buy_one.cs b/Assets/Legend/FGUI/package/ZM_AddCell_12/btn_buy_one.cs deleted file mode 100644 index 65464bb0..00000000 --- a/Assets/Legend/FGUI/package/ZM_AddCell_12/btn_buy_one.cs +++ /dev/null @@ -1,31 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.ZM_AddCell_12 -{ - public partial class btn_buy_one : GButton - { - public Controller buy_state; - public Controller can_buy; - public GTextField btn_text; - public GTextField watch; - public const string URL = "ui://cwrkvs46emjhj"; - - public static btn_buy_one CreateInstance() - { - return (btn_buy_one)UIPackage.CreateObject("ZM_AddCell_12", "btn_buy_one"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - buy_state = GetControllerAt(0); - can_buy = GetControllerAt(1); - btn_text = (GTextField)GetChildAt(2); - watch = (GTextField)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_AddCell_12/com_addView.cs b/Assets/Legend/FGUI/package/ZM_AddCell_12/com_addView.cs index b1cd4807..df0ce2fe 100644 --- a/Assets/Legend/FGUI/package/ZM_AddCell_12/com_addView.cs +++ b/Assets/Legend/FGUI/package/ZM_AddCell_12/com_addView.cs @@ -12,10 +12,9 @@ namespace FGUI.ZM_AddCell_12 public GImage com_pic; public GButton btn_watch; public GTextField tips; - public GTextField ads; public GButton btn_max_pay; public GTextField title1; - public GGraph anim_bg; + public GTextField text_watch_ad; public const string URL = "ui://cwrkvs469eoj0"; public static com_addView CreateInstance() @@ -28,14 +27,13 @@ namespace FGUI.ZM_AddCell_12 base.ConstructFromXML(xml); pay_type = GetControllerAt(0); - btn_close = (GButton)GetChildAt(1); - com_pic = (GImage)GetChildAt(2); - btn_watch = (GButton)GetChildAt(3); - tips = (GTextField)GetChildAt(4); - ads = (GTextField)GetChildAt(5); - btn_max_pay = (GButton)GetChildAt(6); - title1 = (GTextField)GetChildAt(10); - anim_bg = (GGraph)GetChildAt(12); + btn_close = (GButton)GetChildAt(4); + com_pic = (GImage)GetChildAt(5); + btn_watch = (GButton)GetChildAt(6); + tips = (GTextField)GetChildAt(7); + btn_max_pay = (GButton)GetChildAt(8); + title1 = (GTextField)GetChildAt(11); + text_watch_ad = (GTextField)GetChildAt(15); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/ZM_Game_04Binder.cs b/Assets/Legend/FGUI/package/ZM_Game_04/ZM_Game_04Binder.cs index 85e7de2b..2938dc44 100644 --- a/Assets/Legend/FGUI/package/ZM_Game_04/ZM_Game_04Binder.cs +++ b/Assets/Legend/FGUI/package/ZM_Game_04/ZM_Game_04Binder.cs @@ -8,9 +8,6 @@ namespace FGUI.ZM_Game_04 { public static void BindAll() { - UIObjectFactory.SetPackageItemExtension(com_game_menu.URL, typeof(com_game_menu)); - UIObjectFactory.SetPackageItemExtension(btn_exit.URL, typeof(btn_exit)); - UIObjectFactory.SetPackageItemExtension(btn_set.URL, typeof(btn_set)); 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/Legend/FGUI/package/ZM_Game_04/btn_exit.cs b/Assets/Legend/FGUI/package/ZM_Game_04/btn_exit.cs deleted file mode 100644 index dc0d7a61..00000000 --- a/Assets/Legend/FGUI/package/ZM_Game_04/btn_exit.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.ZM_Game_04 -{ - public partial class btn_exit : GButton - { - public GTextField text_exit; - public const string URL = "ui://g3iqdlgc9wz11d"; - - public static btn_exit CreateInstance() - { - return (btn_exit)UIPackage.CreateObject("ZM_Game_04", "btn_exit"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_exit = (GTextField)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/btn_prop.cs b/Assets/Legend/FGUI/package/ZM_Game_04/btn_prop.cs index f0473940..36917bb3 100644 --- a/Assets/Legend/FGUI/package/ZM_Game_04/btn_prop.cs +++ b/Assets/Legend/FGUI/package/ZM_Game_04/btn_prop.cs @@ -23,9 +23,9 @@ namespace FGUI.ZM_Game_04 base.ConstructFromXML(xml); prop = GetControllerAt(0); - number_text = (GTextField)GetChildAt(5); - img_add = (GImage)GetChildAt(6); - ani_parent = (GGraph)GetChildAt(8); + number_text = (GTextField)GetChildAt(4); + img_add = (GImage)GetChildAt(5); + ani_parent = (GGraph)GetChildAt(7); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/btn_set.cs b/Assets/Legend/FGUI/package/ZM_Game_04/btn_set.cs deleted file mode 100644 index 662892ab..00000000 --- a/Assets/Legend/FGUI/package/ZM_Game_04/btn_set.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.ZM_Game_04 -{ - public partial class btn_set : GButton - { - public GTextField text_set; - public const string URL = "ui://g3iqdlgc9wz11e"; - - public static btn_set CreateInstance() - { - return (btn_set)UIPackage.CreateObject("ZM_Game_04", "btn_set"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_set = (GTextField)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/com_game_menu.cs b/Assets/Legend/FGUI/package/ZM_Game_04/com_game_menu.cs deleted file mode 100644 index b08045e0..00000000 --- a/Assets/Legend/FGUI/package/ZM_Game_04/com_game_menu.cs +++ /dev/null @@ -1,33 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.ZM_Game_04 -{ - public partial class com_game_menu : GComponent - { - public btn_exit btn_exit; - public btn_set btn_settings; - public GGroup node; - public Transition show; - public Transition hide; - public const string URL = "ui://g3iqdlgc9wz116"; - - public static com_game_menu CreateInstance() - { - return (com_game_menu)UIPackage.CreateObject("ZM_Game_04", "com_game_menu"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - btn_exit = (btn_exit)GetChildAt(1); - btn_settings = (btn_set)GetChildAt(2); - node = (GGroup)GetChildAt(3); - show = GetTransitionAt(0); - hide = GetTransitionAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/com_open.cs b/Assets/Legend/FGUI/package/ZM_Game_04/com_open.cs index c989fe7e..fdd5b1b9 100644 --- a/Assets/Legend/FGUI/package/ZM_Game_04/com_open.cs +++ b/Assets/Legend/FGUI/package/ZM_Game_04/com_open.cs @@ -7,10 +7,10 @@ namespace FGUI.ZM_Game_04 { public partial class com_open : GComponent { - public GImage bg; public GTextField text_level; public GGraph tips_node; public GGraph tips_node1; + public Transition t0; public const string URL = "ui://g3iqdlgcopwg13"; public static com_open CreateInstance() @@ -22,10 +22,10 @@ namespace FGUI.ZM_Game_04 { base.ConstructFromXML(xml); - bg = (GImage)GetChildAt(0); - text_level = (GTextField)GetChildAt(1); - tips_node = (GGraph)GetChildAt(2); - tips_node1 = (GGraph)GetChildAt(3); + text_level = (GTextField)GetChildAt(3); + tips_node = (GGraph)GetChildAt(4); + tips_node1 = (GGraph)GetChildAt(5); + t0 = GetTransitionAt(0); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/com_state.cs b/Assets/Legend/FGUI/package/ZM_Game_04/com_state.cs index b27322f1..39da45ed 100644 --- a/Assets/Legend/FGUI/package/ZM_Game_04/com_state.cs +++ b/Assets/Legend/FGUI/package/ZM_Game_04/com_state.cs @@ -19,7 +19,7 @@ namespace FGUI.ZM_Game_04 { base.ConstructFromXML(xml); - text_level = (GTextField)GetChildAt(1); + text_level = (GTextField)GetChildAt(2); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Pack_16/com_passunlock.cs b/Assets/Legend/FGUI/package/ZM_Pack_16/com_passunlock.cs index 9da0c25e..f9f674b7 100644 --- a/Assets/Legend/FGUI/package/ZM_Pack_16/com_passunlock.cs +++ b/Assets/Legend/FGUI/package/ZM_Pack_16/com_passunlock.cs @@ -29,13 +29,13 @@ namespace FGUI.ZM_Pack_16 pay_type = GetControllerAt(0); gift_switch = GetControllerAt(1); - loader = (com_pic)GetChildAt(4); - btn_close = (GButton)GetChildAt(5); - text_allgold = (GTextField)GetChildAt(8); - btn_buypass = (GButton)GetChildAt(9); - tips = (GTextField)GetChildAt(10); - ads = (GTextField)GetChildAt(11); - btn_max_pay = (GButton)GetChildAt(12); + loader = (com_pic)GetChildAt(3); + btn_close = (GButton)GetChildAt(4); + text_allgold = (GTextField)GetChildAt(7); + btn_buypass = (GButton)GetChildAt(8); + tips = (GTextField)GetChildAt(9); + ads = (GTextField)GetChildAt(10); + btn_max_pay = (GButton)GetChildAt(11); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Pass_14/ZM_Pass_14Binder.cs b/Assets/Legend/FGUI/package/ZM_Pass_14/ZM_Pass_14Binder.cs index 3205a997..ee710f01 100644 --- a/Assets/Legend/FGUI/package/ZM_Pass_14/ZM_Pass_14Binder.cs +++ b/Assets/Legend/FGUI/package/ZM_Pass_14/ZM_Pass_14Binder.cs @@ -10,7 +10,6 @@ namespace FGUI.ZM_Pass_14 { UIObjectFactory.SetPackageItemExtension(com_List.URL, typeof(com_List)); UIObjectFactory.SetPackageItemExtension(com_pass_view.URL, typeof(com_pass_view)); - UIObjectFactory.SetPackageItemExtension(btn_recive_gift.URL, typeof(btn_recive_gift)); 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/Legend/FGUI/package/ZM_Pass_14/btn_recive_gift.cs b/Assets/Legend/FGUI/package/ZM_Pass_14/btn_recive_gift.cs deleted file mode 100644 index 848fe91b..00000000 --- a/Assets/Legend/FGUI/package/ZM_Pass_14/btn_recive_gift.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.ZM_Pass_14 -{ - public partial class btn_recive_gift : GButton - { - public GImage ad_icon; - public const string URL = "ui://wyu9msxws27hv"; - - public static btn_recive_gift CreateInstance() - { - return (btn_recive_gift)UIPackage.CreateObject("ZM_Pass_14", "btn_recive_gift"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - ad_icon = (GImage)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Pass_14/btn_recive_gift.cs.meta b/Assets/Legend/FGUI/package/ZM_Pass_14/btn_recive_gift.cs.meta deleted file mode 100644 index 8490765b..00000000 --- a/Assets/Legend/FGUI/package/ZM_Pass_14/btn_recive_gift.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3fe4f6980be5f4c98946504ea8a6bf74 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Legend/FGUI/package/ZM_Pass_14/com_List.cs b/Assets/Legend/FGUI/package/ZM_Pass_14/com_List.cs index 6177de5a..345b870d 100644 --- a/Assets/Legend/FGUI/package/ZM_Pass_14/com_List.cs +++ b/Assets/Legend/FGUI/package/ZM_Pass_14/com_List.cs @@ -19,7 +19,7 @@ namespace FGUI.ZM_Pass_14 { base.ConstructFromXML(xml); - pass_list = (GList)GetChildAt(1); + pass_list = (GList)GetChildAt(0); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Pass_14/com_item_award.cs b/Assets/Legend/FGUI/package/ZM_Pass_14/com_item_award.cs index ac75fc37..4fb40f99 100644 --- a/Assets/Legend/FGUI/package/ZM_Pass_14/com_item_award.cs +++ b/Assets/Legend/FGUI/package/ZM_Pass_14/com_item_award.cs @@ -11,7 +11,6 @@ namespace FGUI.ZM_Pass_14 public Controller state; public GLoader item_loader; public GTextField number_text; - public GGraph anim_parent; public GButton btn_claim; public const string URL = "ui://wyu9msxws27hz"; @@ -27,9 +26,8 @@ namespace FGUI.ZM_Pass_14 type = GetControllerAt(0); state = GetControllerAt(1); item_loader = (GLoader)GetChildAt(3); - number_text = (GTextField)GetChildAt(6); - anim_parent = (GGraph)GetChildAt(7); - btn_claim = (GButton)GetChildAt(8); + number_text = (GTextField)GetChildAt(4); + btn_claim = (GButton)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_item.cs b/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_item.cs index 51b28498..74c1401a 100644 --- a/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_item.cs +++ b/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_item.cs @@ -9,7 +9,6 @@ namespace FGUI.ZM_Pass_14 { public Controller state; public Controller is_full; - public GImage yuan; public GTextField index_text; public com_item_award free_item; public com_item_award pay_item; @@ -26,10 +25,9 @@ namespace FGUI.ZM_Pass_14 state = GetControllerAt(0); is_full = GetControllerAt(1); - yuan = (GImage)GetChildAt(1); - index_text = (GTextField)GetChildAt(2); - free_item = (com_item_award)GetChildAt(3); - pay_item = (com_item_award)GetChildAt(4); + index_text = (GTextField)GetChildAt(3); + free_item = (com_item_award)GetChildAt(4); + pay_item = (com_item_award)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_view.cs b/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_view.cs index 0c8273e1..1a595865 100644 --- a/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_view.cs +++ b/Assets/Legend/FGUI/package/ZM_Pass_14/com_pass_view.cs @@ -7,15 +7,13 @@ namespace FGUI.ZM_Pass_14 { public partial class com_pass_view : GComponent { - public btn_recive_gift btn_recive; + public GButton btn_recive; public progress_pass progress_pass; public GTextField text_level; public com_List list_panel; public GButton btn_tips; - public GImage top_bg; public GButton gold; public GTextField remain_time; - public GButton head; public GGroup group_; public GButton close; public const string URL = "ui://wyu9msxws27h0"; @@ -29,17 +27,15 @@ namespace FGUI.ZM_Pass_14 { base.ConstructFromXML(xml); - btn_recive = (btn_recive_gift)GetChildAt(6); - progress_pass = (progress_pass)GetChildAt(7); - text_level = (GTextField)GetChildAt(10); - list_panel = (com_List)GetChildAt(13); - btn_tips = (GButton)GetChildAt(14); - top_bg = (GImage)GetChildAt(15); - gold = (GButton)GetChildAt(16); - remain_time = (GTextField)GetChildAt(18); - head = (GButton)GetChildAt(20); - group_ = (GGroup)GetChildAt(21); - close = (GButton)GetChildAt(22); + btn_recive = (GButton)GetChildAt(1); + progress_pass = (progress_pass)GetChildAt(2); + text_level = (GTextField)GetChildAt(5); + list_panel = (com_List)GetChildAt(8); + btn_tips = (GButton)GetChildAt(9); + gold = (GButton)GetChildAt(10); + remain_time = (GTextField)GetChildAt(12); + group_ = (GGroup)GetChildAt(14); + close = (GButton)GetChildAt(15); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Prop_09/com_choose.cs b/Assets/Legend/FGUI/package/ZM_Prop_09/com_choose.cs index 6da4d333..27dff703 100644 --- a/Assets/Legend/FGUI/package/ZM_Prop_09/com_choose.cs +++ b/Assets/Legend/FGUI/package/ZM_Prop_09/com_choose.cs @@ -12,7 +12,7 @@ namespace FGUI.ZM_Prop_09 public btn_goldBuy btn_gold_buy; public GButton btn_thanks; public GButton btn_ad; - public GTextField title1; + public GTextField title; public const string URL = "ui://ig55ss7kq8uc0"; public static com_choose CreateInstance() @@ -29,7 +29,7 @@ namespace FGUI.ZM_Prop_09 btn_gold_buy = (btn_goldBuy)GetChildAt(2); btn_thanks = (GButton)GetChildAt(3); btn_ad = (GButton)GetChildAt(4); - title1 = (GTextField)GetChildAt(5); + title = (GTextField)GetChildAt(5); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Prop_09/com_prop.cs b/Assets/Legend/FGUI/package/ZM_Prop_09/com_prop.cs index 00a5eb9e..66ecca0b 100644 --- a/Assets/Legend/FGUI/package/ZM_Prop_09/com_prop.cs +++ b/Assets/Legend/FGUI/package/ZM_Prop_09/com_prop.cs @@ -8,6 +8,7 @@ namespace FGUI.ZM_Prop_09 public partial class com_prop : GComponent { public Controller prop; + public GTextField title; public GTextField title1; public btn_goldBuy btn_buy; public GButton btn_back; @@ -23,9 +24,10 @@ namespace FGUI.ZM_Prop_09 base.ConstructFromXML(xml); prop = GetControllerAt(0); - title1 = (GTextField)GetChildAt(5); - btn_buy = (btn_goldBuy)GetChildAt(6); - btn_back = (GButton)GetChildAt(7); + title = (GTextField)GetChildAt(2); + title1 = (GTextField)GetChildAt(7); + btn_buy = (btn_goldBuy)GetChildAt(8); + btn_back = (GButton)GetChildAt(9); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Setting_07/btn_item_head.cs b/Assets/Legend/FGUI/package/ZM_Setting_07/btn_item_head.cs index 2fe301e4..bb6e232d 100644 --- a/Assets/Legend/FGUI/package/ZM_Setting_07/btn_item_head.cs +++ b/Assets/Legend/FGUI/package/ZM_Setting_07/btn_item_head.cs @@ -8,6 +8,7 @@ namespace FGUI.ZM_Setting_07 public partial class btn_item_head : GButton { public Controller head_select; + public Controller setting; public GButton head; public const string URL = "ui://8rcjs2ucsebxj"; @@ -21,7 +22,8 @@ namespace FGUI.ZM_Setting_07 base.ConstructFromXML(xml); head_select = GetControllerAt(0); - head = (GButton)GetChildAt(1); + setting = GetControllerAt(1); + head = (GButton)GetChildAt(0); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Setting_07/com_setting.cs b/Assets/Legend/FGUI/package/ZM_Setting_07/com_setting.cs index ec5bacd2..ef7c11ab 100644 --- a/Assets/Legend/FGUI/package/ZM_Setting_07/com_setting.cs +++ b/Assets/Legend/FGUI/package/ZM_Setting_07/com_setting.cs @@ -8,6 +8,7 @@ namespace FGUI.ZM_Setting_07 public partial class com_setting : GComponent { public Controller gift_switch; + public Controller isHall; public GButton btn_back; public btn_sound_on_off btn_sound; public btn_music_on_off btn_music; @@ -22,6 +23,8 @@ namespace FGUI.ZM_Setting_07 public btn_menu btn_us; public GButton btn_back_home; public btn_menu btn_language; + public com_edit_name edit_name; + public btn_item_head btn_head; public const string URL = "ui://8rcjs2ucsebx10"; public static com_setting CreateInstance() @@ -34,20 +37,23 @@ namespace FGUI.ZM_Setting_07 base.ConstructFromXML(xml); gift_switch = GetControllerAt(0); - btn_back = (GButton)GetChildAt(1); - btn_sound = (btn_sound_on_off)GetChildAt(2); - btn_music = (btn_music_on_off)GetChildAt(3); - btn_privacy = (btn_menu)GetChildAt(4); - btn_terms = (btn_menu)GetChildAt(5); - btn_official = (btn_menu)GetChildAt(6); - btn_restore = (btn_menu)GetChildAt(7); - text_uid = (GTextField)GetChildAt(8); - text_version = (GTextField)GetChildAt(9); - title = (GTextField)GetChildAt(10); - com_gold = (GButton)GetChildAt(11); - btn_us = (btn_menu)GetChildAt(12); - btn_back_home = (GButton)GetChildAt(13); - btn_language = (btn_menu)GetChildAt(14); + isHall = GetControllerAt(1); + btn_back = (GButton)GetChildAt(2); + btn_sound = (btn_sound_on_off)GetChildAt(3); + btn_music = (btn_music_on_off)GetChildAt(4); + btn_privacy = (btn_menu)GetChildAt(5); + btn_terms = (btn_menu)GetChildAt(6); + btn_official = (btn_menu)GetChildAt(7); + btn_restore = (btn_menu)GetChildAt(8); + text_uid = (GTextField)GetChildAt(9); + text_version = (GTextField)GetChildAt(10); + title = (GTextField)GetChildAt(11); + com_gold = (GButton)GetChildAt(12); + btn_us = (btn_menu)GetChildAt(13); + btn_back_home = (GButton)GetChildAt(14); + btn_language = (btn_menu)GetChildAt(15); + edit_name = (com_edit_name)GetChildAt(16); + btn_head = (btn_item_head)GetChildAt(17); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_store_17/ZM_store_17Binder.cs b/Assets/Legend/FGUI/package/ZM_store_17/ZM_store_17Binder.cs index 71b68ba0..3d31f3c9 100644 --- a/Assets/Legend/FGUI/package/ZM_store_17/ZM_store_17Binder.cs +++ b/Assets/Legend/FGUI/package/ZM_store_17/ZM_store_17Binder.cs @@ -8,12 +8,10 @@ namespace FGUI.ZM_store_17 { public static void BindAll() { - UIObjectFactory.SetPackageItemExtension(btn_get.URL, typeof(btn_get)); UIObjectFactory.SetPackageItemExtension(btn_buy.URL, typeof(btn_buy)); UIObjectFactory.SetPackageItemExtension(buygold_item.URL, typeof(buygold_item)); UIObjectFactory.SetPackageItemExtension(com_buygold.URL, typeof(com_buygold)); UIObjectFactory.SetPackageItemExtension(btn_watchAd1.URL, typeof(btn_watchAd1)); - UIObjectFactory.SetPackageItemExtension(btn_close.URL, typeof(btn_close)); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_store_17/btn_buy.cs b/Assets/Legend/FGUI/package/ZM_store_17/btn_buy.cs index 0d270587..13ea4af5 100644 --- a/Assets/Legend/FGUI/package/ZM_store_17/btn_buy.cs +++ b/Assets/Legend/FGUI/package/ZM_store_17/btn_buy.cs @@ -8,6 +8,7 @@ namespace FGUI.ZM_store_17 public partial class btn_buy : GButton { public Controller can_buy; + public Controller index; public GTextField btn_text; public const string URL = "ui://5crzgdh6d3a90"; @@ -21,6 +22,7 @@ namespace FGUI.ZM_store_17 base.ConstructFromXML(xml); can_buy = GetControllerAt(0); + index = GetControllerAt(1); btn_text = (GTextField)GetChildAt(2); } } diff --git a/Assets/Legend/FGUI/package/ZM_store_17/btn_close.cs b/Assets/Legend/FGUI/package/ZM_store_17/btn_close.cs deleted file mode 100644 index 404ddb8a..00000000 --- a/Assets/Legend/FGUI/package/ZM_store_17/btn_close.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.ZM_store_17 -{ - public partial class btn_close : GButton - { - public Controller can_buy; - public const string URL = "ui://5crzgdh6wgo41q"; - - public static btn_close CreateInstance() - { - return (btn_close)UIPackage.CreateObject("ZM_store_17", "btn_close"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - can_buy = GetControllerAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_store_17/btn_close.cs.meta b/Assets/Legend/FGUI/package/ZM_store_17/btn_close.cs.meta deleted file mode 100644 index 134f2cfd..00000000 --- a/Assets/Legend/FGUI/package/ZM_store_17/btn_close.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3b61d0e12945e0f44aa3825351686544 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Legend/FGUI/package/ZM_store_17/btn_get.cs b/Assets/Legend/FGUI/package/ZM_store_17/btn_get.cs deleted file mode 100644 index 968cc85c..00000000 --- a/Assets/Legend/FGUI/package/ZM_store_17/btn_get.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.ZM_store_17 -{ - public partial class btn_get : GButton - { - public Controller state; - public const string URL = "ui://5crzgdh69aez2i"; - - public static btn_get CreateInstance() - { - return (btn_get)UIPackage.CreateObject("ZM_store_17", "btn_get"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_store_17/btn_get.cs.meta b/Assets/Legend/FGUI/package/ZM_store_17/btn_get.cs.meta deleted file mode 100644 index f5ec1b5f..00000000 --- a/Assets/Legend/FGUI/package/ZM_store_17/btn_get.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 11e562194f2f6fa46812f2d5a4656ce8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Legend/FGUI/package/ZM_store_17/buygold_item.cs b/Assets/Legend/FGUI/package/ZM_store_17/buygold_item.cs index 624731cd..42a559b2 100644 --- a/Assets/Legend/FGUI/package/ZM_store_17/buygold_item.cs +++ b/Assets/Legend/FGUI/package/ZM_store_17/buygold_item.cs @@ -9,10 +9,6 @@ namespace FGUI.ZM_store_17 { public Controller index; public GTextField coin_text; - public GTextField off_text; - public GTextField content_text; - public GGroup discount; - public GTextField text_tips; public btn_buy btn_buy; public GTextField text_ads; public const string URL = "ui://5crzgdh6d3a91"; @@ -28,12 +24,8 @@ namespace FGUI.ZM_store_17 index = GetControllerAt(0); coin_text = (GTextField)GetChildAt(1); - off_text = (GTextField)GetChildAt(4); - content_text = (GTextField)GetChildAt(5); - discount = (GGroup)GetChildAt(6); - text_tips = (GTextField)GetChildAt(7); - btn_buy = (btn_buy)GetChildAt(8); - text_ads = (GTextField)GetChildAt(9); + btn_buy = (btn_buy)GetChildAt(3); + text_ads = (GTextField)GetChildAt(4); } } } \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_store_17/com_buygold.cs b/Assets/Legend/FGUI/package/ZM_store_17/com_buygold.cs index b12b4029..98b40cc8 100644 --- a/Assets/Legend/FGUI/package/ZM_store_17/com_buygold.cs +++ b/Assets/Legend/FGUI/package/ZM_store_17/com_buygold.cs @@ -13,7 +13,6 @@ namespace FGUI.ZM_store_17 public GButton top_gold; public GTextField text_my_ads; public btn_watchAd1 btn_watch; - public GGroup panel_ad; public GButton btn_close; public const string URL = "ui://5crzgdh6d3a92"; @@ -27,13 +26,12 @@ namespace FGUI.ZM_store_17 base.ConstructFromXML(xml); pay_type = GetControllerAt(0); - com_head = (GButton)GetChildAt(3); - gold_list = (GList)GetChildAt(4); - top_gold = (GButton)GetChildAt(6); - text_my_ads = (GTextField)GetChildAt(8); - btn_watch = (btn_watchAd1)GetChildAt(9); - panel_ad = (GGroup)GetChildAt(11); - btn_close = (GButton)GetChildAt(13); + com_head = (GButton)GetChildAt(1); + gold_list = (GList)GetChildAt(2); + top_gold = (GButton)GetChildAt(3); + text_my_ads = (GTextField)GetChildAt(5); + btn_watch = (btn_watchAd1)GetChildAt(6); + btn_close = (GButton)GetChildAt(7); } } } \ No newline at end of file diff --git a/Assets/Legend/Manager/FXManager.cs b/Assets/Legend/Manager/FXManager.cs index 2fc61a71..1546d86e 100644 --- a/Assets/Legend/Manager/FXManager.cs +++ b/Assets/Legend/Manager/FXManager.cs @@ -184,8 +184,8 @@ fx_btn_vip, fx_btn_album, fx_btn_live, - fx_pack_gold, - fx_no_ad, + fx_egg_light, + fx_egg, fx_play_button, fx_sign, fx_sign7, diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/1.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/1.png index e5c1b328..c211b871 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/1.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/1.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/10.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/10.png index 20dc6946..4bbcb1b8 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/10.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/10.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/11.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/11.png index 33a36fbe..8b616443 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/11.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/11.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/12.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/12.png index d71783cd..2c3a5157 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/12.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/12.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/2.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/2.png index 811288ab..0b01679b 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/2.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/2.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/3.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/3.png index 3c9e17d0..c8b4dc91 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/3.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/3.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/4.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/4.png index 97016b47..57091484 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/4.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/4.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/5.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/5.png index 8215be2e..73dbdf9a 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/5.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/5.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/6.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/6.png index 5650ee8f..a3a21dba 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/6.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/6.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/7.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/7.png index c9e7dae4..a1349b03 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/7.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/7.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/8.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/8.png index 6b237b45..0e3a86e1 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/8.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/8.png differ diff --git a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/9.png b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/9.png index c835aa85..938fd388 100644 Binary files a/Assets/Resources/LoveLegendAssets/Atlas/Avatar/9.png and b/Assets/Resources/LoveLegendAssets/Atlas/Avatar/9.png differ diff --git a/Assets/Resources/LoveLegendAssets/Audio/egg.mp3 b/Assets/Resources/LoveLegendAssets/Audio/egg.mp3 new file mode 100644 index 00000000..f46dfce4 Binary files /dev/null and b/Assets/Resources/LoveLegendAssets/Audio/egg.mp3 differ diff --git a/Assets/Resources/LoveLegendAssets/Audio/egg.mp3.meta b/Assets/Resources/LoveLegendAssets/Audio/egg.mp3.meta new file mode 100644 index 00000000..5429ecdc --- /dev/null +++ b/Assets/Resources/LoveLegendAssets/Audio/egg.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: aff30176378de484a876187ff1bb5734 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/fx_add_box.prefab b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/fx_add_box.prefab deleted file mode 100644 index 4ecef903..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/fx_add_box.prefab +++ /dev/null @@ -1,125 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &6370662756761607514 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 561512823629169263} - - component: {fileID: 3775735963607805121} - - component: {fileID: 8952928207636871191} - - component: {fileID: 3420851697556392948} - m_Layer: 0 - m_Name: fx_add_box - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &561512823629169263 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6370662756761607514} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3775735963607805121 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6370662756761607514} - m_Mesh: {fileID: 0} ---- !u!23 &8952928207636871191 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6370662756761607514} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f0c8887b4be774b5cb1b877c1467bf36, type: 2} - - {fileID: 2100000, guid: 15d854c35f69d44e782a19b7b30fc097, type: 2} - - {fileID: 2100000, guid: f0c8887b4be774b5cb1b877c1467bf36, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3420851697556392948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6370662756761607514} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 571ecd61dd2e1c949a63988e8acbc349, type: 2} - initialSkinName: - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - _animationName: - loop: 1 - timeScale: 1 diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/fx_add_box.prefab.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/fx_add_box.prefab.meta deleted file mode 100644 index b13f5791..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/fx_add_box.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 74c10f1ebfdf91a4391a6c175ff89e45 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: effect.spine.gamwin.assetbundle - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.atlas.txt b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.atlas.txt deleted file mode 100644 index 5bc57099..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.atlas.txt +++ /dev/null @@ -1,76 +0,0 @@ - -kuogezi.png -size: 806,196 -format: RGBA8888 -filter: Linear,Linear -repeat: none -banzi - rotate: false - xy: 2, 89 - size: 704, 105 - orig: 704, 105 - offset: 0, 0 - index: -1 -pa1 - rotate: true - xy: 708, 4 - size: 85, 89 - orig: 85, 89 - offset: 0, 0 - index: -1 -pa2 - rotate: true - xy: 2, 2 - size: 85, 89 - orig: 85, 89 - offset: 0, 0 - index: -1 -pa3 - rotate: true - xy: 93, 2 - size: 85, 89 - orig: 85, 89 - offset: 0, 0 - index: -1 -pa4 - rotate: true - xy: 184, 2 - size: 85, 89 - orig: 85, 89 - offset: 0, 0 - index: -1 -pa5 - rotate: true - xy: 275, 2 - size: 85, 89 - orig: 85, 89 - offset: 0, 0 - index: -1 -pa6 - rotate: true - xy: 366, 2 - size: 85, 89 - orig: 85, 89 - offset: 0, 0 - index: -1 -pai7 - rotate: true - xy: 457, 2 - size: 85, 89 - orig: 85, 89 - offset: 0, 0 - index: -1 -pai8 - rotate: true - xy: 548, 4 - size: 83, 89 - orig: 85, 89 - offset: 1, 0 - index: -1 -plus1 - rotate: false - xy: 708, 91 - size: 96, 103 - orig: 96, 103 - offset: 0, 0 - index: -1 diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.atlas.txt.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.atlas.txt.meta deleted file mode 100644 index 3175b96c..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.atlas.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e16ecc5b0c09f45469ff8a268c6ba124 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.json b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.json deleted file mode 100644 index 4b52a508..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"OMznucPO12SHSKuohpzlPRwku7Y","spine":"3.8.93","x":-352,"y":-52.5,"width":704,"height":105,"images":"./images/","audio":"D:/1122334455/大富翁/动效/kuogezi"},"bones":[{"name":"root"},{"name":"banzi","parent":"root"},{"name":"pai8","parent":"root"},{"name":"pai88","parent":"root","x":203.88,"y":57.01},{"name":"bone","parent":"root","x":280.28,"y":54.22}],"slots":[{"name":"banzi","bone":"banzi","attachment":"banzi"},{"name":"pa1","bone":"root","attachment":"pa1"},{"name":"pa2","bone":"root","attachment":"pa2"},{"name":"pa3","bone":"root","attachment":"pa3"},{"name":"pa4","bone":"root","attachment":"pa4"},{"name":"pa5","bone":"root","attachment":"pa5"},{"name":"pa6","bone":"root","attachment":"pa6"},{"name":"pai7","bone":"root","attachment":"pai7"},{"name":"pai8","bone":"pai88","attachment":"pai8"},{"name":"plus1","bone":"bone","attachment":"plus1"}],"skins":[{"name":"default","attachments":{"banzi":{"banzi":{"width":704,"height":105}},"pa1":{"pa1":{"x":-291.83,"y":-0.07,"width":85,"height":89}},"pa2":{"pa2":{"x":-208.66,"y":-0.07,"width":85,"height":89}},"pa3":{"pa3":{"x":-125.39,"y":-0.07,"width":85,"height":89}},"pa4":{"pa4":{"x":-41.71,"y":-0.07,"width":85,"height":89}},"pa5":{"pa5":{"x":42.49,"y":-0.07,"width":85,"height":89}},"pa6":{"pa6":{"x":126.65,"y":-0.07,"width":85,"height":89}},"pai7":{"pai7":{"x":210.67,"y":-0.07,"width":85,"height":89}},"pai8":{"pai8":{"x":89.36,"y":-57.08,"width":85,"height":89}},"plus1":{"plus1":{"x":22.69,"y":-54.65,"width":96,"height":103}}}}],"animations":{"animation":{"slots":{"pai8":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00","curve":"stepped"},{"time":0.6,"color":"ffffff00"},{"time":0.7333,"color":"ffffffff","curve":"stepped"},{"time":1.2333,"color":"ffffffff","curve":"stepped"},{"time":1.4333,"color":"ffffffff","curve":"stepped"},{"time":2.3667,"color":"ffffffff"},{"time":2.4667,"color":"ffffff00"}]},"plus1":{"color":[{"time":0.3333,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]}},"bones":{"pai88":{"rotate":[{"angle":-31.01,"curve":"stepped"},{"time":0.4667,"angle":-31.01,"curve":"stepped"},{"time":0.6,"angle":-31.01,"curve":"stepped"},{"time":0.7333,"angle":-31.01},{"time":1.2333,"curve":"stepped"},{"time":1.4333,"curve":"stepped"},{"time":2.3667,"curve":"stepped"},{"time":2.4667}],"translate":[{"x":101.6,"y":126.85,"curve":"stepped"},{"time":0.4667,"x":101.6,"y":126.85,"curve":"stepped"},{"time":0.6,"x":101.6,"y":126.85,"curve":"stepped"},{"time":0.7333,"x":101.6,"y":126.85},{"time":1.2333,"y":-3.39},{"time":1.4333,"curve":"stepped"},{"time":2.3667,"curve":"stepped"},{"time":2.4667}]},"bone":{"translate":[{"y":3.4},{"time":0.1667},{"time":0.3333,"y":2.04}],"scale":[{"time":0.3333},{"time":0.6667,"x":1.539,"y":1.539}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.json.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.json.meta deleted file mode 100644 index 772578c7..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ff23bc16ddf24ed44a3df4f016ebbdf6 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.png b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.png deleted file mode 100644 index 5b17cb69..00000000 Binary files a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.png and /dev/null differ diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Atlas.asset b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Atlas.asset deleted file mode 100644 index 1307cafb..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Atlas.asset +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: kuogezi_Atlas - m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: e16ecc5b0c09f45469ff8a268c6ba124, type: 3} - materials: - - {fileID: 2100000, guid: b9170a706298b2341a3bd27182699bf9, type: 2} diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Atlas.asset.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Atlas.asset.meta deleted file mode 100644 index 8b5b5ed5..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 359fc89440650864680e0c7be9604e22 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Material.mat b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Material.mat deleted file mode 100644 index d0738571..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Material.mat +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: kuogezi_Material - m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 4a108ce088ccb8a48a5e46c6a7904bd6, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _OutlineMipLevel: 0 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _StencilComp: 8 - - _StencilRef: 0 - - _StraightAlphaInput: 0 - - _ThresholdEnd: 0.25 - - _Use8Neighbourhood: 1 - m_Colors: - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Material.mat.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Material.mat.meta deleted file mode 100644 index ef6e2c07..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b9170a706298b2341a3bd27182699bf9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_SkeletonData.asset b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_SkeletonData.asset deleted file mode 100644 index 06b2649d..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_SkeletonData.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: kuogezi_SkeletonData - m_EditorClassIdentifier: - atlasAssets: - - {fileID: 11400000, guid: 359fc89440650864680e0c7be9604e22, type: 2} - scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: ff23bc16ddf24ed44a3df4f016ebbdf6, type: 3} - isUpgradingBlendModeMaterials: 0 - blendModeMaterials: - requiresBlendModeMaterials: 0 - applyAdditiveMaterial: 0 - additiveMaterials: [] - multiplyMaterials: [] - screenMaterials: [] - skeletonDataModifiers: [] - fromAnimation: [] - toAnimation: [] - duration: [] - defaultMix: 0.2 - controller: {fileID: 0} diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_SkeletonData.asset.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_SkeletonData.asset.meta deleted file mode 100644 index f4e6c486..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi_SkeletonData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 571ecd61dd2e1c949a63988e8acbc349 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins.meta deleted file mode 100644 index a5841e3e..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec6bd7283249bf146bae4d942a19fc6b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/fx_wins.prefab b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/fx_wins.prefab deleted file mode 100644 index 65d1e163..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/fx_wins.prefab +++ /dev/null @@ -1,123 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7911276371097549189 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4175739190531402542} - - component: {fileID: 5244133773901813421} - - component: {fileID: 6664751217500399377} - - component: {fileID: 4355167145121591020} - m_Layer: 0 - m_Name: fx_wins - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4175739190531402542 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7911276371097549189} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5244133773901813421 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7911276371097549189} - m_Mesh: {fileID: 0} ---- !u!23 &6664751217500399377 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7911276371097549189} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 4d56d14a420820e4699423903789551a, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4355167145121591020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7911276371097549189} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: fc00cab6697d8184399955c9d812c188, type: 2} - initialSkinName: - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - _animationName: - loop: 0 - timeScale: 1 diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/fx_wins.prefab.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/fx_wins.prefab.meta deleted file mode 100644 index f916a096..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/fx_wins.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f8761df55211a3143b837bbaac100338 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.atlas.txt b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.atlas.txt deleted file mode 100644 index 4d70c427..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.atlas.txt +++ /dev/null @@ -1,125 +0,0 @@ - -win_money22.png -size: 482,821 -format: RGBA8888 -filter: Linear,Linear -repeat: none -jinbi1 - rotate: true - xy: 191, 60 - size: 137, 184 - orig: 139, 186 - offset: 1, 1 - index: -1 -jinbi2 - rotate: false - xy: 2, 6 - size: 161, 153 - orig: 163, 155 - offset: 1, 1 - index: -1 -jinbi3 - rotate: false - xy: 246, 341 - size: 204, 192 - orig: 206, 194 - offset: 1, 1 - index: -1 -jinbi4 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi10 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi11 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi12 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi13 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi5 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi6 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi7 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi8 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -jinbi9 - rotate: true - xy: 377, 2 - size: 195, 97 - orig: 197, 99 - offset: 1, 1 - index: -1 -light - rotate: true - xy: 246, 199 - size: 140, 225 - orig: 140, 225 - offset: 0, 0 - index: -1 -yingzi1 - rotate: true - xy: 2, 161 - size: 139, 187 - orig: 141, 189 - offset: 1, 1 - index: -1 -yingzi2 - rotate: false - xy: 2, 302 - size: 242, 231 - orig: 244, 233 - offset: 1, 1 - index: -1 -yingzi_all - rotate: false - xy: 2, 535 - size: 478, 284 - orig: 478, 284 - offset: 0, 0 - index: -1 diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.json b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.json deleted file mode 100644 index f0f78bde..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"go0/t/GWrHuT4lSt25astGz8iss","spine":"3.8.93","x":-239,"y":-19.16,"width":478,"height":315.16,"images":"./images/","audio":"D:/冬季战争/动效/胜利_金币"},"bones":[{"name":"root"},{"name":"jinbi3","parent":"root"},{"name":"jinbi4","parent":"root"},{"name":"jinbi5","parent":"root"},{"name":"jinbi6","parent":"root"},{"name":"jinbi7","parent":"root"},{"name":"jinbi8","parent":"root"},{"name":"jinbi9","parent":"root"},{"name":"jinbi10","parent":"root"},{"name":"jinbi11","parent":"root"},{"name":"jinbi12","parent":"root"},{"name":"jinbi13","parent":"root"},{"name":"yingzi1","parent":"root"},{"name":"yingzi2","parent":"root"},{"name":"jinbi1","parent":"root"},{"name":"jinbi2","parent":"root"},{"name":"jiancai","parent":"root"},{"name":"yingzi_all","parent":"root"},{"name":"light","parent":"root"}],"slots":[{"name":"yingzi_all","bone":"yingzi_all","attachment":"yingzi_all"},{"name":"jinbi13","bone":"jinbi13","attachment":"jinbi13"},{"name":"jinbi12","bone":"jinbi12","attachment":"jinbi12"},{"name":"jinbi11","bone":"jinbi11","attachment":"jinbi11"},{"name":"jinbi10","bone":"jinbi10","attachment":"jinbi10"},{"name":"jinbi9","bone":"jinbi9","attachment":"jinbi9"},{"name":"jinbi8","bone":"jinbi8","attachment":"jinbi8"},{"name":"jinbi7","bone":"jinbi7","attachment":"jinbi7"},{"name":"jinbi6","bone":"jinbi6","attachment":"jinbi6"},{"name":"jinbi4","bone":"jinbi4","attachment":"jinbi4"},{"name":"jinbi5","bone":"jinbi5","attachment":"jinbi5"},{"name":"jinbi2","bone":"jinbi2","attachment":"jinbi2"},{"name":"yingzi2","bone":"yingzi2","attachment":"yingzi2","blend":"multiply"},{"name":"jinbi3","bone":"jinbi3","attachment":"jinbi3"},{"name":"yingzi1","bone":"yingzi1","attachment":"yingzi1","blend":"multiply"},{"name":"jinbi1","bone":"jinbi1","attachment":"jinbi1"},{"name":"jiancai","bone":"jiancai","attachment":"jiancai"},{"name":"light","bone":"light","color":"ffffff7f","attachment":"light"}],"skins":[{"name":"default","attachments":{"jiancai":{"jiancai":{"type":"clipping","end":"jiancai","vertexCount":85,"vertices":[8.35,248.21,17.67,250.21,39.65,253.54,56.61,254.85,79.94,255.58,99.38,254.61,117.61,252.18,135.83,248.54,147.98,244.4,159.16,239.3,166.45,233.71,170.34,226.91,170.34,218.89,170.82,173.21,183.71,167.42,195.17,160.87,206.64,151.27,216.23,140.74,224.89,128.11,230.51,114.25,234.02,98.34,233.55,85.71,230.74,71.9,224.66,59.97,213.19,47.8,205.94,40.54,197.41,34.6,181.03,28.29,164.18,25.71,147.1,27.35,132.83,31.09,118.32,37.18,107.55,44.67,107.32,24.31,104.98,19.16,96.91,12.37,84.51,6.52,59.47,-0.03,41.22,-2.13,19.69,-4.01,-7.45,-3.77,-24.54,-2.37,-53.32,3.48,-77.19,13.31,-84.67,21.27,-87.25,25.48,-86.55,41.39,-126.33,42.56,-138.96,28.99,-156.98,17.52,-169.38,13.78,-183.19,14.01,-187.87,15.42,-201.21,15.88,-215.25,23.37,-224.84,35.54,-230.69,48.88,-234.43,69,-235.6,88.89,-233.03,109.72,-230.46,120.33,-228.58,128.28,-224.37,141.85,-215.48,160.11,-201.21,178.59,-190.68,187.95,-187.17,190.29,-187.4,223.05,-187.4,228.9,-187.4,264.7,-183.66,271.96,-176.64,277.11,-167.04,282.25,-153,286.7,-138.73,290.44,-118.37,293.25,-96.84,294.19,-78.36,294.19,-59.17,293.02,-35.3,289.04,-18.45,284.13,-8.39,279.68,0.74,274.06,6.35,268.21,7.29,260.73],"color":"ce3a3aff"}},"jinbi1":{"jinbi1":{"x":-167.5,"y":105,"width":139,"height":186}},"jinbi10":{"jinbi10":{"x":72.5,"y":207.5,"width":197,"height":99}},"jinbi11":{"jinbi11":{"x":72.5,"y":168.5,"width":197,"height":99}},"jinbi12":{"jinbi12":{"x":72.5,"y":129.5,"width":197,"height":99}},"jinbi13":{"jinbi13":{"x":72.5,"y":90.5,"width":197,"height":99}},"jinbi2":{"jinbi2":{"x":153.5,"y":101.5,"width":163,"height":155}},"jinbi3":{"jinbi3":{"x":8,"y":139,"width":206,"height":194}},"jinbi4":{"jinbi4":{"x":-90.5,"y":246.5,"width":197,"height":99}},"jinbi5":{"jinbi5":{"x":10.5,"y":44.5,"width":197,"height":99}},"jinbi6":{"jinbi6":{"x":-90.5,"y":206.5,"width":197,"height":99}},"jinbi7":{"jinbi7":{"x":-90.5,"y":167.5,"width":197,"height":99}},"jinbi8":{"jinbi8":{"x":-90.5,"y":128.5,"width":197,"height":99}},"jinbi9":{"jinbi9":{"x":-90.5,"y":89.5,"width":197,"height":99}},"light":{"light":{"x":-254.76,"y":151.04,"scaleX":1.8276,"scaleY":1.8276,"width":140,"height":225}},"yingzi1":{"yingzi1":{"x":-111.5,"y":134.5,"width":141,"height":189}},"yingzi2":{"yingzi2":{"x":96,"y":140.5,"width":244,"height":233}},"yingzi_all":{"yingzi_all":{"y":122.84,"width":478,"height":284}}}}],"animations":{"animation":{"slots":{"jinbi1":{"color":[{"color":"ffffff00"},{"time":0.5,"color":"ffffffff"}],"attachment":[{"time":0.5,"name":"jinbi1"}]},"jinbi2":{"color":[{"color":"ffffff00"},{"time":0.5,"color":"ffffffff"}],"attachment":[{"time":0.5,"name":"jinbi2"}]},"jinbi3":{"color":[{"color":"ffffff00"},{"time":0.4333,"color":"ffffffff"}],"attachment":[{"time":0.4333,"name":"jinbi3"}]},"jinbi4":{"color":[{"color":"ffffff00"},{"time":0.4333,"color":"ffffffff"}],"attachment":[{"time":0.4333,"name":"jinbi4"}]},"jinbi5":{"color":[{"color":"ffffff00"},{"time":0.3667,"color":"ffffffff"}],"attachment":[{"time":0.3667,"name":"jinbi5"}]},"jinbi6":{"color":[{"color":"ffffff00"},{"time":0.3667,"color":"ffffffff"}],"attachment":[{"time":0.3667,"name":"jinbi6"}]},"jinbi7":{"color":[{"color":"ffffff00"},{"time":0.3,"color":"ffffffff"}],"attachment":[{"time":0.3,"name":"jinbi7"}]},"jinbi8":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff"}],"attachment":[{"time":0.2333,"name":"jinbi8"}]},"jinbi9":{"color":[{"color":"ffffff00"},{"time":0.1667,"color":"ffffffff"}],"attachment":[{"time":0.1667,"name":"jinbi9"}]},"jinbi10":{"color":[{"color":"ffffff00"},{"time":0.4,"color":"ffffffff"}],"attachment":[{"time":0.4,"name":"jinbi10"}]},"jinbi11":{"color":[{"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}],"attachment":[{"time":0.3333,"name":"jinbi11"}]},"jinbi12":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"}],"attachment":[{"time":0.2667,"name":"jinbi12"}]},"jinbi13":{"color":[{"color":"ffffff00"},{"time":0.2,"color":"ffffffff"}],"attachment":[{"time":0.2,"name":"jinbi13"}]},"yingzi1":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5333,"color":"ffffffff"}],"attachment":[{"time":0.5333,"name":"yingzi1"}]},"yingzi2":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.3333,"color":"ffffff00"},{"time":0.6667,"color":"ffffffff"}],"attachment":[{"time":0.6667,"name":"yingzi2"}]},"yingzi_all":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.5,"color":"ffffff00"},{"time":0.6667,"color":"ffffffff"}]}},"bones":{"jinbi2":{"translate":[{"y":44.39},{"time":0.5}]},"yingzi1":{"translate":[{"curve":"stepped"},{"time":0.2667,"curve":"stepped"},{"time":0.5333}]},"jinbi3":{"translate":[{"y":44.39},{"time":0.4333}]},"yingzi2":{"translate":[{"curve":"stepped"},{"time":0.3333,"curve":"stepped"},{"time":0.6667}]},"jinbi5":{"translate":[{"y":44.39},{"time":0.3667}]},"jinbi4":{"translate":[{"y":44.39},{"time":0.4333}]},"jinbi6":{"translate":[{"y":44.39},{"time":0.3667}]},"jinbi7":{"translate":[{"y":44.39},{"time":0.3}]},"jinbi8":{"translate":[{"y":44.39},{"time":0.2333}]},"jinbi9":{"translate":[{"y":44.39},{"time":0.1667}]},"jinbi10":{"translate":[{"y":44.39},{"time":0.4}]},"jinbi11":{"translate":[{"y":44.39},{"time":0.3333}]},"jinbi12":{"translate":[{"y":44.39},{"time":0.2667}]},"jinbi13":{"translate":[{"y":44.39},{"time":0.2}]},"jinbi1":{"translate":[{"y":44.39},{"time":0.5}]}}},"animation2":{"slots":{"light":{"color":[{"color":"ffffff80","curve":0.25,"c3":0.75},{"time":0.6667,"color":"ffffff00","curve":"stepped"},{"time":1.1333,"color":"ffffff00","curve":0.25,"c3":0.75},{"time":1.1667,"color":"ffffff80"},{"time":1.6667,"color":"ffffff00","curve":"stepped"},{"time":3,"color":"ffffff00"}]}},"bones":{"light":{"translate":[{"x":-27.35,"curve":0.25,"c3":0.75},{"time":0.6667,"x":598.42,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-27.35,"curve":0.25,"c3":0.75},{"time":1.6667,"x":598.42},{"time":3,"x":-27.35}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.png b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.png deleted file mode 100644 index 80dcda07..00000000 Binary files a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.png and /dev/null differ diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Atlas.asset b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Atlas.asset deleted file mode 100644 index ea43bc67..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Atlas.asset +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: win_money22_Atlas - m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 2836fadc6f61cb045adea16d5080c2d3, type: 3} - materials: - - {fileID: 2100000, guid: 5c8a5cbc16cd36e4694ea87c47b3b793, type: 2} diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Atlas.asset.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Atlas.asset.meta deleted file mode 100644 index 69f7d21f..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ba05694d82b66e44998bdbcab382c36c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material-Multiply.mat b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material-Multiply.mat deleted file mode 100644 index 9a4dd9ff..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material-Multiply.mat +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: win_money22_Material-Multiply - m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - : - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: a78280460ed65434b965fc73d781028d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - : 0 - - _Cutoff: 0.1 - - _OutlineMipLevel: 0 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _StencilComp: 8 - - _StencilRef: 0 - - _StraightAlphaInput: 1 - - _ThresholdEnd: 0.25 - - _Use8Neighbourhood: 1 - m_Colors: - - : {r: 0, g: 2.018574, b: 1e-45, a: 0.000007110106} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material-Multiply.mat.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material-Multiply.mat.meta deleted file mode 100644 index 65f9a2ec..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material-Multiply.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b08ecbb2903acba46a74724733cde5d0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material.mat b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material.mat deleted file mode 100644 index a2d5762c..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: win_money22_Material - m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: a78280460ed65434b965fc73d781028d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _OutlineMipLevel: 0 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _StencilComp: 8 - - _StencilRef: 0 - - _StraightAlphaInput: 1 - - _ThresholdEnd: 0.25 - - _Use8Neighbourhood: 1 - m_Colors: - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material.mat.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material.mat.meta deleted file mode 100644 index 53633b23..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5c8a5cbc16cd36e4694ea87c47b3b793 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_SkeletonData.asset b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_SkeletonData.asset deleted file mode 100644 index 8f8aa663..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_SkeletonData.asset +++ /dev/null @@ -1,33 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: win_money22_SkeletonData - m_EditorClassIdentifier: - atlasAssets: - - {fileID: 11400000, guid: ba05694d82b66e44998bdbcab382c36c, type: 2} - scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: a27cfea0dd9b3f44ea5ddae371858bcf, type: 3} - isUpgradingBlendModeMaterials: 0 - blendModeMaterials: - requiresBlendModeMaterials: 1 - applyAdditiveMaterial: 0 - additiveMaterials: [] - multiplyMaterials: - - pageName: win_money22.png - material: {fileID: 2100000, guid: b08ecbb2903acba46a74724733cde5d0, type: 2} - screenMaterials: [] - skeletonDataModifiers: [] - fromAnimation: [] - toAnimation: [] - duration: [] - defaultMix: 0.2 - controller: {fileID: 0} diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_SkeletonData.asset.meta b/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_SkeletonData.asset.meta deleted file mode 100644 index 8ff64175..00000000 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22_SkeletonData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fc00cab6697d8184399955c9d812c188 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/FGUI/LG_Common_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/LG_Common_fui.bytes index c2133627..91ed75c9 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/LG_Common_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/LG_Common_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0.png new file mode 100644 index 00000000..15c5f048 Binary files /dev/null and b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.png.meta b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0.png.meta similarity index 87% rename from Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.png.meta rename to Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0.png.meta index dd11b519..494ce63e 100644 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box/kuogezi.png.meta +++ b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 4a108ce088ccb8a48a5e46c6a7904bd6 +guid: 5f96e21b7014b0c43b67c9a1afaf14fb TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -106,6 +106,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0_1.png b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0_1.png new file mode 100644 index 00000000..52af685c Binary files /dev/null and b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0_1.png differ diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.png.meta b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0_1.png.meta similarity index 87% rename from Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.png.meta rename to Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0_1.png.meta index 1243e813..38cbad6f 100644 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.png.meta +++ b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_atlas0_1.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: a78280460ed65434b965fc73d781028d +guid: fe5792f7aaa317540a8b8ffe88265748 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -106,6 +106,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Assets/Resources/LoveLegendAssets/FGUI/LG_End_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_fui.bytes new file mode 100644 index 00000000..7de144a9 Binary files /dev/null and b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.json.meta b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_fui.bytes.meta similarity index 75% rename from Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.json.meta rename to Assets/Resources/LoveLegendAssets/FGUI/LG_End_fui.bytes.meta index 09c88809..8e18933b 100644 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.json.meta +++ b/Assets/Resources/LoveLegendAssets/FGUI/LG_End_fui.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a27cfea0dd9b3f44ea5ddae371858bcf +guid: 0ea1755811dd5464990ab3f54b2bdadf TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_atlas0.png new file mode 100644 index 00000000..426171f0 Binary files /dev/null and b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_atlas0.png.meta b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_atlas0.png.meta new file mode 100644 index 00000000..370bd4da --- /dev/null +++ b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_atlas0.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 25fa10d7f5f73f04facee01284ed0668 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_fui.bytes new file mode 100644 index 00000000..03694f95 Binary files /dev/null and b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.atlas.txt.meta b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_fui.bytes.meta similarity index 75% rename from Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.atlas.txt.meta rename to Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_fui.bytes.meta index 18a8a81c..16fb1279 100644 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_wins/win_money22.atlas.txt.meta +++ b/Assets/Resources/LoveLegendAssets/FGUI/LG_LuckyGift_fui.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2836fadc6f61cb045adea16d5080c2d3 +guid: 3e122ff0d0fcaf44a8b2609b582bb46f TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_atlas0.png index 61db55e6..d91bba69 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_fui.bytes index 06ad45de..2b246b7b 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_AddCell_12_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_atlas0.png index 95e6ae29..fa53ee20 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_fui.bytes index b34f7391..e07af14f 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Common_01_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_atlas0.png index 442c0bdc..a7aab51e 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_fui.bytes index 69cb638d..5101c64d 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Game_04_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0.png index cc82b8e9..a9a4c6ea 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0_1.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0_1.png index 0f8659b0..01f5d585 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0_1.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_atlas0_1.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_fui.bytes index 6dfc544c..7609bcd0 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Img_02_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Lobby_03_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Lobby_03_fui.bytes index db1921e9..798e7e24 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Lobby_03_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Lobby_03_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_atlas0.png index 30703a0a..3584b8ae 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_fui.bytes index 90800bb7..83f72923 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pack_16_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_atlas0.png index 3cbd773e..2b8a488b 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_fui.bytes index 107616b4..8d77d511 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Pass_14_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Privacy_24_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Privacy_24_fui.bytes index e10f3cd6..d70e98b3 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Privacy_24_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Privacy_24_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_atlas0.png index 9205303b..770b3778 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_fui.bytes index 0a1c6f25..f9b2b782 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Prop_09_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_atlas0.png index cd187f9e..a27bab3f 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_fui.bytes index 95507125..008a735e 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_Setting_07_fui.bytes differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_atlas0.png b/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_atlas0.png index 5dc07da0..fe8bfc04 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_atlas0.png and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_atlas0.png differ diff --git a/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_fui.bytes b/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_fui.bytes index 6b4cc564..b6af2041 100644 Binary files a/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_fui.bytes and b/Assets/Resources/LoveLegendAssets/FGUI/ZM_store_17_fui.bytes differ diff --git a/Assets/Resources/card/bg_img/game_bg.png b/Assets/Resources/card/bg_img/game_bg.png index 1e76c051..319e5f25 100644 Binary files a/Assets/Resources/card/bg_img/game_bg.png and b/Assets/Resources/card/bg_img/game_bg.png differ diff --git a/Assets/Resources/card/bg_img/match_bg_down.png b/Assets/Resources/card/bg_img/match_bg_down.png index ea4b9ccc..728b6f13 100644 Binary files a/Assets/Resources/card/bg_img/match_bg_down.png and b/Assets/Resources/card/bg_img/match_bg_down.png differ diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 6de5a0a3..c8139de3 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -2179,7 +2179,7 @@ Transform: m_GameObject: {fileID: 2076036131} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.1132, y: -32, z: 400} + m_LocalPosition: {x: 0.1132, y: -32.26, z: 400} m_LocalScale: {x: 5.2, y: 5.2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2231,7 +2231,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 1 - m_Size: {x: 10.28, y: 1.68} + m_Size: {x: 10.28, y: 1.92} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Scripts/Define/Constant/AudioConst.cs b/Assets/Scripts/Define/Constant/AudioConst.cs index a33434b0..c65cef6a 100644 --- a/Assets/Scripts/Define/Constant/AudioConst.cs +++ b/Assets/Scripts/Define/Constant/AudioConst.cs @@ -13,6 +13,7 @@ namespace LoveLegend public const string MakeupDone = "makupdone"; public const string wheel_spin = "wheel_spin"; public const string game_open = "game_open"; + public const string egg = "egg"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/CtrlConst.cs b/Assets/Scripts/ModuleManager/CtrlConst.cs index 80258ebc..1a054166 100644 --- a/Assets/Scripts/ModuleManager/CtrlConst.cs +++ b/Assets/Scripts/ModuleManager/CtrlConst.cs @@ -75,5 +75,6 @@ namespace LoveLegend public const string ChatUnlockCtrl = "ChatUnlockCtrl"; public const string UnlockLevelNewCtrl = "UnlockLevelNewCtrl"; public const string BroadcastCtrl = "BroadcastCtrl"; + public const string EggViewCtrl = "EggViewCtrl"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/ModelConst.cs b/Assets/Scripts/ModuleManager/ModelConst.cs index 4ec5a589..4524bc07 100644 --- a/Assets/Scripts/ModuleManager/ModelConst.cs +++ b/Assets/Scripts/ModuleManager/ModelConst.cs @@ -73,5 +73,6 @@ namespace LoveLegend public const string ChatUnlockModel = "ChatUnlockModel"; public const string UnlockLevelNewModel = "UnlockLevelNewModel"; public const string BroadcastModel = "BroadcastModel"; + public const string EggViewModel = "EggViewModel"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs index fd1afeef..5b7f2517 100644 --- a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs +++ b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs @@ -66,6 +66,7 @@ namespace LoveLegend moduleManager.AddModel(ModelConst.ChatUnlockModel, new ChatUnlockModel()); moduleManager.AddModel(ModelConst.UnlockLevelNewModel, new UnlockLevelNewModel()); moduleManager.AddModel(ModelConst.BroadcastModel, new BroadcastModel()); + moduleManager.AddModel(ModelConst.EggViewModel, new EggViewModel()); } public static void AutoRegisterUICtrl() { @@ -132,6 +133,7 @@ namespace LoveLegend moduleManager.AddUICtrl(UICtrlConst.ChatUnlockUICtrl, new ChatUnlockUICtrl()); moduleManager.AddUICtrl(UICtrlConst.UnlockLevelNewUICtrl, new UnlockLevelNewUICtrl()); moduleManager.AddUICtrl(UICtrlConst.BroadcastUICtrl, new BroadcastUICtrl()); + moduleManager.AddUICtrl(UICtrlConst.EggViewUICtrl, new EggViewUICtrl()); } public static void AutoRegisterCtrl() @@ -205,6 +207,7 @@ namespace LoveLegend moduleManager.AddCtrl(CtrlConst.ChatUnlockCtrl, new ChatUnlockCtrl()); moduleManager.AddCtrl(CtrlConst.UnlockLevelNewCtrl, new UnlockLevelNewCtrl()); moduleManager.AddCtrl(CtrlConst.BroadcastCtrl, new BroadcastCtrl()); + moduleManager.AddCtrl(CtrlConst.EggViewCtrl, new EggViewCtrl()); } public static void AutoRegisterUIType() @@ -275,6 +278,7 @@ namespace LoveLegend moduleManager.AddUIType(UIConst.ChatUnlockUI, typeof(ChatUnlockUI)); moduleManager.AddUIType(UIConst.UnlockLevelNewUI, typeof(UnlockLevelNewUI)); moduleManager.AddUIType(UIConst.BroadcastUI, typeof(BroadcastUI)); + moduleManager.AddUIType(UIConst.EggViewUI, typeof(EggViewUI)); } } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/UIConst.cs b/Assets/Scripts/ModuleManager/UIConst.cs index 4ddf56b4..e50d54a0 100644 --- a/Assets/Scripts/ModuleManager/UIConst.cs +++ b/Assets/Scripts/ModuleManager/UIConst.cs @@ -72,5 +72,6 @@ namespace LoveLegend public const string ChatUnlockUI = "ChatUnlockUI"; public const string UnlockLevelNewUI = "UnlockLevelNewUI"; public const string BroadcastUI = "BroadcastUI"; + public const string EggViewUI = "EggViewUI"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/UICtrlConst.cs b/Assets/Scripts/ModuleManager/UICtrlConst.cs index ae1863d1..6515971e 100644 --- a/Assets/Scripts/ModuleManager/UICtrlConst.cs +++ b/Assets/Scripts/ModuleManager/UICtrlConst.cs @@ -73,5 +73,6 @@ namespace LoveLegend public const string ChatUnlockUICtrl = "ChatUnlockUICtrl"; public const string UnlockLevelNewUICtrl = "UnlockLevelNewUICtrl"; public const string BroadcastUICtrl = "BroadcastUICtrl"; + public const string EggViewUICtrl = "EggViewUICtrl"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs b/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs index b45a8b5f..a5e4902f 100644 --- a/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs +++ b/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs @@ -129,9 +129,9 @@ namespace LoveLegend { - var add = FXManager.Instance.SetFx(ui.anim_bg, Fx_Type.fx_add_box, ref closeCallback); - add.state.SetAnimation(0, "animation", true); - + // var add = FXManager.Instance.SetFx(ui.anim_bg, Fx_Type.fx_add_box, ref closeCallback); + // add.state.SetAnimation(0, "animation", true); + // ui.btn_close.SetClick(() => { @@ -150,8 +150,9 @@ namespace LoveLegend var need = AdExchangeManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.buy_one)); var myAd = AdExchangeManager.Instance.GetLookRewardADNum(); - ui.tips.SetVar("num", need.ToString()).FlushVars(); - ui.ads.SetVar("num", myAd.ToString()).FlushVars(); + ui.text_watch_ad.SetVar("needNum", need.ToString()).FlushVars(); + ui.tips.SetVar("needAds", need.ToString()).FlushVars(); + ui.tips.SetVar("myAds", myAd.ToString()).FlushVars(); } } } diff --git a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box.meta b/Assets/Scripts/ModuleUI/EggView.meta similarity index 77% rename from Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box.meta rename to Assets/Scripts/ModuleUI/EggView.meta index 5d8b8681..b0d8c4dd 100644 --- a/Assets/Resources/LoveLegendAssets/Effect/spine/fx_add_box.meta +++ b/Assets/Scripts/ModuleUI/EggView.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8008712e62e8f7041bc92f9bcfcc0512 +guid: c23093e37adc66e49843e8f8461079c6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs b/Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs new file mode 100644 index 00000000..211b8f1b --- /dev/null +++ b/Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs @@ -0,0 +1,41 @@ +namespace LoveLegend +{ + public class EggViewCtrl : BaseCtrl + { + public static EggViewCtrl Instance { get; private set; } + + private EggViewModel model; + + #region 生命周期 + protected override void OnInit() + { + Instance = this; + } + + protected override void OnDispose() + { + Instance = null; + } + #endregion + + #region 消息 + protected override void AddListener() + { + + } + protected override void RemoveListener() + { + + } + + protected override void AddServerListener() + { + + } + protected override void RemoveServerListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/btn_set.cs.meta b/Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs.meta similarity index 83% rename from Assets/Legend/FGUI/package/ZM_Game_04/btn_set.cs.meta rename to Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs.meta index 57bc7ff9..562e1181 100644 --- a/Assets/Legend/FGUI/package/ZM_Game_04/btn_set.cs.meta +++ b/Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c372980445904e95b373f26a433b323 +guid: d3803112939619946876e619a76f3d54 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ModuleUI/EggView/EggViewModel.cs b/Assets/Scripts/ModuleUI/EggView/EggViewModel.cs new file mode 100644 index 00000000..c7827816 --- /dev/null +++ b/Assets/Scripts/ModuleUI/EggView/EggViewModel.cs @@ -0,0 +1,26 @@ +namespace LoveLegend +{ + public class EggViewModel : BaseModel + { + #region 生命周期 + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + #endregion + + #region 消息 + protected override void AddListener() + { + + } + protected override void RemoveListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_AddCell_12/btn_buy_one.cs.meta b/Assets/Scripts/ModuleUI/EggView/EggViewModel.cs.meta similarity index 83% rename from Assets/Legend/FGUI/package/ZM_AddCell_12/btn_buy_one.cs.meta rename to Assets/Scripts/ModuleUI/EggView/EggViewModel.cs.meta index c4c348f5..2dd75481 100644 --- a/Assets/Legend/FGUI/package/ZM_AddCell_12/btn_buy_one.cs.meta +++ b/Assets/Scripts/ModuleUI/EggView/EggViewModel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bfaadc02693e00340a8101e85bfb5ee1 +guid: fe27e3874dd51074dbc15d58f78c35c1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ModuleUI/EggView/EggViewUI.cs b/Assets/Scripts/ModuleUI/EggView/EggViewUI.cs new file mode 100644 index 00000000..f9702591 --- /dev/null +++ b/Assets/Scripts/ModuleUI/EggView/EggViewUI.cs @@ -0,0 +1,236 @@ + +using System; +using System.Collections.Generic; +using DG.Tweening; +using FairyGUI; +using FGUI.Egg_20; +using FGUI.ZM_Common_01; +using Spine.Unity; +using UnityEngine; +using Random = UnityEngine.Random; + +namespace LoveLegend +{ + public class EggViewUI : BaseUI + { + private EggViewUICtrl ctrl; + + private FGUI.Egg_20.com_egg ui; + + private Action closeCallback; + private bool isShowAnim = false; + + public EggViewUI(EggViewUICtrl ctrl) : base(ctrl) + { + uiName = UIConst.EggViewUI; + this.ctrl = ctrl; + } + + protected override void SetUIInfo(UIInfo uiInfo) + { + uiInfo.packageName = "Egg_20"; + uiInfo.assetName = "com_egg"; + uiInfo.layerType = UILayerType.Popup; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; + uiInfo.isNeedUIMask = true; + + } + + #region 生命周期 + protected override void OnInit() + { + } + + protected override void OnClose() + { + + } + + protected override void OnBind() + { + ui = baseUI as FGUI.Egg_20.com_egg; + + } + + private List eggList = new List(); + + protected override void OnOpenBefore(object args) + { + + if (Screen.safeArea.y != 0) + { + ui.com_gold.y += Screen.safeArea.y; + } + + eggList.Add(ui.egg_item0); + eggList.Add(ui.egg_item1); + eggList.Add(ui.egg_item2); + eggList.Add(ui.egg_item3); + + InitView(); + } + + + protected override void OnOpen(object args) + { + } + + protected override void OnHide() + { + } + + protected override void OnDisplay(object args) + { + } + #endregion + + #region 消息 + protected override void AddListener() + { + + } + protected override void RemoveListener() + { + + } + #endregion + + + //初始化页面逻辑 + private void InitView() + { + ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber()); + + int start = GameHelper.GetCommonModel().eggReward[0]; + int end = GameHelper.GetCommonModel().eggReward[1]; + int randomNumber = Random.Range(start, end + 1); + + setCliamStatus(false); + ui.btn_claim.visible = false; + + ui.btn_close.SetClick(() => + { + if (isShowAnim) + { + GetReward(randomNumber); + } + else + { + CtrlCloseUI(); + } + }); + ui.btn_claim.SetClick(() => + { + if (isShowAnim) + { + DOVirtual.DelayedCall(2f, () => { + GameHelper.addInterAdnumber(); + }); + GetReward(randomNumber); + } + }); + ui.btn_claim_mult.SetClick(() => + { + if (isShowAnim) + { + GameHelper.ShowVideoAd("reward_lobby", isSuccess => { + if (isSuccess) { + ui.btn_claim.SetClick(() => { }); + ui.btn_claim_mult.SetClick(() => { }); + GetReward(randomNumber * 2); + GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); + } + }); + } + }); + + for (int i = 0; i < eggList.Count; i++) + { + int index = i; + eggList[index].egg_state.selectedIndex = 0; + eggList[index].SetClick(() => + { + eggList[index].egg.visible = false; + setEggClickStatus(false); + if (AudioManager.Instance.IsOpenEffect) + { + AudioManager.Instance.PlayDynamicEffect(AudioConst.egg); + } + + eggList[index].text_num.text = "x" + GameHelper.Get101Str(randomNumber); + var ani_node = eggList[index].GetChild("anim_bg") as GGraph; + var sk = FXManager.Instance.SetFx(ani_node, Fx_Type.fx_egg_light, ref closeCallback); + sk.state.SetAnimation(0, "animation", false); + sk.state.Complete += (a) => + { + isShowAnim = true; + var sk1 = FXManager.Instance.SetFx(eggList[index].GetChild("anim_bg1") as GGraph, Fx_Type.fx_egg, ref closeCallback); + sk1.state.SetAnimation(0, "animation", true); + eggList[index].egg_state.selectedIndex = 1; + + setCliamStatus(true); + }; + }); + } + } + + void setCliamStatus(bool show) + { + ui.btn_claim_mult.visible = show; + + DOVirtual.DelayedCall(1f, () => + { + ui.btn_claim.visible = show; + }); + } + + void setEggClickStatus(bool isClick) + { + foreach (var item in eggList) + { + item.touchable = isClick; + } + } + + private void GetReward(int awardNum) + { + isShowAnim = false; + var rewardData = new RewardData(); + var start_pos = GameHelper.GetUICenterPosition(ui.btn_claim_mult); + var end = GameHelper.GetUICenterPosition(ui.com_gold); + + var rewardSingleData = new RewardSingleData(101, awardNum, RewardOrigin.AdTask) + { + startPosition = start_pos, + endPosition = new Vector2(end.x, end.y) + }; + + rewardData.AddReward(rewardSingleData); + rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; + rewardData.AddCompleted(success => + { + if (success) + { + var startNum = DataMgr.Coin.Value - awardNum; + + DOVirtual.Float((float)startNum, (float)GameHelper.GetGoldNumber(), 1f, + value => { ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); }).OnComplete(() => { + // 动画完成时确保最终值被正确设置 + ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)DataMgr.Coin.Value); + }); + + DOVirtual.DelayedCall(1.2f, () => + { + CtrlCloseUI(); + }); + + SaveData.GetSaveObject().crush_egg_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().eggCD; + SaveData.SaveDataFunc(); + } + + }); + GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); + } + } +} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/com_game_menu.cs.meta b/Assets/Scripts/ModuleUI/EggView/EggViewUI.cs.meta similarity index 83% rename from Assets/Legend/FGUI/package/ZM_Game_04/com_game_menu.cs.meta rename to Assets/Scripts/ModuleUI/EggView/EggViewUI.cs.meta index 1e717cb3..4bba9181 100644 --- a/Assets/Legend/FGUI/package/ZM_Game_04/com_game_menu.cs.meta +++ b/Assets/Scripts/ModuleUI/EggView/EggViewUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 379efd07b3dfc4ba7a193bcf4e665ba3 +guid: f1b74d7e01fd3f241a8c8890ebbacd2b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs b/Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs new file mode 100644 index 00000000..85367f22 --- /dev/null +++ b/Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs @@ -0,0 +1,90 @@ + +namespace LoveLegend +{ + public class EggViewUICtrl : BaseUICtrl + { + private readonly uint closeUIMsg = UICtrlMsg.EggUI_Close; + private EggViewModel model; + + private readonly uint openUIMsg = UICtrlMsg.EggUI_Open; + private EggViewUI ui; + + private void OnSignInUI_Display(object obj) + { + if (obj != null) + { + var isShow = (bool)obj; + if (isShow) + ui?.Display(); + else + ui?.Hide(); + } + } + + #region 生命周期 + + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + public override void OpenUI(object args = null) + { + if (ui == null) + { + ui = new EggViewUI(this); + ui.Open(args); + } + + } + + public override void CloseUI(object args = null) + { + if (ui != null && !ui.isClose) + { + ui.Close(); + } + + ui = null; + } + + #endregion + + #region 消息 + + public override uint GetOpenUIMsg(string uiName) + { + return openUIMsg; + } + + public override uint GetCloseUIMsg(string uiName) + { + return closeUIMsg; + } + + protected override void AddListener() + { + uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); + uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); + } + + protected override void RemoveListener() + { + uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); + uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); + } + + protected override void AddServerListener() + { + } + + protected override void RemoveServerListener() + { + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Legend/FGUI/package/ZM_Game_04/btn_exit.cs.meta b/Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs.meta similarity index 83% rename from Assets/Legend/FGUI/package/ZM_Game_04/btn_exit.cs.meta rename to Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs.meta index 9dd84eff..4da6579a 100644 --- a/Assets/Legend/FGUI/package/ZM_Game_04/btn_exit.cs.meta +++ b/Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9953ee9b5c32048b18cc5586269eaa3c +guid: 3554c7ca8ae3b1e4f8a1158028d732d3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ModuleUI/Hall/HallUI.cs b/Assets/Scripts/ModuleUI/Hall/HallUI.cs index d6a53383..9efddcf2 100644 --- a/Assets/Scripts/ModuleUI/Hall/HallUI.cs +++ b/Assets/Scripts/ModuleUI/Hall/HallUI.cs @@ -422,6 +422,16 @@ namespace LoveLegend } } + int eggTime = SaveData.GetSaveObject().crush_egg_time; + if (eggTime > GameHelper.GetNowTime()) + { + ui.btn_egg.GetChild("times").visible = true; + ui.btn_egg.GetChild("times").text = CommonHelper.TimeFormat(eggTime - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Minute); + } + else + { + ui.btn_egg.GetChild("times").visible = false; + } } @@ -475,6 +485,7 @@ namespace LoveLegend // ui.btn_secret.SetClick(OnClickSecretAlbums); ui.btn_vip.SetClick(onClickVip); + ui.btn_egg.SetClick(OnClickEgg); btn_noads.SetClick(() => { if (!SaveData.GetSaveObject().is_get_packreward && !SaveData.GetSaveObject().is_get_removead) @@ -711,7 +722,7 @@ namespace LoveLegend } private void OnClickSetting() { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 1); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 0); } private void OnClickPass() { @@ -754,6 +765,16 @@ namespace LoveLegend } } } + + private void OnClickEgg() + { + if (ui.btn_egg.GetChild("times").visible) + { + GameHelper.ShowTips("Waiting_cd", true); + return; + } + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.EggUI_Open); + } private void onClickVip() { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.VipClubViewUI_Open); diff --git a/Assets/Scripts/ModuleUI/LuckyPack/LuckyPackUI.cs b/Assets/Scripts/ModuleUI/LuckyPack/LuckyPackUI.cs index 60ad5ed3..7cd033a9 100644 --- a/Assets/Scripts/ModuleUI/LuckyPack/LuckyPackUI.cs +++ b/Assets/Scripts/ModuleUI/LuckyPack/LuckyPackUI.cs @@ -44,11 +44,11 @@ namespace LoveLegend GameDispatcher.Instance.Dispatch(GameMsg.pack_close); int three_gift_got_index = SaveData.GetSaveObject().three_gift_got_index; - if (GameHelper.isAutoPop && (three_gift_got_index <= (int)rewardState.day3)) - { - uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open); - GameHelper.isAutoPop = false; - } + // if (GameHelper.isAutoPop && (three_gift_got_index <= (int)rewardState.day3)) + // { + // uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open); + // GameHelper.isAutoPop = false; + // } GameHelper.CallShowTurn(); } @@ -96,12 +96,14 @@ namespace LoveLegend // // TextureHelper.SetImgLoader(ui.lucky_pic.picture, fileName1, null, "Background/"); - var fileName = GameHelper.GetBackgroundName(1); - var task = new List<(GLoader loader, string fileName, Action callback, string folder, string localFolder)>(); - task.Add((ui.lucky_pic.picture, fileName, null, "Background/", FolderNames.BackgroundName)); - var fileName1 = GameHelper.GetBackgroundName(2); - task.Add((ui.no_ad_pic.picture, fileName1, null, "Background/", FolderNames.BackgroundName)); - TextureHelper.SetImgLoaders(task); + + + // var fileName = GameHelper.GetBackgroundName(1); + // var task = new List<(GLoader loader, string fileName, Action callback, string folder, string localFolder)>(); + // task.Add((ui.lucky_pic.picture, fileName, null, "Background/", FolderNames.BackgroundName)); + // var fileName1 = GameHelper.GetBackgroundName(2); + // task.Add((ui.no_ad_pic.picture, fileName1, null, "Background/", FolderNames.BackgroundName)); + // TextureHelper.SetImgLoaders(task); } protected override void OnOpen(object args) @@ -215,6 +217,7 @@ namespace LoveLegend ui.text_time.SetVar("time", ConfigSystem.GetCommonConf().RemoveADsPackDuration.ToString()).FlushVars(); ui.btn_close.SetClick(CtrlCloseUI); + ui.btn_luck_close.SetClick(CtrlCloseUI); ui.text_goldnum.text = "x" + GameHelper.Get101Str(gold_num); ui.text_backnum1.text = "x" + back_num; ui.text_outnum.text = "x" + out_num; diff --git a/Assets/Scripts/ModuleUI/Menu/MenuUI.cs b/Assets/Scripts/ModuleUI/Menu/MenuUI.cs index 78dd686b..a7a909ce 100644 --- a/Assets/Scripts/ModuleUI/Menu/MenuUI.cs +++ b/Assets/Scripts/ModuleUI/Menu/MenuUI.cs @@ -1,12 +1,9 @@ +using FGUI.ZM_Common_01; using FGUI.ZM_Setting_07; using SGModule.ApplePay; using SGModule.Common.Extensions; using SGModule.Net; - - -// using FGUI.G006_menu; - using UnityEngine; namespace LoveLegend @@ -61,7 +58,7 @@ namespace LoveLegend if (args != null) { var type = (int)args; - ui.btn_back_home.visible = type == 2; //type： 1是大厅 2是游戏 + ui.isHall.selectedIndex = type; //type： 0是大厅 1是游戏 } if (Screen.safeArea.y != 0) { @@ -103,11 +100,15 @@ namespace LoveLegend protected override void AddListener() { HallManager.Instance.AddChangeGiftSwitch(InitView); + PreferencesDispatcher.Instance.AddListener(DataMsg.playerAvatarId, UpdataAvatar); + } protected override void RemoveListener() { HallManager.Instance.RemoveChangeGiftSwitch(InitView); + PreferencesDispatcher.Instance.RemoveListener(DataMsg.playerAvatarId, UpdataAvatar); + } #endregion @@ -116,12 +117,17 @@ namespace LoveLegend { ui.com_gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}"; - - var namStr = GameHelper.GetUserName(); + ui.edit_name.input.text = namStr; + ui.edit_name.btn_amend.SetClick(SaveName); + + var headId = DataMgr.PlayerAvatarId.Value; + GameHelper.SetSelfAvatar((ui.btn_head.head as head)?.load_avatar, headId); - - + ui.btn_head.SetClick(() => + { + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PersonViewUI_Open); + }); ui.btn_back.SetClick(OnCloseView); ui.btn_music.SetClick(OnClickSetMusic); ui.btn_sound.SetClick(OnClickSoundBtn); @@ -179,7 +185,51 @@ namespace LoveLegend }); } + + private void UpdataAvatar(object obj = null) + { + var headId = DataMgr.PlayerAvatarId.Value; + if (obj != null) + { + headId = obj.As>().newValue; + } + var head = ui.btn_head.head as head; + if (head != null) + { + // var vipLevel = GameHelper.GetVipLevel(); + // if (vipLevel > 0) + // { + // head.head.vip_loader.visible = true; + // head.vip_loader.url = $"ui://LG_Common/vip_{vipLevel}"; + // } + // else + // { + // head.vip_loader.visible = false; + // } + GameHelper.SetSelfAvatar(head.load_avatar, headId); + } + } + + private void SaveName() + { + var name = ui.edit_name.input.text; + if (string.IsNullOrEmpty(name) || name.IsNullOrWhiteSpace()) + { + GameHelper.ShowTips("empty_input", true); + return; + } + + // if (name.Equals(GameHelper.GetPlayerInviteCode())) + // { + // return; + // } + + if (name.Equals(DataMgr.PlayerName.Value)) return; + + GameHelper.ShowTips($"save_name",true); + DataMgr.PlayerName.Value = name; + } private void SetVersion() { diff --git a/Assets/Scripts/ModuleUI/NewEnd/NewEndUI.cs b/Assets/Scripts/ModuleUI/NewEnd/NewEndUI.cs index 615918b3..76bb5017 100644 --- a/Assets/Scripts/ModuleUI/NewEnd/NewEndUI.cs +++ b/Assets/Scripts/ModuleUI/NewEnd/NewEndUI.cs @@ -163,23 +163,23 @@ namespace LoveLegend Debug.Log(delayTime); Debug.Log("/////////////////6"); ui.step.selectedIndex = 1; - var anim_bg = FXManager.Instance.SetFx(ui.GetChild("bg_parent") as GGraph, Fx_Type.fx_end_bg, ref closeCallback); + // var anim_bg = FXManager.Instance.SetFx(ui.GetChild("bg_parent") as GGraph, Fx_Type.fx_end_bg, ref closeCallback); if (successData_.IsWin) { - anim_bg.state.SetAnimation(0, "win", false); - anim_bg.state.Complete += (trackEntry) => - { - anim_bg.state.SetAnimation(0, "win_stop", true); - }; + // anim_bg.state.SetAnimation(0, "win", false); + // anim_bg.state.Complete += (trackEntry) => + // { + // anim_bg.state.SetAnimation(0, "win_stop", true); + // }; var fireworks = FXManager.Instance.SetFx(ui.GetChild("congra_parent") as GGraph, Fx_Type.fx_win, ref closeCallback); fireworks.state.SetAnimation(0, "out", true); - var coin = FXManager.Instance.SetFx(ui.GetChild("coin_parent") as GGraph, Fx_Type.fx_wins, ref closeCallback); - coin.state.SetAnimation(0, "animation", true); - coin.state.Complete += (trackEntry) => - { - coin.state.SetAnimation(0, "animation2", true); - }; + // var coin = FXManager.Instance.SetFx(ui.GetChild("coin_parent") as GGraph, Fx_Type.fx_wins, ref closeCallback); + // coin.state.SetAnimation(0, "animation", true); + // coin.state.Complete += (trackEntry) => + // { + // coin.state.SetAnimation(0, "animation2", true); + // }; if (SaveData.GetSaveObject().LargeRewardNum < ConfigSystem.GetCommonConf().FreeClaims) ((btn_claim3)ui.btn_mult).state.selectedIndex = 1; @@ -217,11 +217,11 @@ namespace LoveLegend } else { - anim_bg.state.SetAnimation(0, "lose", false); - anim_bg.state.Complete += (trackEntry) => - { - anim_bg.state.SetAnimation(0, "lose_stop", true); - }; + // anim_bg.state.SetAnimation(0, "lose", false); + // anim_bg.state.Complete += (trackEntry) => + // { + // anim_bg.state.SetAnimation(0, "lose_stop", true); + // }; ui.btn_restart.SetClick(() => { diff --git a/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs b/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs index 6b3d9b63..17c655f2 100644 --- a/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs +++ b/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs @@ -49,20 +49,20 @@ namespace LoveLegend { DOVirtual.DelayedCall(0.7f, () => { GameDispatcher.Instance.Dispatch(GameMsg.reset_game, args); }); InitView(); - DOVirtual.DelayedCall(0.2f, () => - { - if (GameHelper.GetLevel() - 1 < ConfigSystem.GetConfig().Count&&GameHelper.IsGiftSwitch()) - { - LevelUnlock levelUnlock_ = ConfigSystem.GetConfig()[GameHelper.GetLevel() - 1]; - if (levelUnlock_.LeveType != 0) - { - if (!DataMgr.LevelUnlockList.Value.Contains(GameHelper.GetLevel() - 1)) - { - uiCtrlDispatcher.Dispatch(UICtrlMsg.UnlockLevelUI_Open, GameHelper.GetLevel() - 1); - } - } - } - }); + // DOVirtual.DelayedCall(0.2f, () => + // { + // if (GameHelper.GetLevel() - 1 < ConfigSystem.GetConfig().Count&&GameHelper.IsGiftSwitch()) + // { + // LevelUnlock levelUnlock_ = ConfigSystem.GetConfig()[GameHelper.GetLevel() - 1]; + // if (levelUnlock_.LeveType != 0) + // { + // if (!DataMgr.LevelUnlockList.Value.Contains(GameHelper.GetLevel() - 1)) + // { + // uiCtrlDispatcher.Dispatch(UICtrlMsg.UnlockLevelUI_Open, GameHelper.GetLevel() - 1); + // } + // } + // } + // }); @@ -105,21 +105,21 @@ namespace LoveLegend ui.text_level.text = stage; - DOVirtual.DelayedCall(0.2f, () => + DOVirtual.DelayedCall(0.7f, () => { - ui.tips_node1.visible = true; - var open_bg = FXManager.Instance.SetFx(ui.tips_node1, Fx_Type.fx_open_bg, ref closeCallback); - open_bg.state.SetAnimation(0, "animation", true); - ui.tips_node1.SetScale(1.25f, 1.25f); - - ui.tips_node.visible = true; - var open_game = FXManager.Instance.SetFx(ui.tips_node, Fx_Type.fx_open, ref closeCallback); - open_game.state.SetAnimation(0, "animation", false); - open_game.state.Complete += (a) => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Close); - }; - + // ui.tips_node1.visible = true; + // var open_bg = FXManager.Instance.SetFx(ui.tips_node1, Fx_Type.fx_open_bg, ref closeCallback); + // open_bg.state.SetAnimation(0, "animation", true); + // ui.tips_node1.SetScale(1.25f, 1.25f); + // + // ui.tips_node.visible = true; + // var open_game = FXManager.Instance.SetFx(ui.tips_node, Fx_Type.fx_open, ref closeCallback); + // open_game.state.SetAnimation(0, "animation", false); + // open_game.state.Complete += (a) => + // { + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Close); + // }; + }); } } diff --git a/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs b/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs index e8c72dd2..a9f6cbe9 100644 --- a/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs +++ b/Assets/Scripts/ModuleUI/PassView/PassViewUI.cs @@ -67,10 +67,7 @@ namespace LoveLegend { HallManager.Instance.UpdateSecondEvent += upData; InitView(); - - var head = ui.head as btn_head; - var headId = DataMgr.PlayerAvatarId.Value; - GameHelper.SetSelfAvatar(head.head.load_avatar, headId); + } protected override void OnOpen(object args) { @@ -152,7 +149,6 @@ namespace LoveLegend { ui.close.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PassViewUI_Close); }); - ui.btn_recive.ad_icon.visible = false; ui.gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}"; passing_list = ConfigSystem.GetConfig(); @@ -232,9 +228,9 @@ namespace LoveLegend { } void setItemUrl(GLoader loader, int urltype) { if (urltype == 0) - loader.url = "ui://ZM_Pass_14/mp_reward_premium"; + loader.url = "ui://ZM_Pass_14/bbq_gold02"; else if (urltype == 4) - loader.url = "ui://ZM_Pass_14/mp_reward_premium"; + loader.url = "ui://ZM_Pass_14/bbq_gold02"; else if (urltype == 1) loader.url = "ui://ZM_Common_01/triple_game_dj_001"; else if (urltype == 2) @@ -379,8 +375,8 @@ namespace LoveLegend { item.free_item.type.selectedIndex = 0; item.pay_item.type.selectedIndex = 1; - EnsureListHasAnimation(free_anims, index, item.free_item.anim_parent, Fx_Type.fx_pass_free); - EnsureListHasAnimation(pay_anims, index, item.pay_item.anim_parent, Fx_Type.fx_pass_premium); + // EnsureListHasAnimation(free_anims, index, item.free_item.anim_parent, Fx_Type.fx_pass_free); + // EnsureListHasAnimation(pay_anims, index, item.pay_item.anim_parent, Fx_Type.fx_pass_premium); List freelist = SaveData.GetSaveObject().battle_pass_freelist; List paylist = SaveData.GetSaveObject().battle_pass_paylist; @@ -411,25 +407,24 @@ namespace LoveLegend { item.free_item.state.selectedIndex = 2; item.free_item.SetClick(() => { }); item.free_item.btn_claim.SetClick(() => { }); - free_anims[index - 1].state.SetAnimation(0, "get2", true); + // free_anims[index - 1].state.SetAnimation(0, "get2", true); } else { if (getRewardIndex < 0) getRewardIndex = index; - free_anims[index - 1].state.SetAnimation(0, "appear", true); + // free_anims[index - 1].state.SetAnimation(0, "appear", true); item.free_item.state.selectedIndex = 1; item.free_item.btn_claim.SetClick(() => { - free_anims[index - 1].state.SetAnimation(0, "get", false); - free_anims[index - 1].state.Complete += (trackEntry) => { - free_anims[index - 1].state.SetAnimation(0, "get2", true); - }; - - DOVirtual.DelayedCall(0.9f, () => { - freelist.Add(index); - SaveData.SaveDataFunc(); - // GameHelper.ShowTips("claim_succ", true); - seItemClick(item.free_item, Passportrewards_list[index - 1].Free_rewards_num, Passportrewards_list[index - 1].Free_rewards_type, index - 1); - }); + // free_anims[index - 1].state.SetAnimation(0, "get", false); + // free_anims[index - 1].state.Complete += (trackEntry) => { + // free_anims[index - 1].state.SetAnimation(0, "get2", true); + // }; + + freelist.Add(index); + SaveData.SaveDataFunc(); + // GameHelper.ShowTips("claim_succ", true); + seItemClick(item.free_item, Passportrewards_list[index - 1].Free_rewards_num, Passportrewards_list[index - 1].Free_rewards_type, index - 1); + }); } @@ -438,30 +433,28 @@ namespace LoveLegend { item.pay_item.state.selectedIndex = 2; item.pay_item.SetClick(() => { }); item.pay_item.btn_claim.SetClick(() => { }); - pay_anims[index - 1].state.SetAnimation(0, "get2", true); + // pay_anims[index - 1].state.SetAnimation(0, "get2", true); } else { if (SaveData.GetSaveObject().is_get_battlepass) { if (getRewardIndex < 0) getRewardIndex = index; - pay_anims[index - 1].state.SetAnimation(0, "appear", true); + // pay_anims[index - 1].state.SetAnimation(0, "appear", true); item.pay_item.state.selectedIndex = 1; item.pay_item.btn_claim.SetClick(() => { - pay_anims[index - 1].state.SetAnimation(0, "get", false); - pay_anims[index - 1].state.Complete += (trackEntry) => { + // pay_anims[index - 1].state.SetAnimation(0, "get", false); + // pay_anims[index - 1].state.Complete += (trackEntry) => { + // + // pay_anims[index - 1].state.SetAnimation(0, "get2", true); + // + // }; - pay_anims[index - 1].state.SetAnimation(0, "get2", true); + paylist.Add(index); + SaveData.SaveDataFunc(); + seItemClick(item.pay_item, Passportrewards_list[index - 1].Paid_rewards_num, Passportrewards_list[index - 1].Paid_rewards_type, -1); - }; - - DOVirtual.DelayedCall(0.9f, () => { - paylist.Add(index); - SaveData.SaveDataFunc(); - seItemClick(item.pay_item, Passportrewards_list[index - 1].Paid_rewards_num, Passportrewards_list[index - 1].Paid_rewards_type, -1); - - GameHelper.ShowTips("claim_succ", true); - }); + GameHelper.ShowTips("claim_succ", true); }); } diff --git a/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs b/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs index ad684372..0c46fc56 100644 --- a/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs +++ b/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs @@ -13,7 +13,7 @@ namespace LoveLegend private PersonViewModel model; private int selectIndex = -1; - private int total_item; + private int total_item = 12; private FGUI.ZM_Setting_07.com_person ui; public PersonViewUI(PersonViewUICtrl ctrl) : base(ctrl) @@ -57,7 +57,6 @@ namespace LoveLegend // { // ui.title.y += Screen.safeArea.y; // } - total_item = 8; selectIndex = DataMgr.PlayerAvatarId.Value; UnityManager.ShezhiACT(false); InitView(); @@ -100,10 +99,10 @@ namespace LoveLegend { - var namStr = GameHelper.GetUserName(); - ui.edit_name.input.text = namStr; + // var namStr = GameHelper.GetUserName(); + // ui.edit_name.input.text = namStr; ui.btn_update.SetClick(UpdateUserInfo); - ui.edit_name.btn_amend.SetClick(SaveName); + // ui.edit_name.btn_amend.SetClick(SaveName); ui.btn_close.SetClick(CtrlCloseUI); ui.list.itemRenderer = UpdateItem; @@ -139,7 +138,7 @@ namespace LoveLegend DataMgr.PlayerAvatarId.Value = selectIndex; } - SaveName(); + // SaveName(); CtrlCloseUI(); } diff --git a/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs b/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs index 0800fd14..4c2a41ef 100644 --- a/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs +++ b/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs @@ -150,7 +150,7 @@ namespace LoveLegend // ui.btn_game_menu.SetClickDownEffect(1.0f); ui.btn_game_menu.SetClick(() => { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 2); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 1); // OnBackToHall(); }); upData(); @@ -422,7 +422,7 @@ namespace LoveLegend ui.fairyBatching = true; int level = GameHelper.GetLevel(); - ui.com_stage.text_level.SetVar("lv", level.ToString()).FlushVars(); + ui.com_stage.text_level.text = level.ToString(); Debug.Log(jsonstr); if (jsonstr == null) { @@ -993,7 +993,7 @@ namespace LoveLegend void SetLeveldiff() { int level = GameHelper.GetLevel(); - ui.com_stage.text_level.SetVar("lv", level + "").FlushVars(); + ui.com_stage.text_level.text = level.ToString(); // if (level > type_array.Length) level = type_array.Length; diff --git a/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs b/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs index 7a71e290..1f81fd11 100644 --- a/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs +++ b/Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs @@ -76,7 +76,7 @@ namespace LoveLegend string title = BisTerm ? Language.GetContent("terms_service") : Language.GetContent("privacy"); ui.title.text = isTerm == 2 ? "View Credits" : title; - var color = new Color(255 / 255f, 232 / 255f, 217 / 255f, 1f); + var color = new Color(172 / 255f, 131 / 255f, 113 / 255f, 1f); MarkdownKit.Instance.ShowAsRichText(ui.text_list, BisTerm ? "user" : "privacy", color, (success, state) => { if (success) { Debug.Log("内容加载成功！当前状态：" + state); diff --git a/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs b/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs index 027a7339..f3df7178 100644 --- a/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs +++ b/Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs @@ -47,16 +47,15 @@ namespace LoveLegend GameHelper.showGameUI = true; HallManager.Instance.UpdateSecondEvent -= initList; HallManager.Instance.UpdateSecondEvent -= upWatchAdsBtn; - HallManager.Instance.UpdateSecondEvent -= RemoveAdCountDown; GameDispatcher.Instance.Dispatch(GameMsg.pack_close); - if (Isbuysuccess) - { - GameHelper.ShowTurnOffReward(); - } - else - { - GameHelper.ShowPaidPack(); - } + // if (Isbuysuccess) + // { + // GameHelper.ShowTurnOffReward(); + // } + // else + // { + // GameHelper.ShowPaidPack(); + // } } private bool Isbuysuccess = false; protected override void OnBind() @@ -289,7 +288,6 @@ namespace LoveLegend private SkeletonAnimation no_ad_anims = null; private Action closeCallback = null; - private btn_get btn_remove_get = null; // private void UpdatePack(int index, GObject obj) // { @@ -476,29 +474,6 @@ namespace LoveLegend // } // } - - private void RemoveAdCountDown() - { - int cd = SaveData.GetSaveObject().remove_ad_time - Convert.ToInt32(GameHelper.GetNowTime()); - if (cd > 0) - { - if (cd > 24 * 3600) - { - btn_remove_get.title = CommonHelper.TimeFormat(cd, CountDownType.Day, "D"); - } - else - { - btn_remove_get.title = CommonHelper.TimeFormat(cd, CountDownType.Hour); - } - } - else - { - SaveData.GetSaveObject().is_get_removead = false; - SaveData.GetSaveObject().remove_ad_time = 0; - - } - } - void setRemaintime(int index, GObject obj) { buygold_item item = (buygold_item)obj; @@ -507,38 +482,35 @@ namespace LoveLegend time = SaveData.GetSaveObject()._goldtime[index]; item.coin_text.text = GameHelper.Get101Str(list[index].Actual_coins); - item.index.selectedIndex = index > 4 ? 4 : index; + item.index.selectedIndex = index > 6 ? 6 : index; bool is_paid = list[index].is_paid; + item.btn_buy.index.selectedIndex = 0; - item.off_text.text = list[index].Discount_rate + "%"; - item.discount.visible = !GameHelper.IsAdModelOfPay() && list[index].Discount_rate > 0; - - if (list[index].Discount_rate != 0) item.off_text.text = list[index].Discount_rate + "%"; - if (time + list[index].receive_CD < GameHelper.GetNowTime()) + // item.off_text.text = list[index].Discount_rate + "%"; + // item.discount.visible = !GameHelper.IsAdModelOfPay() && list[index].Discount_rate > 0; + // + // if (list[index].Discount_rate != 0) item.off_text.text = list[index].Discount_rate + "%"; + + if (AdExchangeManager.Instance.GetLookRewardADNum() >= list[index].Payment_amount) { - if (!is_paid) + if (!GameHelper.IsAdModelOfPay()) { - item.btn_buy.btn_text.text = Language.GetContent("free"); - item.discount.visible = false; + //支付 + decimal price = (decimal)list[index].Payment_amount2; + item.btn_buy.btn_text.text = GameHelper.getPrice(price); + + item.text_ads.visible = false; } else { - if (!GameHelper.IsAdModelOfPay()) - { - decimal price = (decimal)list[index].Payment_amount2; - item.btn_buy.btn_text.text = GameHelper.getPrice(price); - - item.text_ads.visible = false; - } - else - { - double gold_price1 = list[index].Payment_amount; - int needAds = (int)Math.Ceiling(gold_price1); - item.text_ads.SetVar("num", needAds.ToString()).FlushVars(); - item.btn_buy.btn_text.text = needAds + " ADs"; - } + //广告 + double gold_price1 = list[index].Payment_amount; + int needAds = (int)Math.Ceiling(gold_price1); + // item.text_ads.SetVar("num", needAds.ToString()).FlushVars(); + item.btn_buy.btn_text.text = needAds + " AD"; } - + item.btn_buy.index.selectedIndex = 1; + item.btn_buy.can_buy.selectedIndex = 0; item.btn_buy.SetClick(() => { @@ -566,13 +538,26 @@ namespace LoveLegend { double gold_price1 = list[index].Payment_amount; int needAds = (int)Math.Ceiling(gold_price1); - item.btn_buy.btn_text.text = needAds + " ADs"; + item.btn_buy.btn_text.text = needAds + " AD"; } - - item.btn_buy.btn_text.text = CommonHelper.TimeFormat( - time + list[index].receive_CD - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + item.btn_buy.SetClick(() => { }); } + + if (!is_paid) + { + if(time + list[index].receive_CD < GameHelper.GetNowTime()) + { + item.btn_buy.btn_text.text = Language.GetContent("free"); + } + else + { + item.btn_buy.can_buy.selectedIndex = 1; + item.btn_buy.btn_text.text = CommonHelper.TimeFormat( + time + list[index].receive_CD - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); + } + } + } private void rm_Gold(int index) diff --git a/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs b/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs index 126cf89b..bb91493d 100644 --- a/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs +++ b/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs @@ -135,7 +135,7 @@ namespace LoveLegend btn_sign btnSign = btnSignList[index];; btnSign.state.selectedIndex = 0; btnSign.title = signList[index].id + ""; - ui.btn_collect.state.selectedIndex = 1; + btnSign.touchable = false; btnSign.reward_num.text = GameHelper.Get101Str(signList[index].quantity[0]); @@ -149,6 +149,9 @@ namespace LoveLegend var isToday = true; if (signDays > 0) isToday = GameHelper.InToday(DataMgr.SignState.Value[signDays - 1], 0, true); + + ui.btn_collect.state.selectedIndex = index == signDays && !(signDays > 0 && isToday)? 0 : 1; + if (index < signDays) { btnSign.state.selectedIndex = 3; @@ -167,7 +170,6 @@ namespace LoveLegend btnSign.isCloseClickAnim = true; // btnSign.status.selectedIndex = btn_sign.State_today; - ui.btn_collect.state.selectedIndex = 0; ui.btn_collect.SetClick(() => { SetBtnClick(index); diff --git a/Assets/Scripts/Register/UIManagerRegister.cs b/Assets/Scripts/Register/UIManagerRegister.cs index b1beaab2..e977a4ba 100644 --- a/Assets/Scripts/Register/UIManagerRegister.cs +++ b/Assets/Scripts/Register/UIManagerRegister.cs @@ -46,6 +46,7 @@ namespace LoveLegend FGUI.LG_live.LG_liveBinder.BindAll(); FGUI.LG_secretAlbums.LG_secretAlbumsBinder.BindAll(); FGUI.LG_Unlock.LG_UnlockBinder.BindAll(); + FGUI.Egg_20.Egg_20Binder.BindAll(); } public static void AutoRegisterCommonPackages() diff --git a/Assets/Scripts/SavaData/SaveData.cs b/Assets/Scripts/SavaData/SaveData.cs index 65900f7f..215c63f3 100644 --- a/Assets/Scripts/SavaData/SaveData.cs +++ b/Assets/Scripts/SavaData/SaveData.cs @@ -196,5 +196,7 @@ namespace LoveLegend public int TurnOffNumbers; public int TurnOffDay; public long TurnOffTime; + + public int crush_egg_time; } } diff --git a/RedHotRoast-ios.sln.DotSettings.user b/RedHotRoast-ios.sln.DotSettings.user new file mode 100644 index 00000000..5928c4b2 --- /dev/null +++ b/RedHotRoast-ios.sln.DotSettings.user @@ -0,0 +1,2 @@ + + ForceIncluded \ No newline at end of file