diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast_text1.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast_text1.cs index 4bdd6ab..4705282 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast_text1.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast_text1.cs @@ -7,9 +7,7 @@ namespace FGUI.ACommon { public partial class com_broadcast_text1 : GComponent { - public GGraph bg_panel; public GRichTextField cast_text; - public GRichTextField hide_text; public GButton btn_broad; public const string URL = "ui://pmf3wbjiez6k22"; @@ -22,10 +20,8 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); - bg_panel = (GGraph)GetChildAt(0); cast_text = (GRichTextField)GetChildAt(1); - hide_text = (GRichTextField)GetChildAt(2); - btn_broad = (GButton)GetChildAt(3); + btn_broad = (GButton)GetChildAt(2); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs index 4c51820..f1ffcc2 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs @@ -7,10 +7,10 @@ namespace FGUI.ACommon { public partial class com_currency : GComponent { + public com_avatar com_avatar; public GButton settings; public btn_101 btn_coin; public btn_102 btn_cash; - public com_avatar com_avatar; public GGroup top_group; public const string URL = "ui://pmf3wbjiaxgih3"; @@ -23,10 +23,10 @@ namespace FGUI.ACommon { base.ConstructFromXML(xml); - settings = (GButton)GetChildAt(1); - btn_coin = (btn_101)GetChildAt(2); - btn_cash = (btn_102)GetChildAt(3); - com_avatar = (com_avatar)GetChildAt(4); + com_avatar = (com_avatar)GetChildAt(1); + settings = (GButton)GetChildAt(2); + btn_coin = (btn_101)GetChildAt(3); + btn_cash = (btn_102)GetChildAt(4); top_group = (GGroup)GetChildAt(5); } } diff --git a/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs b/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs index 4ece0b8..27735e9 100644 --- a/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs +++ b/Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs @@ -8,11 +8,11 @@ namespace FGUI.ACommon public partial class com_di : GComponent { public Controller gift; - public btn_main btn_main; + public btn_fight btn_main; public btn_h5 btn_shop; - public btn_todo btn_tab_redem; + public btn_todo btn_fight; public btn_hall btn_hall; - public btn_fight btn_fight; + public btn_main btn_tab_redem; public const string URL = "ui://pmf3wbjiokk5gf"; public static com_di CreateInstance() @@ -25,11 +25,11 @@ namespace FGUI.ACommon base.ConstructFromXML(xml); gift = GetControllerAt(0); - btn_main = (btn_main)GetChildAt(1); + btn_main = (btn_fight)GetChildAt(1); btn_shop = (btn_h5)GetChildAt(2); - btn_tab_redem = (btn_todo)GetChildAt(3); + btn_fight = (btn_todo)GetChildAt(3); btn_hall = (btn_hall)GetChildAt(4); - btn_fight = (btn_fight)GetChildAt(7); + btn_tab_redem = (btn_main)GetChildAt(7); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs b/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs index 92fc95b..22066ad 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs @@ -8,23 +8,10 @@ namespace FGUI.Common_01 { public static void BindAll() { - UIObjectFactory.SetPackageItemExtension(com_money.URL, typeof(com_money)); - UIObjectFactory.SetPackageItemExtension(btn_task_pass.URL, typeof(btn_task_pass)); UIObjectFactory.SetPackageItemExtension(btn_watchAd.URL, typeof(btn_watchAd)); UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1)); - UIObjectFactory.SetPackageItemExtension(btn_noads.URL, typeof(btn_noads)); UIObjectFactory.SetPackageItemExtension(btn_get.URL, typeof(btn_get)); - UIObjectFactory.SetPackageItemExtension(btn_task.URL, typeof(btn_task)); - UIObjectFactory.SetPackageItemExtension(btn_faq.URL, typeof(btn_faq)); - UIObjectFactory.SetPackageItemExtension(btn_buy1.URL, typeof(btn_buy1)); - UIObjectFactory.SetPackageItemExtension(btn_rank.URL, typeof(btn_rank)); UIObjectFactory.SetPackageItemExtension(com_adcoming.URL, typeof(com_adcoming)); - UIObjectFactory.SetPackageItemExtension(btn_max_buy.URL, typeof(btn_max_buy)); - UIObjectFactory.SetPackageItemExtension(btn_curr.URL, typeof(btn_curr)); - UIObjectFactory.SetPackageItemExtension(com_gold.URL, typeof(com_gold)); - UIObjectFactory.SetPackageItemExtension(btn_head.URL, typeof(btn_head)); - UIObjectFactory.SetPackageItemExtension(btn_claim3.URL, typeof(btn_claim3)); - UIObjectFactory.SetPackageItemExtension(com_add_points.URL, typeof(com_add_points)); UIObjectFactory.SetPackageItemExtension(wheel.URL, typeof(wheel)); UIObjectFactory.SetPackageItemExtension(item_wheel.URL, typeof(item_wheel)); UIObjectFactory.SetPackageItemExtension(wheel_.URL, typeof(wheel_)); @@ -34,12 +21,6 @@ namespace FGUI.Common_01 UIObjectFactory.SetPackageItemExtension(com_tips.URL, typeof(com_tips)); UIObjectFactory.SetPackageItemExtension(btn_saveingpot.URL, typeof(btn_saveingpot)); UIObjectFactory.SetPackageItemExtension(btn_yellow.URL, typeof(btn_yellow)); - UIObjectFactory.SetPackageItemExtension(btn_claim.URL, typeof(btn_claim)); - UIObjectFactory.SetPackageItemExtension(btn_boxreward.URL, typeof(btn_boxreward)); - UIObjectFactory.SetPackageItemExtension(btn_threeday.URL, typeof(btn_threeday)); - UIObjectFactory.SetPackageItemExtension(btn_card.URL, typeof(btn_card)); - UIObjectFactory.SetPackageItemExtension(btn_failpack.URL, typeof(btn_failpack)); - UIObjectFactory.SetPackageItemExtension(btn_luck_gift.URL, typeof(btn_luck_gift)); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs deleted file mode 100644 index 8204b30..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_boxreward : GButton - { - public Transition t0; - public const string URL = "ui://o9974uc5til24j"; - - public static btn_boxreward CreateInstance() - { - return (btn_boxreward)UIPackage.CreateObject("Common_01", "btn_boxreward"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs deleted file mode 100644 index 4f6fc16..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_buy1 : GButton - { - public GTextField text_gold; - public const string URL = "ui://o9974uc5irrg1e"; - - public static btn_buy1 CreateInstance() - { - return (btn_buy1)UIPackage.CreateObject("Common_01", "btn_buy1"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_gold = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs deleted file mode 100644 index b3caef9..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_card : GButton - { - public GImage red; - public const string URL = "ui://o9974uc5y1du2p"; - - public static btn_card CreateInstance() - { - return (btn_card)UIPackage.CreateObject("Common_01", "btn_card"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - red = (GImage)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs deleted file mode 100644 index 3aa8ce1..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_claim : GButton - { - public Controller state; - public GImage ad_icon; - public GImage img_saveingpot; - public const string URL = "ui://o9974uc5sebxc"; - - public static btn_claim CreateInstance() - { - return (btn_claim)UIPackage.CreateObject("Common_01", "btn_claim"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - ad_icon = (GImage)GetChildAt(1); - img_saveingpot = (GImage)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs deleted file mode 100644 index d6a9ace..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_claim3 : GButton - { - public Controller state; - public GImage ad_icon; - public GImage img_saveingpot; - public const string URL = "ui://o9974uc5peww38"; - - public static btn_claim3 CreateInstance() - { - return (btn_claim3)UIPackage.CreateObject("Common_01", "btn_claim3"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - ad_icon = (GImage)GetChildAt(1); - img_saveingpot = (GImage)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs.meta deleted file mode 100644 index 992adb7..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 30f6a0f4a68254f49a23286d6d85fe28 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs deleted file mode 100644 index b6b9bf7..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_curr : GButton - { - public GTextField text_value; - public const string URL = "ui://o9974uc5opwgc"; - - public static btn_curr CreateInstance() - { - return (btn_curr)UIPackage.CreateObject("Common_01", "btn_curr"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - text_value = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs.meta deleted file mode 100644 index 5c8dbba..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 15a5f002a23bd8247974ab8aba010886 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs deleted file mode 100644 index 5227701..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_failpack : GButton - { - public GTextField lab_time; - public const string URL = "ui://o9974uc5y1du2q"; - - public static btn_failpack CreateInstance() - { - return (btn_failpack)UIPackage.CreateObject("Common_01", "btn_failpack"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - lab_time = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs.meta deleted file mode 100644 index 8e52ef3..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3e9dd4b6c4102c84db60b173c0d52a30 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs deleted file mode 100644 index fbb9ffd..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_faq : GButton - { - public GTextField lab_time; - public const string URL = "ui://o9974uc5iec4aw"; - - public static btn_faq CreateInstance() - { - return (btn_faq)UIPackage.CreateObject("Common_01", "btn_faq"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - lab_time = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs.meta deleted file mode 100644 index d97a1c8..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5c3aeb8216e3c464394f79b00a64bffd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs deleted file mode 100644 index 6671884..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_head : GButton - { - public GLoader load_avatar; - public const string URL = "ui://o9974uc5opwgh"; - - public static btn_head CreateInstance() - { - return (btn_head)UIPackage.CreateObject("Common_01", "btn_head"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - load_avatar = (GLoader)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs.meta deleted file mode 100644 index 474282c..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 26c67053e1cadf240b513d736aec41f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs deleted file mode 100644 index 412159f..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_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.Common_01 -{ - public partial class btn_luck_gift : GButton - { - public GImage red; - public const string URL = "ui://o9974uc5ybesal"; - - public static btn_luck_gift CreateInstance() - { - return (btn_luck_gift)UIPackage.CreateObject("Common_01", "btn_luck_gift"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - red = (GImage)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs.meta deleted file mode 100644 index 89dd440..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 399f5945d21f665479f030d5b680eac5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs deleted file mode 100644 index a87c263..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_max_buy : GButton - { - public GImage img_saveingpot; - public const string URL = "ui://o9974uc5nrk720"; - - public static btn_max_buy CreateInstance() - { - return (btn_max_buy)UIPackage.CreateObject("Common_01", "btn_max_buy"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - img_saveingpot = (GImage)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs.meta deleted file mode 100644 index b4cfcb9..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 960e1d8ae6b843240b4458cab8c463e7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs deleted file mode 100644 index 762dbd0..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.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.Common_01 -{ - public partial class btn_noads : GButton - { - public Controller state; - public GImage img_ad; - public GImage img_pack; - public Transition t0; - public Transition t1; - public const string URL = "ui://o9974uc5cou6ba"; - - public static btn_noads CreateInstance() - { - return (btn_noads)UIPackage.CreateObject("Common_01", "btn_noads"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - img_ad = (GImage)GetChildAt(0); - img_pack = (GImage)GetChildAt(1); - t0 = GetTransitionAt(0); - t1 = GetTransitionAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs.meta deleted file mode 100644 index f8456fd..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5fa2a317837192641bc9171ed55f4c40 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs deleted file mode 100644 index c92bece..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_rank : GButton - { - public GImage red; - public com_add_points add_points; - public Transition t0; - public const string URL = "ui://o9974uc5iwfgb0"; - - public static btn_rank CreateInstance() - { - return (btn_rank)UIPackage.CreateObject("Common_01", "btn_rank"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - red = (GImage)GetChildAt(1); - add_points = (com_add_points)GetChildAt(2); - t0 = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs.meta deleted file mode 100644 index 82d8907..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2537573c11c29ab4999e0df6b14c85c1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs deleted file mode 100644 index c1bdf09..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_task : GButton - { - public GImage red; - public const string URL = "ui://o9974uc5fhzacg"; - - public static btn_task CreateInstance() - { - return (btn_task)UIPackage.CreateObject("Common_01", "btn_task"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - red = (GImage)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs.meta deleted file mode 100644 index 607d6eb..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5194e9401d7d3314d9ce13221d33debc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs deleted file mode 100644 index a7bcc26..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs +++ /dev/null @@ -1,29 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_task_pass : GButton - { - public GImage red; - public GProgressBar pass_pro; - public GTextField number_text; - public const string URL = "ui://o9974uc59eojh"; - - public static btn_task_pass CreateInstance() - { - return (btn_task_pass)UIPackage.CreateObject("Common_01", "btn_task_pass"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - red = (GImage)GetChildAt(1); - pass_pro = (GProgressBar)GetChildAt(2); - number_text = (GTextField)GetChildAt(3); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs.meta deleted file mode 100644 index ca4d5c4..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f2c493f79b9634441a326b3912acf506 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs deleted file mode 100644 index a61f310..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class btn_threeday : GButton - { - public GImage red; - public GTextField lab_time; - public const string URL = "ui://o9974uc5y1du2o"; - - public static btn_threeday CreateInstance() - { - return (btn_threeday)UIPackage.CreateObject("Common_01", "btn_threeday"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - red = (GImage)GetChildAt(1); - lab_time = (GTextField)GetChildAt(2); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs.meta deleted file mode 100644 index 46a22c1..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 89b36c1d6645cfa4695509b9bc159ace -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs deleted file mode 100644 index 04938ab..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs +++ /dev/null @@ -1,27 +0,0 @@ -/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ - -using FairyGUI; -using FairyGUI.Utils; - -namespace FGUI.Common_01 -{ - public partial class com_add_points : GComponent - { - public Controller type; - public GTextField lab_addPoints; - public const string URL = "ui://o9974uc5pmolb6"; - - public static com_add_points CreateInstance() - { - return (com_add_points)UIPackage.CreateObject("Common_01", "com_add_points"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - type = GetControllerAt(0); - lab_addPoints = (GTextField)GetChildAt(1); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs.meta deleted file mode 100644 index 5113918..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4b1be32cd96ef9846a360b64c1db248d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs deleted file mode 100644 index 3daf90e..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.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.Common_01 -{ - public partial class com_gold : GButton - { - public Controller state; - public GGraph gold_anim; - public GTextField text_gold; - public GTextField tips_text; - public Transition anim_coin; - public const string URL = "ui://o9974uc5opwgd"; - - public static com_gold CreateInstance() - { - return (com_gold)UIPackage.CreateObject("Common_01", "com_gold"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - state = GetControllerAt(0); - gold_anim = (GGraph)GetChildAt(1); - text_gold = (GTextField)GetChildAt(2); - tips_text = (GTextField)GetChildAt(6); - anim_coin = GetTransitionAt(0); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs.meta deleted file mode 100644 index 4b2c38f..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6e1308f1da82b084081409153f5fe5bd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs deleted file mode 100644 index 6838292..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.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.Common_01 -{ - public partial class com_money : GComponent - { - public GImage icon; - public GButton btn_ch; - public GTextField text_gold; - public GTextField text_time; - public GGroup group_tips; - public const string URL = "ui://o9974uc5733f48"; - - public static com_money CreateInstance() - { - return (com_money)UIPackage.CreateObject("Common_01", "com_money"); - } - - public override void ConstructFromXML(XML xml) - { - base.ConstructFromXML(xml); - - icon = (GImage)GetChildAt(1); - btn_ch = (GButton)GetChildAt(2); - text_gold = (GTextField)GetChildAt(3); - text_time = (GTextField)GetChildAt(5); - group_tips = (GGroup)GetChildAt(6); - } - } -} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs.meta b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs.meta deleted file mode 100644 index 4893d6d..0000000 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 39dbbd576de35054fb0b813a3b63bef8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs index dba3a28..8ee1b0e 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs @@ -9,6 +9,8 @@ namespace FGUI.JMain public static void BindAll() { UIObjectFactory.SetPackageItemExtension(makeup.URL, typeof(makeup)); + UIObjectFactory.SetPackageItemExtension(com_pal.URL, typeof(com_pal)); + UIObjectFactory.SetPackageItemExtension(item_pal.URL, typeof(item_pal)); UIObjectFactory.SetPackageItemExtension(btn_question.URL, typeof(btn_question)); UIObjectFactory.SetPackageItemExtension(com_faq.URL, typeof(com_faq)); UIObjectFactory.SetPackageItemExtension(com_list_main.URL, typeof(com_list_main)); diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs index 16e68d5..1938c80 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs @@ -22,6 +22,7 @@ namespace FGUI.JMain public btn_petty btn_petty; public GButton btn_play; public GButton btn_wb; + public GButton btn_pal; public const string URL = "ui://qw9x6rf3lbaa0"; public static com_main CreateInstance() @@ -48,6 +49,7 @@ namespace FGUI.JMain btn_petty = (btn_petty)GetChildAt(15); btn_play = (GButton)GetChildAt(16); btn_wb = (GButton)GetChildAt(17); + btn_pal = (GButton)GetChildAt(18); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_pal.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_pal.cs new file mode 100644 index 0000000..9ebdd9a --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_pal.cs @@ -0,0 +1,29 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.JMain +{ + public partial class com_pal : GComponent + { + public Controller state; + public GList list_pal; + public GButton btn_close; + public const string URL = "ui://qw9x6rf3dz5jpiq"; + + public static com_pal CreateInstance() + { + return (com_pal)UIPackage.CreateObject("JMain", "com_pal"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + list_pal = (GList)GetChildAt(0); + btn_close = (GButton)GetChildAt(5); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs.meta b/Assets/BingoBrain/FGUI/Package/JMain/com_pal.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs.meta rename to Assets/BingoBrain/FGUI/Package/JMain/com_pal.cs.meta index c26ea27..fd6b5e0 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_pal.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6fa8949ec620b8c4b8064c98e47a4f40 +guid: efbfc86d9de50de4aaacf054158f5e50 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/FGUI/Package/JMain/item_pal.cs b/Assets/BingoBrain/FGUI/Package/JMain/item_pal.cs new file mode 100644 index 0000000..5d396e1 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMain/item_pal.cs @@ -0,0 +1,25 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.JMain +{ + public partial class item_pal : GComponent + { + public Controller state; + public const string URL = "ui://qw9x6rf3dz5jpiw"; + + public static item_pal CreateInstance() + { + return (item_pal)UIPackage.CreateObject("JMain", "item_pal"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs.meta b/Assets/BingoBrain/FGUI/Package/JMain/item_pal.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs.meta rename to Assets/BingoBrain/FGUI/Package/JMain/item_pal.cs.meta index b829ad5..67884a5 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs.meta +++ b/Assets/BingoBrain/FGUI/Package/JMain/item_pal.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b29662a8bc53af1489ac6c6974ef163c +guid: a985afe1ff6fa7b40b8a084994d9c11b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/Harmony/GameHelper.cs b/Assets/BingoBrain/Harmony/GameHelper.cs index 267e00a..b1b8f3f 100644 --- a/Assets/BingoBrain/Harmony/GameHelper.cs +++ b/Assets/BingoBrain/Harmony/GameHelper.cs @@ -1659,10 +1659,10 @@ namespace BingoBrain } public static bool isRDExchangeMode() { - return false;//zhushi - return true;//zhushi + // return false;//zhushi + //return true;//zhushi return SaveData.GetSaveobject().ExchangeModeToggle == 1; - } + } public static string getDesByKey(string key) { Debug.Log(key); diff --git a/Assets/BingoBrain/Manager/Hall.cs b/Assets/BingoBrain/Manager/Hall.cs index 8691563..b97d6d2 100644 --- a/Assets/BingoBrain/Manager/Hall.cs +++ b/Assets/BingoBrain/Manager/Hall.cs @@ -47,7 +47,7 @@ namespace BingoBrain _bingoDataSys?.RemoveChangeGiftSwitch(action); } - void FocusToGame (object obj = null) + void FocusToGame(object obj = null) { // if(MaxPayManager.isPay) // { @@ -61,14 +61,15 @@ namespace BingoBrain newDate = newDate.AddSeconds(GameHelper.GetNowTime(true)); // Debug.Log($"barry newdate==== {newDate}"); var newDays = newDate.Day; - if (last_time != newDays) - { + if (last_time != newDays) + { var configs = GameHelper.GetCommonModel(); // Debug.Log($"barry hall-----{configs != null}"); - if (configs != null) { + if (configs != null) + { WebviewManager.Instance.RefreshUrl(); } - } + } } private void InitSystem() @@ -101,11 +102,11 @@ namespace BingoBrain { // if (!GameHelper.IsGiftSwitch()) // { - UICtrlDispatcher.Instance.Dispatch(SkinInfo.PlayBgUI_Close); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoStartUI_Close); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.BottomUI_Open); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open); - UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.PlayBgUI_Close); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoStartUI_Close); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.BottomUI_Open); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open); + UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open); // } // else // { @@ -123,7 +124,11 @@ namespace BingoBrain UICtrlDispatcher.Instance.Dispatch(SkinInfo.BroadcastUI_Open); if (PlayerPrefs.GetInt("first_uid", 0) != GameHelper.GetLoginModel().uid) { - UICtrlDispatcher.Instance.Dispatch(SkinInfo.FirstRewardUI_Open); + // UICtrlDispatcher.Instance.Dispatch(SkinInfo.FirstRewardUI_Open); + + GameHelper.AddGoldNumber(50); + PlayerPrefs.SetInt("first_uid", (int)GameHelper.GetLoginModel().uid); + PreferencesMgr.Instance.Currency102 = PreferencesMgr.Instance.Currency102 + ConfigSystem.GetConfig().InitialNum; } } diff --git a/Assets/BingoBrain/Model/Info/SkinInfot.cs b/Assets/BingoBrain/Model/Info/SkinInfot.cs index 082a2aa..ac89d00 100644 --- a/Assets/BingoBrain/Model/Info/SkinInfot.cs +++ b/Assets/BingoBrain/Model/Info/SkinInfot.cs @@ -136,6 +136,8 @@ namespace BingoBrain public static uint ExchangeUI_Open = ++cursor_OpenClose; public static uint ExchangeUI_Close = ++cursor_OpenClose; + public static uint PalUI_Open = ++cursor_OpenClose; + public static uint PalUI_Close = ++cursor_OpenClose; } public static partial class UICtrlMsg { diff --git a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs index ba6713f..785dcff 100644 --- a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs @@ -66,5 +66,6 @@ namespace BingoBrain public const string RewardMulNewCtrl = "RewardMulNewCtrl"; public const string PettyAwardCtrl = "PettyAwardCtrl"; public const string ExchangeCtrl = "ExchangeCtrl"; + public const string PalCtrl = "PalCtrl"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModelConst.cs b/Assets/BingoBrain/ModuleBoard/ModelConst.cs index 5ec2ea6..49f0117 100644 --- a/Assets/BingoBrain/ModuleBoard/ModelConst.cs +++ b/Assets/BingoBrain/ModuleBoard/ModelConst.cs @@ -54,5 +54,6 @@ namespace BingoBrain public const string RewardMulNewModel = "RewardMulNewModel"; public const string PettyAwardModel = "PettyAwardModel"; public const string ExchangeModel = "ExchangeModel"; + public const string PalModel = "PalModel"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs index 9e6de9c..f3c598d 100644 --- a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs +++ b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs @@ -49,6 +49,7 @@ namespace BingoBrain moduleBoardk.AddModel(ModelConst.PettyAwardModel, new PettyAwardModel()); moduleBoardk.AddModel(ModelConst.H5Model, new H5Model()); moduleBoardk.AddModel(ModelConst.ExchangeModel, new ExchangeModel()); + moduleBoardk.AddModel(ModelConst.PalModel, new PalModel()); } public static void AutoRegisterUIType() @@ -95,6 +96,7 @@ namespace BingoBrain moduleBoardk.AddUIType(UIConst.PettyAwardUI, typeof(PettyAwardUI)); moduleBoardk.AddUIType(UIConst.H5UI, typeof(H5UI)); moduleBoardk.AddUIType(UIConst.ExchangeUI, typeof(ExchangeUI)); + moduleBoardk.AddUIType(UIConst.PalUI, typeof(PalUI)); } public static void AutoRegisterCtrl() @@ -142,6 +144,7 @@ namespace BingoBrain moduleBoardk.AddCtrl(CtrlConst.PettyAwardCtrl, new PettyAwardCtrl()); moduleBoardk.AddCtrl(CtrlConst.H5Ctrl, new H5Ctrl()); moduleBoardk.AddCtrl(CtrlConst.ExchangeCtrl, new ExchangeCtrl()); + moduleBoardk.AddCtrl(CtrlConst.PalCtrl, new PalCtrl()); } public static void AutoRegisterUICtrl() @@ -189,6 +192,7 @@ namespace BingoBrain moduleBoardk.AddUICtrl(UICtrlConst.PettyAwardUICtrl, new PettyAwardUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.H5UICtrl, new H5UICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.ExchangeUICtrl, new ExchangeUICtrl()); + moduleBoardk.AddUICtrl(UICtrlConst.PalUICtrl, new PalUICtrl()); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UIConst.cs b/Assets/BingoBrain/ModuleBoard/UIConst.cs index e7fd118..cb457fe 100644 --- a/Assets/BingoBrain/ModuleBoard/UIConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UIConst.cs @@ -104,5 +104,6 @@ namespace BingoBrain public const string RewardMulNewUI = "RewardMulNewUI"; public const string PettyAwardUI = "PettyAwardUI"; public const string ExchangeUI = "ExchangeUI"; + public const string PalUI = "PalUI"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs index 6a86603..04b8b43 100644 --- a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs @@ -67,5 +67,6 @@ namespace BingoBrain public const string MakeupConfirmUICtrl = "MakeupConfirmUICtrl"; public const string PettyAwardUICtrl = "PettyAwardUICtrl"; public const string ExchangeUICtrl = "ExchangeUICtrl"; + public const string PalUICtrl = "PalUICtrl"; } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index 3020832..e632a1f 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -205,6 +205,10 @@ namespace BingoBrain } if (GameHelper.GetCommonModel().PiggyBankSwitch != 1) ui.btn_saveingpot.visible = false; Debug.Log(JsonConvert.SerializeObject(GameHelper.GetConfig().dataList)); + ui.btn_pal.SetClick(() => + { + UICtrlDispatcher.Instance.Dispatch(SkinInfo.PalUI_Open); + }); } private void UpdateNextCardBoardTime() diff --git a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs index be3f66c..ffea3a5 100644 --- a/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs +++ b/Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs @@ -10,6 +10,7 @@ using BingoBrain.Core; using FGUI.ACommon; using FairyGUI; using BingoBrain.HotFix; +using System.Text.RegularExpressions; namespace BingoBrain { @@ -52,6 +53,7 @@ namespace BingoBrain protected override void OnOpenBefore(object args) { + broad_text = Regex.Replace(GameHelper.getDesByKey("makeup_4"), @"]*?/>", ""); InitView(); //ui.y = 241; @@ -121,14 +123,14 @@ namespace BingoBrain // var sk = FX.Instance.SetFx(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, closeCallback); // sk.state.SetAnimation(0, "animation", true); - FX.Instance.SetFx(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk => - { - // ske_pot = sk; + // FX.Instance.SetFx(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk => + // { + // // ske_pot = sk; - // NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); - // OnChangeCardFinish(null); - NAAVsa.PlayAnim(sk, "animation", true); - }, closeCallback); + // // NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish); + // // OnChangeCardFinish(null); + // NAAVsa.PlayAnim(sk, "animation", true); + // }, closeCallback); // ui.group_.y = 220; @@ -166,6 +168,7 @@ namespace BingoBrain { ui.group_.y = GRoot.inst.height - 300; } + string broad_text = ""; void timeEvent() { time_count++; @@ -188,8 +191,9 @@ namespace BingoBrain // } // time_count = 0; + //[color=#63f021][size=32]{0}[/size][/color] claimed [color=#009900][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color] - + // Debug.Log(GameHelper.getDesByKey("makeup_4")); //Debug.Log($"barry broad time count======== {time_count}"); if (time_count > 20) { @@ -203,9 +207,12 @@ namespace BingoBrain { name = name[..4] + "..."; } - // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4"); - string broad_text = String.Format(GameHelper.getDesByKey("makeup_4"), name, GameHelper.Get102Str_new(decimal.Parse( config_money_list[money_index])), DateTimeBoardk.Instance.GetCurrDateTime()); - text_ui.cast_text.text = broad_text; + // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4"); + + + + string temp_text = String.Format(broad_text, name, GameHelper.Get102Str_new(decimal.Parse(config_money_list[money_index])), DateTimeBoardk.Instance.GetCurrDateTime()); + text_ui.cast_text.text = temp_text; ui.t0.Play(); DOVirtual.DelayedCall(3.5f, () => diff --git a/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs b/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs index 1179043..5bb0396 100644 --- a/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs +++ b/Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs @@ -167,7 +167,7 @@ namespace BingoBrain // WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig().propCoord[0], ConfigSystem.GetConfig().propCoord[1], 60, 60); GameHelper.PostFunnelLogin("enterButtonClick"); ctrlDispatcher.Dispatch(CtrlMsg.Game_Start); - + if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.PalUI_Open); CtrlCloseUI(); } diff --git a/Assets/BingoBrain/ModuleUI/Pal.meta b/Assets/BingoBrain/ModuleUI/Pal.meta new file mode 100644 index 0000000..1c33a1f --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/Pal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c30937b710555294d8045052a0d9712c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs b/Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs new file mode 100644 index 0000000..2edd14e --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs @@ -0,0 +1,25 @@ +using BingoBrain.Core; + +namespace BingoBrain +{ + public class PalCtrl : BaseCtrl + { + public static PalCtrl Instance { get; private set; } + + private PalModel model; + + #region 生命周期 + protected override void OnInit() + { + Instance = this; + //model = ModuleManager.Instance..GetModel(ModelConst.PalModel) as PalModel; + } + + protected override void OnDispose() + { + Instance = null; + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs.meta b/Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs.meta rename to Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs.meta index 351b2c6..be1506c 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs.meta +++ b/Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f21fd5491b87db49a1b591cf8a5aa24 +guid: aa2b2f6680825b04f941dfa669ad3ed7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/Pal/PalModel.cs b/Assets/BingoBrain/ModuleUI/Pal/PalModel.cs new file mode 100644 index 0000000..1f5b01e --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/Pal/PalModel.cs @@ -0,0 +1,23 @@ +using BingoBrain.Core; + +namespace BingoBrain +{ + public class PalModel : BaseModel + { + #region 生命周期 + + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + protected override void OnReset() + { + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs.meta b/Assets/BingoBrain/ModuleUI/Pal/PalModel.cs.meta similarity index 83% rename from Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs.meta rename to Assets/BingoBrain/ModuleUI/Pal/PalModel.cs.meta index ebfa211..54d6598 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs.meta +++ b/Assets/BingoBrain/ModuleUI/Pal/PalModel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bcc4ea4c13d5e0e4e8f722c28e967e85 +guid: 2db57b7b73c78574b85db16295855638 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BingoBrain/ModuleUI/Pal/PalUI.cs b/Assets/BingoBrain/ModuleUI/Pal/PalUI.cs new file mode 100644 index 0000000..481faec --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/Pal/PalUI.cs @@ -0,0 +1,98 @@ +using BingoBrain.Core; +using BingoBrain.HotFix; +using FairyGUI; +using FGUI.ACommon; +using FGUI.JMain; +using UnityEngine; + +namespace BingoBrain +{ + public class PalUI : BaseUI + { + private PalUICtrl ctrl; + private PalModel model; + private FGUI.JMain.com_pal ui; + + public PalUI(PalUICtrl ctrl) : base(ctrl) + { + uiName = UIConst.PalUI; + this.ctrl = ctrl; + } + + protected override void SetUIInfo(UIInfo uiInfo) + { + uiInfo.packageName = "JMain"; + uiInfo.assetName = "com_pal"; + uiInfo.layerType = UILayerType.Popup; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; + uiInfo.isNeedUIMask = true; + } + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.PalModel) as PalModel; + } + + protected override void OnClose() + { + } + + protected override void OnBind() + { + ui = baseUI as FGUI.JMain.com_pal; + } + + protected override void OnOpenBefore(object args) + { + ui.list_pal.itemRenderer = RendererList; + ui.list_pal.numItems = 2; + + + ui.list_pal.scrollPane.onScrollEnd.Add(() => + { + int index = ui.list_pal.GetFirstChildInView(); + + ui.state.selectedIndex = index; + }); + ui.btn_close.SetClick(CtrlCloseUI); + 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 + void RendererList(int index, GObject obj) + { + item_pal item = obj as item_pal; + item.state.selectedIndex = index; + + } + //初始化页面逻辑 + private void InitView() + { + + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Pal/PalUI.cs.meta b/Assets/BingoBrain/ModuleUI/Pal/PalUI.cs.meta new file mode 100644 index 0000000..31630a5 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/Pal/PalUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94c75695fa5b4964c8e7be3f52fbb99d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs b/Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs new file mode 100644 index 0000000..876712b --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs @@ -0,0 +1,74 @@ +using BingoBrain.Core; +using BingoBrain.HotFix; + +namespace BingoBrain +{ + public class PalUICtrl : BaseUICtrl + { + private PalUI ui; + private PalModel model; + + private uint openUIMsg = SkinInfo.PalUI_Open; + private uint closeUIMsg = SkinInfo.PalUI_Close; + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.PalModel) as PalModel; + } + + protected override void OnDispose() + { + } + + public override void OpenUI(object args = null) + { + if (ui == null) + { + ui = new PalUI(this); + ui.Open(args); + } + } + + public override void CloseUI(object args = null) + { + if (ui != null && !ui.isClose) + { + ui.Close(); + } + ui = null; + } + #endregion + + #region 消息 + public override uint GetOpenUIMsg(string uiName) + { + return openUIMsg; + } + public override uint GetCloseUIMsg(string uiName) + { + return closeUIMsg; + } + + protected override void AddListener() + { + uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); + uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); + } + protected override void RemoveListener() + { + uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); + uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); + } + + protected override void AddServerListener() + { + + } + protected override void RemoveServerListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs.meta new file mode 100644 index 0000000..148342d --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f59034f142a0ceb4891d4a541c350d35 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs index 70ca4aa..31c4a9b 100644 --- a/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs +++ b/Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs @@ -7,6 +7,7 @@ using DG.Tweening; using FairyGUI; using FGUI.ACommon; using FGUI.bkg_jilu; +using NSubstitute.ReturnsExtensions; using UnityEngine; namespace BingoBrain @@ -129,7 +130,19 @@ namespace BingoBrain string[] values = ctrl.model.recordList[index].Split('-'); item.name.text = values[0]; + item.num.text = GameHelper.getChString(decimal.Parse(values[1])); + + if (GameHelper.isRDExchangeMode()) + { + string str = ""; + item.num.text = str + $" {decimal.Parse(values[1]):N}"; + } + else + { + item.num.text = $"${decimal.Parse(values[1]):N}"; + + } string[] parts = values[2].Split(" "); item.time.text = parts[0]; item.lab_claim.text = GameHelper.getDesByKey("ww"); diff --git a/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs b/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs index f801b56..05e0eca 100644 --- a/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs +++ b/Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs @@ -70,7 +70,7 @@ namespace BingoBrain SetName(); ui.settings.SetClick(OnClickSetting); ui.com_avatar.loader_flag.visible = false; - if(GameHelper.IsGiftSwitch()) ui.btn_cash.gift.selectedIndex=1; + if (GameHelper.IsGiftSwitch()) ui.btn_cash.gift.selectedIndex = 1; if (GameHelper.IsGiftSwitch()) { // ui.visible = false; @@ -78,8 +78,16 @@ namespace BingoBrain } if (Screen.safeArea.y != 0) { - ui.top_group.y=-90; + ui.top_group.y = -90; } + ui.btn_coin.SetClick(() => + { + GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 1); + }); + ui.btn_cash.SetClick(() => + { + GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 1); + }); } private void OnClickSetting() diff --git a/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png index c02ca48..170fa82 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/ACommon_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes index b6fae3d..b0b39dc 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/ACommon_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/Common_01_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/Common_01_atlas0.png index 82c1ef4..3bfa632 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/Common_01_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/Common_01_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes index 2d59716..5e6f9bb 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png index e43d3b0..cd58e32 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0_1.png b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0_1.png new file mode 100644 index 0000000..5e7a197 Binary files /dev/null and b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0_1.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0_1.png.meta b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0_1.png.meta new file mode 100644 index 0000000..d076fda --- /dev/null +++ b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0_1.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: ca6dec729141afb40b58319998c1d8ad +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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: 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes index 4983e9a..80be7a2 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/bkg_jilu_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/bkg_jilu_fui.bytes index cbc4a44..37ab786 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/bkg_jilu_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/bkg_jilu_fui.bytes differ diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 8bc1bf0..811cb61 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 - width: 1920 - height: 989 + x: 8 + y: 51 + width: 1904 + height: 973 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 8} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -40,9 +40,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 345 - width: 579 - height: 594 + y: 339 + width: 574 + height: 584 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} @@ -67,14 +67,14 @@ MonoBehaviour: - {fileID: 2} m_Position: serializedVersion: 2 - x: 1341 + x: 1330 y: 0 - width: 579 - height: 939 + width: 574 + height: 923 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 115 + controlID: 123 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -93,8 +93,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 579 - height: 345 + width: 574 + height: 339 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -117,10 +117,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 743 + x: 737 y: 0 - width: 598 - height: 939 + width: 593 + height: 923 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 13} @@ -147,12 +147,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 939 + width: 1904 + height: 923 m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 37 + controlID: 61 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,8 +171,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 329 - height: 939 + width: 328 + height: 923 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -200,8 +200,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 989 + width: 1904 + height: 973 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -225,7 +225,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1904 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -246,8 +246,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 969 - width: 1920 + y: 953 + width: 1904 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -271,12 +271,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1341 - height: 939 + width: 1330 + height: 923 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 38 + controlID: 62 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -293,10 +293,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 329 + x: 328 y: 0 - width: 414 - height: 939 + width: 409 + height: 923 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} @@ -325,10 +325,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 743 - y: 73 - width: 596 - height: 918 + x: 745 + y: 81 + width: 591 + height: 902 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -350,7 +350,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/BingoBrain/ModuleUI/NetLoading + - Assets/BingoBrain/ModuleUI/Broadcast m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -358,16 +358,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/BingoBrain/ModuleUI/NetLoading + - Assets/BingoBrain/ModuleUI/Broadcast m_LastFoldersGridSize: 16 m_LastProjectPath: D:\git_test\BingoGrassland m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 7} - m_SelectedIDs: fe6e0000 - m_LastClickedID: 28414 - m_ExpandedIDs: 00000000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e000000ca9a3bffffff7f + m_SelectedIDs: ce6e0000 + m_LastClickedID: 28366 + m_ExpandedIDs: 00000000606e0000626e0000646e0000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -395,7 +395,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e0000 + m_ExpandedIDs: 00000000606e0000626e0000646e0000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -471,10 +471,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1341 - y: 73 - width: 578 - height: 324 + x: 1338 + y: 81 + width: 573 + height: 318 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -518,10 +518,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73 - width: 328 - height: 918 + x: 8 + y: 81 + width: 327 + height: 902 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -537,7 +537,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 78cbfeff0cf0feff18f0feff1ef0feff42f0feff5af0feff70f0feffe8f0feff101fffffd87fffff169afffff2a4ffff28a5ffff40a5ffff56a5ffffcea5ffffeefafffff4ffffff + m_ExpandedIDs: 8a5ffdff72cffdffc0cffdffc6cffdffdecffdff1ad7fdff34d7fdff3ed7fdff56d7fdff6cd7fdffe4d7fdff6e69feffc276feffe676fefffe76feff1477feff8c77feff9479feffce80fefff280feff0a81feff2081feff9881feff34a7feff3aa7feffb6a8feffbca8feffe0a8fefff8a8feff0ea9feff86a9feff2afbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -904,9 +904,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 10002.497, y: 9993.789, z: 0.22563137} + m_Target: {x: 10005.369, y: 9984.903, z: 0.22214946} speed: 2 - m_Value: {x: 10002.497, y: 9993.789, z: 0.22563137} + m_Value: {x: 10005.369, y: 9984.903, z: 0.22214946} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -956,9 +956,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 4.543086 + m_Target: 4.891265 speed: 2 - m_Value: 4.543086 + m_Value: 4.891265 m_Ortho: m_Target: 1 speed: 2 @@ -1003,10 +1003,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 329 - y: 73 - width: 412 - height: 918 + x: 336 + y: 81 + width: 407 + height: 902 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1050,7 +1050,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1059,10 +1059,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 412 - height: 897 - m_Scale: {x: 0.49758455, y: 0.49758455} - m_Translation: {x: 206, y: 448.5} + width: 407 + height: 881 + m_Scale: {x: 0.4915459, y: 0.4915459} + m_Translation: {x: 203.5, y: 440.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -1070,12 +1070,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -414 - y: -901.3544 + y: -896.15234 width: 828 - height: 1802.7087 + height: 1792.3047 m_MinimalGUI: 1 - m_defaultScale: 0.49758455 - m_LastWindowPixelSize: {x: 412, y: 918} + m_defaultScale: 0.4915459 + m_LastWindowPixelSize: {x: 407, y: 902} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000100000000000000 @@ -1102,10 +1102,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1341 - y: 418 - width: 578 - height: 573 + x: 1338 + y: 420 + width: 573 + height: 563 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0