diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs index 3c01ace..4171f2a 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs @@ -13,7 +13,7 @@ namespace FGUI.Common_01 public Transition t1; public Transition t2; public Transition t3; - public const string URL = "ui://jq2t9glprdgq9b"; + public const string URL = "ui://o9974uc5rdgq9b"; public static broadcast_top CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs index dcf811e..b77a28e 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs @@ -9,7 +9,7 @@ namespace FGUI.Common_01 { public GTextField text_1; public Transition t0; - public const string URL = "ui://jq2t9glprdgq9c"; + public const string URL = "ui://o9974uc5rdgq9c"; public static broadcast_topitem CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs index 1abc3d8..8204b30 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_boxreward.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_boxreward : GButton { public Transition t0; - public const string URL = "ui://jq2t9glptil24j"; + public const string URL = "ui://o9974uc5til24j"; public static btn_boxreward CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs index 2de9535..4f6fc16 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_buy1.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_buy1 : GButton { public GTextField text_gold; - public const string URL = "ui://jq2t9glpirrg1e"; + public const string URL = "ui://o9974uc5irrg1e"; public static btn_buy1 CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs index 39fbf45..b3caef9 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_card.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_card : GButton { public GImage red; - public const string URL = "ui://jq2t9glpy1du2p"; + public const string URL = "ui://o9974uc5y1du2p"; public static btn_card CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs index c820d78..3aa8ce1 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim.cs @@ -10,7 +10,7 @@ namespace FGUI.Common_01 public Controller state; public GImage ad_icon; public GImage img_saveingpot; - public const string URL = "ui://jq2t9glpsebxc"; + public const string URL = "ui://o9974uc5sebxc"; public static btn_claim CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs index 6eab061..d6a9ace 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_claim3.cs @@ -10,7 +10,7 @@ namespace FGUI.Common_01 public Controller state; public GImage ad_icon; public GImage img_saveingpot; - public const string URL = "ui://jq2t9glppeww38"; + public const string URL = "ui://o9974uc5peww38"; public static btn_claim3 CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs index 7de8b68..b6b9bf7 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_curr.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_curr : GButton { public GTextField text_value; - public const string URL = "ui://jq2t9glpopwgc"; + public const string URL = "ui://o9974uc5opwgc"; public static btn_curr CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs index 7a5bd65..5227701 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_failpack.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_failpack : GButton { public GTextField lab_time; - public const string URL = "ui://jq2t9glpy1du2q"; + public const string URL = "ui://o9974uc5y1du2q"; public static btn_failpack CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs index f3a04dd..fbb9ffd 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_faq.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_faq : GButton { public GTextField lab_time; - public const string URL = "ui://jq2t9glpiec4aw"; + public const string URL = "ui://o9974uc5iec4aw"; public static btn_faq CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs index dbbbfbf..ce4bde5 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs @@ -9,7 +9,7 @@ namespace FGUI.Common_01 { public Controller state; public GImage img_saveingpot; - public const string URL = "ui://jq2t9glpcphly"; + public const string URL = "ui://o9974uc5cphly"; public static btn_get CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs index a70f479..6671884 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_head.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_head : GButton { public GLoader load_avatar; - public const string URL = "ui://jq2t9glpopwgh"; + public const string URL = "ui://o9974uc5opwgh"; public static btn_head CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs index d7e0d70..412159f 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_luck_gift.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_luck_gift : GButton { public GImage red; - public const string URL = "ui://jq2t9glpybesal"; + public const string URL = "ui://o9974uc5ybesal"; public static btn_luck_gift CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs index 40ea539..a87c263 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_max_buy.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_max_buy : GButton { public GImage img_saveingpot; - public const string URL = "ui://jq2t9glpnrk720"; + public const string URL = "ui://o9974uc5nrk720"; public static btn_max_buy CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs index c1c6c0b..762dbd0 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_noads.cs @@ -12,7 +12,7 @@ namespace FGUI.Common_01 public GImage img_pack; public Transition t0; public Transition t1; - public const string URL = "ui://jq2t9glpcou6ba"; + public const string URL = "ui://o9974uc5cou6ba"; public static btn_noads CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs index bb70f07..c92bece 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_rank.cs @@ -10,7 +10,7 @@ namespace FGUI.Common_01 public GImage red; public com_add_points add_points; public Transition t0; - public const string URL = "ui://jq2t9glpiwfgb0"; + public const string URL = "ui://o9974uc5iwfgb0"; public static btn_rank CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs index 3e4afc8..54b864e 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs @@ -9,7 +9,7 @@ namespace FGUI.Common_01 { public GImage img; public GTextField lab_time; - public const string URL = "ui://jq2t9glprj3b4h"; + public const string URL = "ui://o9974uc5rj3b4h"; public static btn_saveingpot CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs index 1d630a4..c1bdf09 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_task : GButton { public GImage red; - public const string URL = "ui://jq2t9glpfhzacg"; + public const string URL = "ui://o9974uc5fhzacg"; public static btn_task CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs index 699646e..a7bcc26 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_task_pass.cs @@ -10,7 +10,7 @@ namespace FGUI.Common_01 public GImage red; public GProgressBar pass_pro; public GTextField number_text; - public const string URL = "ui://jq2t9glp9eojh"; + public const string URL = "ui://o9974uc59eojh"; public static btn_task_pass CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs index 471e18c..a61f310 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_threeday.cs @@ -9,7 +9,7 @@ namespace FGUI.Common_01 { public GImage red; public GTextField lab_time; - public const string URL = "ui://jq2t9glpy1du2o"; + public const string URL = "ui://o9974uc5y1du2o"; public static btn_threeday CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs index fe72086..272305e 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs @@ -14,7 +14,7 @@ namespace FGUI.Common_01 public GTextField watch; public GImage ad_icon; public GImage img_saveingpot; - public const string URL = "ui://jq2t9glpb7ax1h"; + public const string URL = "ui://o9974uc5b7ax1h"; public static btn_watchAd CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs b/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs index 94ac3d5..5c1375c 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs @@ -8,7 +8,7 @@ namespace FGUI.Common_01 public partial class btn_yellow : GButton { public GImage img_saveingpot; - public const string URL = "ui://jq2t9glpsebx9"; + public const string URL = "ui://o9974uc5sebx9"; public static btn_yellow CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs index b461512..865645a 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs @@ -11,7 +11,7 @@ namespace FGUI.Common_01 public GTextField time_text; public btn_get btn_removead; public Transition t0; - public const string URL = "ui://jq2t9glpjobfas"; + public const string URL = "ui://o9974uc5jobfas"; public static com_adcoming CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs index f289339..04938ab 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_add_points.cs @@ -9,7 +9,7 @@ namespace FGUI.Common_01 { public Controller type; public GTextField lab_addPoints; - public const string URL = "ui://jq2t9glppmolb6"; + public const string URL = "ui://o9974uc5pmolb6"; public static com_add_points CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs index 9f07835..09c88c2 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs @@ -13,7 +13,7 @@ namespace FGUI.Common_01 public GGroup group_; public Transition t0; public Transition t1; - public const string URL = "ui://jq2t9glpqp92ao"; + public const string URL = "ui://o9974uc5qp92ao"; public static com_broadcast1 CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs index caf3086..782a899 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs @@ -12,7 +12,7 @@ namespace FGUI.Common_01 public GTextField text_2; public GTextField text_3; public Transition t1; - public const string URL = "ui://jq2t9glpr8lg9a"; + public const string URL = "ui://o9974uc5r8lg9a"; public static com_broadcast_new CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs index 04744bc..2f65ede 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs @@ -11,7 +11,7 @@ namespace FGUI.Common_01 public GRichTextField cast_text; public GRichTextField hide_text; public GButton btn_broad; - public const string URL = "ui://jq2t9glpqp92an"; + public const string URL = "ui://o9974uc5qp92an"; public static com_broadcast_text1 CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs index f4eca7a..3daf90e 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_gold.cs @@ -12,7 +12,7 @@ namespace FGUI.Common_01 public GTextField text_gold; public GTextField tips_text; public Transition anim_coin; - public const string URL = "ui://jq2t9glpopwgd"; + public const string URL = "ui://o9974uc5opwgd"; public static com_gold CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs index af6ce72..6838292 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_money.cs @@ -12,7 +12,7 @@ namespace FGUI.Common_01 public GTextField text_gold; public GTextField text_time; public GGroup group_tips; - public const string URL = "ui://jq2t9glp733f48"; + public const string URL = "ui://o9974uc5733f48"; public static com_money CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs b/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs index 542442b..5682e2c 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs @@ -10,7 +10,7 @@ namespace FGUI.Common_01 public GTextField title; public btn_yellow btn_relog; public GTextField content; - public const string URL = "ui://jq2t9glpre5l1i"; + public const string URL = "ui://o9974uc5re5l1i"; public static com_tips CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs b/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs index 2a17e71..0740db7 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs @@ -12,7 +12,7 @@ namespace FGUI.Common_01 public GTextField text_rate; public Transition show; public Transition hide; - public const string URL = "ui://jq2t9glpr8lg4r"; + public const string URL = "ui://o9974uc5r8lg4r"; public static item_wheel CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs b/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs index 7fa1c1b..33242bf 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs @@ -9,7 +9,7 @@ namespace FGUI.Common_01 { public wheel_ wheel_; public Transition t0; - public const string URL = "ui://jq2t9glpr8lg4q"; + public const string URL = "ui://o9974uc5r8lg4q"; public static wheel CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs b/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs index 10f06a8..db60aff 100644 --- a/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs +++ b/Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs @@ -17,7 +17,7 @@ namespace FGUI.Common_01 public item_wheel item_7; public Transition t0; public Transition t1; - public const string URL = "ui://jq2t9glpr8lg4t"; + public const string URL = "ui://o9974uc5r8lg4t"; public static wheel_ CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs index e7caf2b..dba3a28 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs @@ -19,6 +19,7 @@ namespace FGUI.JMain UIObjectFactory.SetPackageItemExtension(btn_add.URL, typeof(btn_add)); UIObjectFactory.SetPackageItemExtension(btn_minus.URL, typeof(btn_minus)); UIObjectFactory.SetPackageItemExtension(com_cardnum.URL, typeof(com_cardnum)); + UIObjectFactory.SetPackageItemExtension(btn_petty.URL, typeof(btn_petty)); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs b/Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs new file mode 100644 index 0000000..9883519 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs @@ -0,0 +1,27 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.JMain +{ + public partial class btn_petty : GButton + { + public GGroup kuang; + public Transition t0; + public const string URL = "ui://qw9x6rf3uaj0pin"; + + public static btn_petty CreateInstance() + { + return (btn_petty)UIPackage.CreateObject("JMain", "btn_petty"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + kuang = (GGroup)GetChildAt(2); + t0 = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs.meta b/Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs.meta new file mode 100644 index 0000000..56439d1 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 76b1e8a1581e7444a8900307e0980e35 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs index 5f39d4c..41d8d03 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs @@ -12,9 +12,9 @@ namespace FGUI.JMain public GButton btn_getreward; public GTextField txt_title; public GButton closeButton; - public GImage img_gold; public GTextField text_num; public GButton btn_get; + public GImage img_gold; public GTextField end_point; public const string URL = "ui://qw9x6rf3ngxz38"; @@ -32,9 +32,9 @@ namespace FGUI.JMain btn_getreward = (GButton)GetChildAt(1); txt_title = (GTextField)GetChildAt(4); closeButton = (GButton)GetChildAt(5); - img_gold = (GImage)GetChildAt(6); - text_num = (GTextField)GetChildAt(7); - btn_get = (GButton)GetChildAt(8); + text_num = (GTextField)GetChildAt(6); + btn_get = (GButton)GetChildAt(7); + img_gold = (GImage)GetChildAt(8); end_point = (GTextField)GetChildAt(10); } } diff --git a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs index 1dc97bf..6c14d96 100644 --- a/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs +++ b/Assets/BingoBrain/FGUI/Package/JMain/com_main.cs @@ -10,7 +10,6 @@ namespace FGUI.JMain public Controller gift; public Controller type; public GGraph gp_fx; - public GButton btn_play; public com_cardnum com_cardnum; public com_playnum com_cards; public com_cardplaytext com_cardplay; @@ -21,6 +20,8 @@ namespace FGUI.JMain public btn_question btn_question; public GButton btn_saveingpot; public GButton btn_cashout; + public btn_petty btn_petty; + public GButton btn_play; public const string URL = "ui://qw9x6rf3lbaa0"; public static com_main CreateInstance() @@ -35,17 +36,18 @@ namespace FGUI.JMain gift = GetControllerAt(0); type = GetControllerAt(1); gp_fx = (GGraph)GetChildAt(0); - btn_play = (GButton)GetChildAt(6); - com_cardnum = (com_cardnum)GetChildAt(7); - com_cards = (com_playnum)GetChildAt(8); - com_cardplay = (com_cardplaytext)GetChildAt(9); - btn_ballon = (GButton)GetChildAt(10); - btn_set = (GButton)GetChildAt(11); - makeup = (makeup)GetChildAt(12); - btn_admin = (GButton)GetChildAt(13); - btn_question = (btn_question)GetChildAt(14); - btn_saveingpot = (GButton)GetChildAt(15); - btn_cashout = (GButton)GetChildAt(16); + com_cardnum = (com_cardnum)GetChildAt(6); + com_cards = (com_playnum)GetChildAt(7); + com_cardplay = (com_cardplaytext)GetChildAt(8); + btn_ballon = (GButton)GetChildAt(9); + btn_set = (GButton)GetChildAt(10); + makeup = (makeup)GetChildAt(11); + btn_admin = (GButton)GetChildAt(12); + btn_question = (btn_question)GetChildAt(13); + btn_saveingpot = (GButton)GetChildAt(14); + btn_cashout = (GButton)GetChildAt(15); + btn_petty = (btn_petty)GetChildAt(16); + btn_play = (GButton)GetChildAt(17); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty.meta new file mode 100644 index 0000000..32b2c1d --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07bad1f23e137dc4fa1371de18b77258 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/ZM_PettyBinder.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/ZM_PettyBinder.cs new file mode 100644 index 0000000..1dc360e --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/ZM_PettyBinder.cs @@ -0,0 +1,21 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; + +namespace FGUI.ZM_Petty +{ + public class ZM_PettyBinder + { + public static void BindAll() + { + UIObjectFactory.SetPackageItemExtension(com_petty_award.URL, typeof(com_petty_award)); + UIObjectFactory.SetPackageItemExtension(com_get_panel.URL, typeof(com_get_panel)); + UIObjectFactory.SetPackageItemExtension(com_account.URL, typeof(com_account)); + UIObjectFactory.SetPackageItemExtension(com_email.URL, typeof(com_email)); + UIObjectFactory.SetPackageItemExtension(com_firstName.URL, typeof(com_firstName)); + UIObjectFactory.SetPackageItemExtension(com_lastName.URL, typeof(com_lastName)); + UIObjectFactory.SetPackageItemExtension(com_detail.URL, typeof(com_detail)); + UIObjectFactory.SetPackageItemExtension(com_scond_confirm.URL, typeof(com_scond_confirm)); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/ZM_PettyBinder.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/ZM_PettyBinder.cs.meta new file mode 100644 index 0000000..8666a41 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/ZM_PettyBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2981a968a89b8514583ad63e5e7b4424 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_account.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_account.cs new file mode 100644 index 0000000..d2ddaad --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_account.cs @@ -0,0 +1,31 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.ZM_Petty +{ + public partial class com_account : GComponent + { + public com_email com_email; + public com_firstName com_first_name; + public com_lastName com_last_name; + public GButton btn_confirm; + public const string URL = "ui://e9w4rbkqkbzo4"; + + public static com_account CreateInstance() + { + return (com_account)UIPackage.CreateObject("ZM_Petty", "com_account"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + com_email = (com_email)GetChildAt(4); + com_first_name = (com_firstName)GetChildAt(5); + com_last_name = (com_lastName)GetChildAt(6); + btn_confirm = (GButton)GetChildAt(7); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_account.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_account.cs.meta new file mode 100644 index 0000000..07e5dc6 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_account.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a914ed167d523f1428efe0cdc480594d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_detail.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_detail.cs new file mode 100644 index 0000000..e95df01 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_detail.cs @@ -0,0 +1,33 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.ZM_Petty +{ + public partial class com_detail : GComponent + { + public GTextField text_amount; + public GTextField text_data; + public GTextField text_order; + public GTextField text_email; + public GTextField text_limit; + public const string URL = "ui://e9w4rbkqkbzob"; + + public static com_detail CreateInstance() + { + return (com_detail)UIPackage.CreateObject("ZM_Petty", "com_detail"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_amount = (GTextField)GetChildAt(2); + text_data = (GTextField)GetChildAt(3); + text_order = (GTextField)GetChildAt(4); + text_email = (GTextField)GetChildAt(5); + text_limit = (GTextField)GetChildAt(6); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_detail.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_detail.cs.meta new file mode 100644 index 0000000..5f4624f --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_detail.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ce2d2ea1b03310148aee053423f6b7d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_email.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_email.cs new file mode 100644 index 0000000..8ded136 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_email.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.ZM_Petty +{ + public partial class com_email : GComponent + { + public GTextInput enter_email; + public const string URL = "ui://e9w4rbkqkbzo5"; + + public static com_email CreateInstance() + { + return (com_email)UIPackage.CreateObject("ZM_Petty", "com_email"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + enter_email = (GTextInput)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_email.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_email.cs.meta new file mode 100644 index 0000000..9b5b797 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_email.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c230ffca0dd06d14899e8ea2c43efa78 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_firstName.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_firstName.cs new file mode 100644 index 0000000..cd8aacf --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_firstName.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.ZM_Petty +{ + public partial class com_firstName : GComponent + { + public GTextInput enter_first_name; + public const string URL = "ui://e9w4rbkqkbzo8"; + + public static com_firstName CreateInstance() + { + return (com_firstName)UIPackage.CreateObject("ZM_Petty", "com_firstName"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + enter_first_name = (GTextInput)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_firstName.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_firstName.cs.meta new file mode 100644 index 0000000..8e8ea6a --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_firstName.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 284c09afa9d82a049b89f18bcc60d585 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_get_panel.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_get_panel.cs new file mode 100644 index 0000000..a3062b9 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_get_panel.cs @@ -0,0 +1,27 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.ZM_Petty +{ + public partial class com_get_panel : GComponent + { + public GTextField text_reward; + public GButton btn_get; + public const string URL = "ui://e9w4rbkqkbzo3"; + + public static com_get_panel CreateInstance() + { + return (com_get_panel)UIPackage.CreateObject("ZM_Petty", "com_get_panel"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_reward = (GTextField)GetChildAt(2); + btn_get = (GButton)GetChildAt(3); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_get_panel.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_get_panel.cs.meta new file mode 100644 index 0000000..74e8809 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_get_panel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8d7bd47ab0d30804b86df841447000ed +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_lastName.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_lastName.cs new file mode 100644 index 0000000..ba5fc64 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_lastName.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.ZM_Petty +{ + public partial class com_lastName : GComponent + { + public GTextInput enter_last_name; + public const string URL = "ui://e9w4rbkqkbzo9"; + + public static com_lastName CreateInstance() + { + return (com_lastName)UIPackage.CreateObject("ZM_Petty", "com_lastName"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + enter_last_name = (GTextInput)GetChildAt(2); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_lastName.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_lastName.cs.meta new file mode 100644 index 0000000..f34a561 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_lastName.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5f43f0e0b9c5efc4faf79bc76efeac6a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_petty_award.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_petty_award.cs new file mode 100644 index 0000000..a14a159 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_petty_award.cs @@ -0,0 +1,39 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.ZM_Petty +{ + public partial class com_petty_award : GComponent + { + public Controller state; + public GGraph anim; + public GButton btn_gerAward; + public com_get_panel com_get_panel; + public com_account com_account; + public com_detail com_detail; + public com_scond_confirm com_second_confirm; + public GButton btn_close; + public const string URL = "ui://e9w4rbkqkbzo26"; + + public static com_petty_award CreateInstance() + { + return (com_petty_award)UIPackage.CreateObject("ZM_Petty", "com_petty_award"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + state = GetControllerAt(0); + anim = (GGraph)GetChildAt(0); + btn_gerAward = (GButton)GetChildAt(1); + com_get_panel = (com_get_panel)GetChildAt(2); + com_account = (com_account)GetChildAt(3); + com_detail = (com_detail)GetChildAt(4); + com_second_confirm = (com_scond_confirm)GetChildAt(5); + btn_close = (GButton)GetChildAt(6); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_petty_award.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_petty_award.cs.meta new file mode 100644 index 0000000..0d1c848 --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_petty_award.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 263f1e9d94b21d04ba51132ca8935243 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_scond_confirm.cs b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_scond_confirm.cs new file mode 100644 index 0000000..287cc4c --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_scond_confirm.cs @@ -0,0 +1,31 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.ZM_Petty +{ + public partial class com_scond_confirm : GComponent + { + public GButton btn_confirm; + public GTextField text_account; + public GTextField text_first_name; + public GTextField text_last_name; + public const string URL = "ui://e9w4rbkqkbzoe"; + + public static com_scond_confirm CreateInstance() + { + return (com_scond_confirm)UIPackage.CreateObject("ZM_Petty", "com_scond_confirm"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + btn_confirm = (GButton)GetChildAt(2); + text_account = (GTextField)GetChildAt(3); + text_first_name = (GTextField)GetChildAt(4); + text_last_name = (GTextField)GetChildAt(5); + } + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_scond_confirm.cs.meta b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_scond_confirm.cs.meta new file mode 100644 index 0000000..b5df00e --- /dev/null +++ b/Assets/BingoBrain/FGUI/Package/ZM_Petty/com_scond_confirm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ea69dbf4afb0e348bb716ee758fed60 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs index 1ae8ec1..7cad8b4 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_jilu.cs @@ -11,7 +11,7 @@ namespace FGUI.bkg_jilu public GButton btn_close; public GList list; public com_panel panel; - public const string URL = "ui://jsjnplk3f6p00"; + public const string URL = "ui://u5bqcwhxf6p00"; public static com_jilu CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs index 8f076fb..b9445b8 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_panel.cs @@ -16,7 +16,7 @@ namespace FGUI.bkg_jilu public com_record_item item5; public com_record_item item7; public com_record_item item8; - public const string URL = "ui://jsjnplk3f6p05"; + public const string URL = "ui://u5bqcwhxf6p05"; public static com_panel CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs index fbee06a..e29074b 100644 --- a/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs +++ b/Assets/BingoBrain/FGUI/Package/bkg_jilu/com_record_item.cs @@ -11,7 +11,7 @@ namespace FGUI.bkg_jilu public GTextField lab_claim; public GTextField time; public GRichTextField num; - public const string URL = "ui://jsjnplk3f6p04"; + public const string URL = "ui://u5bqcwhxf6p04"; public static com_record_item CreateInstance() { diff --git a/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs index 1b5a8f6..eab2b6f 100644 --- a/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs +++ b/Assets/BingoBrain/FGUI/Package/tixian/com_confirm.cs @@ -59,7 +59,7 @@ namespace FGUI.tixian public GRichTextField text_condi1; public GRichTextField text_ch_number; public GButton btn_close; - public GButton btn_watchad; + public GComponent btn_watchad; public GButton btn_task_watch; public Transition t0; public const string URL = "ui://jwedp6jyut66d"; @@ -125,7 +125,7 @@ namespace FGUI.tixian text_condi1 = (GRichTextField)GetChildAt(90); text_ch_number = (GRichTextField)GetChildAt(91); btn_close = (GButton)GetChildAt(92); - btn_watchad = (GButton)GetChildAt(94); + btn_watchad = (GComponent)GetChildAt(93); btn_task_watch = (GButton)GetChildAt(96); t0 = GetTransitionAt(0); } diff --git a/Assets/BingoBrain/Manager/FX.cs b/Assets/BingoBrain/Manager/FX.cs index 9700050..bbd4005 100644 --- a/Assets/BingoBrain/Manager/FX.cs +++ b/Assets/BingoBrain/Manager/FX.cs @@ -198,6 +198,7 @@ namespace BingoBrain fx_title_effect, fx_wheel, fx_saving, + fx_petty_reward, #endregion diff --git a/Assets/BingoBrain/Model/Config/Game/CommonModel.cs b/Assets/BingoBrain/Model/Config/Game/CommonModel.cs index 4c25847..ca83279 100644 --- a/Assets/BingoBrain/Model/Config/Game/CommonModel.cs +++ b/Assets/BingoBrain/Model/Config/Game/CommonModel.cs @@ -94,5 +94,8 @@ namespace BingoBrain public int ExchangeModeToggle; public int ExchangeProcessMode; public int CHProcessMode; + //小额奖励 + public int SmallReward; + public int ProcessingTime; } } diff --git a/Assets/BingoBrain/Model/Info/SkinInfot.cs b/Assets/BingoBrain/Model/Info/SkinInfot.cs index 64e681a..b888875 100644 --- a/Assets/BingoBrain/Model/Info/SkinInfot.cs +++ b/Assets/BingoBrain/Model/Info/SkinInfot.cs @@ -131,6 +131,8 @@ namespace BingoBrain public static uint SaveingPotUI_Close = ++cursor_OpenClose; public static uint RecordViewUI_Open = ++cursor_OpenClose; public static uint RecordViewUI_Close = ++cursor_OpenClose; + public static uint PettyAwardUI_Open = ++cursor_OpenClose; + public static uint PettyAwardUI_Close = ++cursor_OpenClose; } public static partial class UICtrlMsg { diff --git a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs index 715a84b..d7d5c43 100644 --- a/Assets/BingoBrain/ModuleBoard/CtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/CtrlConst.cs @@ -64,5 +64,6 @@ namespace BingoBrain public const string RecordViewCtrl = "RecordViewCtrl"; public const string ThreeDaysGiftCtrl = "ThreeDaysGiftCtrl"; public const string RewardMulNewCtrl = "RewardMulNewCtrl"; - } + public const string PettyAwardCtrl = "PettyAwardCtrl"; + } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModelConst.cs b/Assets/BingoBrain/ModuleBoard/ModelConst.cs index 0cc579a..d16f237 100644 --- a/Assets/BingoBrain/ModuleBoard/ModelConst.cs +++ b/Assets/BingoBrain/ModuleBoard/ModelConst.cs @@ -52,5 +52,6 @@ namespace BingoBrain public const string RecordViewModel = "RecordViewModel"; public const string ThreeDaysGiftModel = "ThreeDaysGiftModel"; public const string RewardMulNewModel = "RewardMulNewModel"; - } + public const string PettyAwardModel = "PettyAwardModel"; + } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs index 3056fc4..cb230e4 100644 --- a/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs +++ b/Assets/BingoBrain/ModuleBoard/ModuleBoard.cs @@ -46,6 +46,7 @@ namespace BingoBrain moduleBoardk.AddModel(ModelConst.SaveingPotModel, new SaveingPotModel()); moduleBoardk.AddModel(ModelConst.RecordViewModel, new RecordViewModel()); moduleBoardk.AddModel(ModelConst.FirstRewardModel, new FirstRewardModel()); + moduleBoardk.AddModel(ModelConst.PettyAwardModel, new PettyAwardModel()); } public static void AutoRegisterUIType() @@ -89,6 +90,7 @@ namespace BingoBrain moduleBoardk.AddUIType(UIConst.SaveingPotUI, typeof(SaveingPotUI)); moduleBoardk.AddUIType(UIConst.RecordViewUI, typeof(RecordViewUI)); moduleBoardk.AddUIType(UIConst.FirstRewardUI, typeof(FirstRewardUI)); + moduleBoardk.AddUIType(UIConst.PettyAwardUI, typeof(PettyAwardUI)); } public static void AutoRegisterCtrl() @@ -133,6 +135,7 @@ namespace BingoBrain moduleBoardk.AddCtrl(CtrlConst.SaveingPotCtrl, new SaveingPotCtrl()); moduleBoardk.AddCtrl(CtrlConst.RecordViewCtrl, new RecordViewCtrl()); moduleBoardk.AddCtrl(CtrlConst.FirstRewardCtrl, new FirstRewardCtrl()); + moduleBoardk.AddCtrl(CtrlConst.PettyAwardCtrl, new PettyAwardCtrl()); } public static void AutoRegisterUICtrl() @@ -177,6 +180,7 @@ namespace BingoBrain moduleBoardk.AddUICtrl(UICtrlConst.SaveingPotUICtrl, new SaveingPotUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.RecordViewUICtrl, new RecordViewUICtrl()); moduleBoardk.AddUICtrl(UICtrlConst.FirstRewardUICtrl, new FirstRewardUICtrl()); + moduleBoardk.AddUICtrl(UICtrlConst.PettyAwardUICtrl, new PettyAwardUICtrl()); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UIConst.cs b/Assets/BingoBrain/ModuleBoard/UIConst.cs index 9cf8828..1cace1d 100644 --- a/Assets/BingoBrain/ModuleBoard/UIConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UIConst.cs @@ -102,5 +102,6 @@ namespace BingoBrain public const string RecordViewUI = "RecordViewUI"; public const string ThreeDaysGiftUI = "ThreeDaysGiftUI"; public const string RewardMulNewUI = "RewardMulNewUI"; - } + public const string PettyAwardUI = "PettyAwardUI"; + } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs index 30fc1d2..2a989f7 100644 --- a/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs +++ b/Assets/BingoBrain/ModuleBoard/UICtrlConst.cs @@ -65,5 +65,6 @@ namespace BingoBrain public const string ThreeDaysGiftUICtrl = "ThreeDaysGiftUICtrl"; public const string RewardMulNewUICtrl = "RewardMulNewUICtrl"; public const string MakeupConfirmUICtrl = "MakeupConfirmUICtrl"; - } + public const string PettyAwardUICtrl = "PettyAwardUICtrl"; + } } \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index 45902cb..167b60b 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -189,6 +189,10 @@ namespace BingoBrain { UICtrlDispatcher.Instance.Dispatch(SkinInfo.SaveingPotUI_Open); }); + ui.btn_petty.SetClick(() => + { + UICtrlDispatcher.Instance.Dispatch(SkinInfo.PettyAwardUI_Open); + }); } private void UpdateNextCardBoardTime() diff --git a/Assets/BingoBrain/ModuleUI/PettyAward.meta b/Assets/BingoBrain/ModuleUI/PettyAward.meta new file mode 100644 index 0000000..2ddab4c --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 929445620293f0a40a24fb36e503ba37 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardCtrl.cs b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardCtrl.cs new file mode 100644 index 0000000..fc3c1ff --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardCtrl.cs @@ -0,0 +1,25 @@ +using BingoBrain.Core; + +namespace BingoBrain +{ + public class PettyAwardCtrl : BaseCtrl + { + public static PettyAwardCtrl Instance { get; private set; } + + private PettyAwardModel model; + + #region 生命周期 + protected override void OnInit() + { + Instance = this; + //model = ModuleManager.Instance..GetModel(ModelConst.PettyAwardModel) as PettyAwardModel; + } + + protected override void OnDispose() + { + Instance = null; + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardCtrl.cs.meta b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardCtrl.cs.meta new file mode 100644 index 0000000..197c7de --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardCtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90b28f931a8a485439898f66ca3a9822 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardModel.cs b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardModel.cs new file mode 100644 index 0000000..e2fb1d0 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardModel.cs @@ -0,0 +1,23 @@ +using BingoBrain.Core; + +namespace BingoBrain +{ + public class PettyAwardModel : BaseModel + { + #region 生命周期 + + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + protected override void OnReset() + { + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardModel.cs.meta b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardModel.cs.meta new file mode 100644 index 0000000..6d08cda --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88d12f04c8019c541bb34a5ed9e11b72 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUI.cs b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUI.cs new file mode 100644 index 0000000..32715c8 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUI.cs @@ -0,0 +1,319 @@ +using System; +using BingoBrain.Core; +using BingoBrain.HotFix; +using DontConfuse; +using FGUI.ACommon; +using Newtonsoft.Json; +using Spine.Unity; +using UnityEngine; + +namespace BingoBrain +{ + public class PettyAwardUI : BaseUI + { + private PettyAwardUICtrl ctrl; + private PettyAwardModel model; + private FGUI.ZM_Petty.com_petty_award ui; + private Action closeCallback; + public PettyAwardUI(PettyAwardUICtrl ctrl) : base(ctrl) + { + uiName = UIConst.PettyAwardUI; + this.ctrl = ctrl; + } + + protected override void SetUIInfo(UIInfo uiInfo) + { + uiInfo.packageName = "ZM_Petty"; + uiInfo.assetName = "com_petty_award"; + uiInfo.layerType = UILayerType.Popup; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; + uiInfo.isNeedUIMask = true; + } + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.PettyAwardModel) as PettyAwardModel; + } + + protected override void OnClose() + { + closeCallback?.Invoke(); + } + + protected override void OnBind() + { + ui = baseUI as FGUI.ZM_Petty.com_petty_award; + } + + protected override void OnOpenBefore(object args) + { + + InitView(); + } + + protected override void OnOpen(object args) + { + //open_sign = (System.Action)args; + } + + protected override void OnHide() + { + } + + protected override void OnDisplay(object args) + { + } + #endregion + + #region 消息 + protected override void AddListener() + { + + } + protected override void RemoveListener() + { + + } + #endregion + + + private int _mLastState; + //初始化页面逻辑 + private void InitView() + { + _mLastState = SaveData.GetSaveobject().PettyState; + Debug.Log($"PettyState============: {SaveData.GetSaveobject().PettyState}"); + var num = GameHelper.GetCommonModel().SmallReward; + ui.com_get_panel.text_reward.text = $"{GameHelper.Get102Str(num)} USD"; + + + ui.com_get_panel.btn_get.SetClick(GotoEnterAccount); + ui.btn_close.SetClick(() => + { + if (ui.state.selectedIndex == 4) + { + GotoEnterAccount(); + } + else + { + CtrlCloseUI(); + } + }); + + if (_mLastState == 0) + { + // SkeletonAnimation sk = FXManager.Instance.SetFx(ui.anim, Fx_Type.fx_petty_reward, ref closeCallback); + SkeletonAnimation sk = null; + FX.Instance.SetFx(ui.anim, Fx_Type.fx_petty_reward, + ps => + { + // ps.transform.localPosition = new Vector3(0, 195, 0); + sk = ps; + + }, closeCallback); + + sk.state.SetAnimation(0, "newbie_reward_an01", false); + + sk.state.Complete += (a) => + { + sk.state.SetAnimation(0, "newbie_reward_an02", true); + ui.btn_gerAward.SetClick(() => + { + ui.btn_gerAward.visible = false; + sk.state.SetAnimation(0, "newbie_reward_an03", false); + sk.state.Complete += (a) => + { + ui.state.selectedIndex = 1; + SaveData.GetSaveobject().PettyState = 1; + ui.anim.visible = false; + }; + }); + + }; + } + else + { + GotoPanel(_mLastState); + } + } + + private void GotoPanel(int index) + { + switch (index) + { + case 1: + ui.state.selectedIndex = 1; + break; + case 2: + ui.state.selectedIndex = 2; + GotoEnterAccount(); + break; + case 3: + ui.state.selectedIndex = 3; + GotoDetail(); + break; + } + } + + private void GotoEnterAccount() + { + ui.state.selectedIndex = 2; + SaveData.GetSaveobject().PettyState = 2; + if (!SaveData.GetSaveobject().PettyAccount.IsNullOrWhiteSpace()) + { + ui.com_account.com_email.enter_email.text = SaveData.GetSaveobject().PettyAccount; + } + if (!SaveData.GetSaveobject().PettyFirstName.IsNullOrWhiteSpace()) + { + ui.com_account.com_first_name.enter_first_name.text = SaveData.GetSaveobject().PettyFirstName; + } + if (!SaveData.GetSaveobject().PettyLastName.IsNullOrWhiteSpace()) + { + ui.com_account.com_last_name.enter_last_name.text = SaveData.GetSaveobject().PettyLastName; + } + + ui.com_account.btn_confirm.SetClick(ConfirmClick); + } + + private void ConfirmClick() + { + var account = ui.com_account.com_email.enter_email.text.Replace(" ", ""); + if (account == "") + { + GameHelper.ShowTips("Please enter the correct account information", true); + return; + } + + if (!GameHelper.CheckAccountValidly(account)) + { + GameHelper.ShowTips("Please enter the correct account information", true); + return; + } + + var fname = ui.com_account.com_first_name.enter_first_name.text.Replace(" ", ""); + if (!GameHelper.CheckNameValidly(fname)) + { + GameHelper.ShowTips("Please enter the correct account information", true); + return; + } + + var lname = ui.com_account.com_last_name.enter_last_name.text.Replace(" ", ""); + if (!GameHelper.CheckNameValidly(lname)) + { + GameHelper.ShowTips("Please enter the correct account information", true); + return; + } + + SaveData.GetSaveobject().PettyAccount = account; + SaveData.GetSaveobject().PettyFirstName = fname; + SaveData.GetSaveobject().PettyLastName = lname; + + GotoSecondConfirm(account, fname, lname); + + } + + private void GotoSecondConfirm(string account, string fname, string lname) + { + ui.state.selectedIndex = 4; + PaymentMsg info = new PaymentMsg + { + email = account, + first_name = fname, + last_name = lname + }; + + ui.com_second_confirm.text_account.SetVar("account", account).FlushVars(); + ui.com_second_confirm.text_first_name.SetVar("name", fname).FlushVars(); + ui.com_second_confirm.text_last_name.SetVar("name", lname).FlushVars(); + + ui.com_second_confirm.btn_confirm.SetClick(() => + { + ui.com_second_confirm.btn_confirm.enabled = false; + NetworkKit.PostWithHeader("shop/payOutUserInfo", info, (isSuccess, obj) => + { + Debug.Log("[petty ui]-------------payOutUserInfo---" + JsonConvert.SerializeObject(info)); + if (isSuccess) + { + GotoDetail(); + } + else + { + GameHelper.ShowTips("Failed to save information., please try again"); + ui.com_second_confirm.btn_confirm.enabled = true; + } + }); + }); + } + + private void GotoDetail() + { + ui.state.selectedIndex = 3; + SaveData.GetSaveobject().PettyState = 3; + + var pettyAmount = SaveData.GetSaveobject().PettyAmount; + if (pettyAmount != 0) + { + ui.com_detail.text_amount.SetVar("num", GameHelper.Get102Str(pettyAmount)).FlushVars(); + } + else + { + var num = GameHelper.GetCommonModel().SmallReward; + ui.com_detail.text_amount.SetVar("num", GameHelper.Get102Str(num)).FlushVars(); + SaveData.GetSaveobject().PettyAmount = num; + } + + var pettyDateTime = SaveData.GetSaveobject().PettyDateTime; + if (!pettyDateTime.IsNullOrWhiteSpace()) + { + ui.com_detail.text_data.SetVar("data", pettyDateTime).FlushVars(); + } + else + { + var dateTime = DateTime.Now.ToString("yyyy.MM.dd"); + ui.com_detail.text_data.SetVar("data", dateTime).FlushVars(); + SaveData.GetSaveobject().PettyDateTime = dateTime; + } + + var pettyOrderID = SaveData.GetSaveobject().PettyOrderID; + if (!pettyOrderID.IsNullOrWhiteSpace()) + { + ui.com_detail.text_order.SetVar("order", pettyOrderID).FlushVars(); + } + else + { + string datePart = DateTime.Now.ToString("yyyyMMdd"); + System.Random random = new System.Random(); + string randomPart = random.Next(1000, 9999).ToString(); // 生成1000-9999之间的四位数 + ui.com_detail.text_order.SetVar("order", datePart + randomPart).FlushVars(); + + SaveData.GetSaveobject().PettyOrderID = datePart + randomPart; + } + + + ui.com_detail.text_email.SetVar("email", SaveData.GetSaveobject().PettyAccount).FlushVars(); + + var pettyDataLimit = SaveData.GetSaveobject().PettyDataLimit; + if (pettyDataLimit != 0) + { + ui.com_detail.text_limit.SetVar("day", pettyDataLimit.ToString()).FlushVars(); + } + else + { + var day = GameHelper.GetCommonModel().ProcessingTime; + ui.com_detail.text_limit.SetVar("day", day.ToString()).FlushVars(); + SaveData.GetSaveobject().PettyDataLimit = day; + } + } + } +} +namespace DontConfuse +{ + public class PaymentMsg + { + public string email; + public string first_name; + public string last_name; + } +} \ No newline at end of file diff --git a/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUI.cs.meta b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUI.cs.meta new file mode 100644 index 0000000..7fd5922 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3419b0d0813ffd14294efe17fecb0b0e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUICtrl.cs b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUICtrl.cs new file mode 100644 index 0000000..5dabaaa --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUICtrl.cs @@ -0,0 +1,74 @@ +using BingoBrain.Core; +using BingoBrain.HotFix; + +namespace BingoBrain +{ + public class PettyAwardUICtrl : BaseUICtrl + { + private PettyAwardUI ui; + private PettyAwardModel model; + + private uint openUIMsg = SkinInfo.PettyAwardUI_Open; + private uint closeUIMsg = SkinInfo.PettyAwardUI_Close; + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.PettyAwardModel) as PettyAwardModel; + } + + protected override void OnDispose() + { + } + + public override void OpenUI(object args = null) + { + if (ui == null) + { + ui = new PettyAwardUI(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/PettyAward/PettyAwardUICtrl.cs.meta b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUICtrl.cs.meta new file mode 100644 index 0000000..8853a50 --- /dev/null +++ b/Assets/BingoBrain/ModuleUI/PettyAward/PettyAwardUICtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c8a241703482ef64ab8b07f9577ced78 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BingoBrain/ModuleUI/SaveData.cs b/Assets/BingoBrain/ModuleUI/SaveData.cs index fe2d118..588c5b1 100644 --- a/Assets/BingoBrain/ModuleUI/SaveData.cs +++ b/Assets/BingoBrain/ModuleUI/SaveData.cs @@ -183,5 +183,14 @@ namespace BingoBrain public float saveingpot_ch; public float last_saveingpot_ch; public int ExchangeModeToggle = 1; + public int PettyState; + public string PettyAccount; + public string PettyFirstName; + public string PettyLastName; + + public int PettyAmount; + public string PettyOrderID; + public string PettyDateTime; + public int PettyDataLimit; } } diff --git a/Assets/BingoBrain/Register/UIManagerBoard.cs b/Assets/BingoBrain/Register/UIManagerBoard.cs index bc082ea..1792f19 100644 --- a/Assets/BingoBrain/Register/UIManagerBoard.cs +++ b/Assets/BingoBrain/Register/UIManagerBoard.cs @@ -29,6 +29,7 @@ namespace BingoBrain FGUI.tixian.tixianBinder.BindAll(); FGUI.Common_01.Common_01Binder.BindAll(); FGUI.bkg_jilu.bkg_jiluBinder.BindAll(); + FGUI.ZM_Petty.ZM_PettyBinder.BindAll(); } public static void AutoRegisterCommonPackages() diff --git a/Assets/BingoSun/BrigdeIOS.cs b/Assets/BingoSun/BrigdeIOS.cs index a7fa6fe..627179e 100644 --- a/Assets/BingoSun/BrigdeIOS.cs +++ b/Assets/BingoSun/BrigdeIOS.cs @@ -54,7 +54,7 @@ public class BrigdeIOS [DllImport("__Internal")] public static extern void setRewardBtnTag(bool flag); [DllImport("__Internal")] - public static extern void SetOffset(int offset_y, int offset_y2); + public static extern void SetOffset(int offset_y ,int offset_y2); [DllImport("__Internal")] public static extern void copyText(string text); } diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward.meta new file mode 100644 index 0000000..3de135d --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0d6b8d926a6bc847bfd4ea0abc54e3f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._fx_petty_reward.prefab b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._fx_petty_reward.prefab new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._fx_petty_reward.prefab differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._fx_petty_reward.prefab.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._fx_petty_reward.prefab.meta new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._fx_petty_reward.prefab.meta differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.atlas.txt b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.atlas.txt new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.atlas.txt differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.atlas.txt.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.atlas.txt.meta new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.atlas.txt.meta differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.json b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.json new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.json differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.json.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.json.meta new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.json.meta differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.png b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.png new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.png differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.png.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.png.meta new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards.png.meta differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Atlas.asset b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Atlas.asset new file mode 100644 index 0000000..dc30bc3 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Atlas.asset differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Atlas.asset.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Atlas.asset.meta new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Atlas.asset.meta differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Material.mat b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Material.mat new file mode 100644 index 0000000..dc30bc3 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Material.mat differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Material.mat.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Material.mat.meta new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_Material.mat.meta differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_SkeletonData.asset b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_SkeletonData.asset new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_SkeletonData.asset differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_SkeletonData.asset.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_SkeletonData.asset.meta new file mode 100644 index 0000000..f8b5119 Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/._wings_new_rewards_SkeletonData.asset.meta differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/fx_petty_reward.prefab b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/fx_petty_reward.prefab new file mode 100644 index 0000000..3756884 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/fx_petty_reward.prefab @@ -0,0 +1,123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8702631063239601380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6087296153318453413} + - component: {fileID: 3031433386932376368} + - component: {fileID: 3133524035003936403} + - component: {fileID: 6755228158183553068} + m_Layer: 0 + m_Name: fx_petty_reward + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6087296153318453413 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702631063239601380} + 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 &3031433386932376368 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702631063239601380} + m_Mesh: {fileID: 0} +--- !u!23 &3133524035003936403 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702631063239601380} + 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: 0} + 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 &6755228158183553068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702631063239601380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 99a9a759e948b49f5968e63fc87b69fc, 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/AssetHotFix/Effect/spine/fx_petty_reward/fx_petty_reward.prefab.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/fx_petty_reward.prefab.meta new file mode 100644 index 0000000..413352a --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/fx_petty_reward.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 67c3b56ff2b8e47709781d8c93c69e8b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: effect.spine.fx_first_reward.assetbundle + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.atlas.txt b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.atlas.txt new file mode 100644 index 0000000..ec88fb3 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.atlas.txt @@ -0,0 +1,27 @@ + +wings_new_rewards.png +size: 985,590 +format: RGBA8888 +filter: Linear,Linear +repeat: none +Bonus + rotate: false + xy: 601, 98 + size: 298, 62 + orig: 298, 62 + offset: 0, 0 + index: -1 +baoxiang + rotate: true + xy: 601, 162 + size: 426, 382 + orig: 426, 382 + offset: 0, 0 + index: -1 +light + rotate: false + xy: 2, 2 + size: 597, 586 + orig: 597, 586 + offset: 0, 0 + index: -1 diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.atlas.txt.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.atlas.txt.meta new file mode 100644 index 0000000..5e71402 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3937002bdec314a3891c125fd0ababe6 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.json b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.json new file mode 100644 index 0000000..564fb0e --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"trhJpdDFupkcJBUiOeTtNKYigCc","spine":"3.8.93","x":-298,"y":-293,"width":597,"height":597.73,"images":"./image/","audio":""},"bones":[{"name":"root"},{"name":"baoxiang","parent":"root"},{"name":"LIGHT","parent":"root"},{"name":"bonus","parent":"root"}],"slots":[{"name":"light","bone":"LIGHT","attachment":"light"},{"name":"baoxiang","bone":"baoxiang","attachment":"baoxiang"},{"name":"Bonus","bone":"bonus","attachment":"Bonus"}],"skins":[{"name":"default","attachments":{"Bonus":{"Bonus":{"y":273.73,"width":298,"height":62}},"baoxiang":{"baoxiang":{"width":426,"height":382}},"light":{"light":{"x":0.5,"width":597,"height":586}}}}],"animations":{"newbie_reward_an01":{"slots":{"baoxiang":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"}]},"light":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.0333,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}]}},"bones":{"baoxiang":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.2667,"y":68.3,"curve":0.25,"c3":0.75},{"time":0.5,"curve":"stepped"},{"time":0.5667},{"time":0.7333,"y":1.81},{"time":0.9}],"scale":[{"x":0.3,"y":0.3,"curve":0.25,"c3":0.75},{"time":0.2667,"x":0.505,"y":0.673,"curve":0.25,"c3":0.75},{"time":0.5,"x":1.1,"y":1.1,"curve":"stepped"},{"time":0.5667,"x":1.1,"y":1.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8333}]},"LIGHT":{"scale":[{"x":0.3,"y":0.3},{"time":0.1667},{"time":0.6667,"x":1.2,"y":1.2},{"time":1.1667}]},"bonus":{"translate":[{"y":112.99}]}}},"newbie_reward_an02":{"bones":{"baoxiang":{"translate":[{},{"time":1,"y":3.8},{"time":2}],"scale":[{},{"time":1,"x":0.962,"y":1.038},{"time":2}]},"LIGHT":{"rotate":[{},{"time":1,"angle":180},{"time":2}]},"bonus":{"translate":[{"y":112.99}]},"root":{"rotate":[{"time":1.3,"angle":-0.37}]}}},"newbie_reward_an03":{"slots":{"Bonus":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.5667,"color":"ffffff00"}]},"baoxiang":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}]},"light":{"color":[{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]}},"bones":{"bonus":{"translate":[{"y":112.99},{"time":0.4667,"x":-3.72,"y":11.25},{"time":0.5},{"time":0.6667,"y":213.31}],"scale":[{"time":0.5},{"time":0.6667,"x":0.2,"y":0.3}]},"baoxiang":{"scale":[{},{"time":0.5,"x":0.928,"y":0.688},{"time":0.6,"x":1.396,"y":1.278}]},"LIGHT":{"rotate":[{},{"time":0.5,"angle":-90}],"translate":[{"y":-3.89}],"scale":[{"time":0.5},{"time":0.8,"x":3,"y":3}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.json.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.json.meta new file mode 100644 index 0000000..ed0af58 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f5f6d8d7a3584697a7c2aec52ee3a61 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.png b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.png new file mode 100644 index 0000000..1489f5b Binary files /dev/null and b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.png differ diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.png.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.png.meta new file mode 100644 index 0000000..1c4c763 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 4e727b7d5517a48e788dee2f3aa6208c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 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: 0 + 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: Server + 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/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Atlas.asset b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Atlas.asset new file mode 100644 index 0000000..9ac0f66 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Atlas.asset @@ -0,0 +1,17 @@ +%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: wings_new_rewards_Atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 3937002bdec314a3891c125fd0ababe6, type: 3} + materials: + - {fileID: 2100000, guid: 7cc6e10d8f33e437297eee1298a163d8, type: 2} diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Atlas.asset.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Atlas.asset.meta new file mode 100644 index 0000000..f56f02f --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02fb2a62b995347b9add18bc4c1d8a70 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Material.mat b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Material.mat new file mode 100644 index 0000000..659da8d --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Material.mat @@ -0,0 +1,46 @@ +%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: wings_new_rewards_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: 4e727b7d5517a48e788dee2f3aa6208c, 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/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Material.mat.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Material.mat.meta new file mode 100644 index 0000000..292faa4 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7cc6e10d8f33e437297eee1298a163d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_SkeletonData.asset b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_SkeletonData.asset new file mode 100644 index 0000000..670c4b4 --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_SkeletonData.asset @@ -0,0 +1,31 @@ +%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: wings_new_rewards_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 02fb2a62b995347b9add18bc4c1d8a70, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 4f5f6d8d7a3584697a7c2aec52ee3a61, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_SkeletonData.asset.meta b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_SkeletonData.asset.meta new file mode 100644 index 0000000..e6a0f3e --- /dev/null +++ b/Assets/Resources/AssetHotFix/Effect/spine/fx_petty_reward/wings_new_rewards_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99a9a759e948b49f5968e63fc87b69fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/Common_01_fui.bytes index 94fb290..90f43ec 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 b3d90a8..e43d3b0 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png and b/Assets/Resources/AssetHotFix/FGUI/JMain_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JMain_fui.bytes index 39ae3d7..97a722c 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/ZM_Petty_atlas0.png b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_atlas0.png new file mode 100644 index 0000000..6098b06 Binary files /dev/null and b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_atlas0.png differ diff --git a/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_atlas0.png.meta b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_atlas0.png.meta new file mode 100644 index 0000000..6fce422 --- /dev/null +++ b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_atlas0.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 7c5f90c6e1166384da5b8e32c4f2f877 +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/ZM_Petty_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes new file mode 100644 index 0000000..6ae3cf0 Binary files /dev/null and b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes differ diff --git a/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes.meta b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes.meta new file mode 100644 index 0000000..6453581 --- /dev/null +++ b/Assets/Resources/AssetHotFix/FGUI/ZM_Petty_fui.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 916f8663d56abca4485d727739a022e5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AssetHotFix/FGUI/bkg_jilu_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/bkg_jilu_fui.bytes index 91e5b26..73fc381 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/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes index 88f01f8..adf76e4 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/tixian_fui.bytes differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9201c7d..70ae645 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: interactivegames - productName: Bingo Grassland + productName: Bingo Tornado defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -76,6 +76,8 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -83,6 +85,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -136,6 +139,8 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 @@ -161,7 +166,7 @@ PlayerSettings: Android: com.glassland.bingo Lumin: com.DefaultCompany.com.unity.template.mobile2D Standalone: com.DefaultCompany.com.unity.template.mobile2D - iPhone: test0 + iPhone: changyunjia001 tvOS: com.DefaultCompany.com.unity.template.mobile2D buildNumber: Standalone: 0 @@ -186,8 +191,10 @@ PlayerSettings: strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 + iOSSimulatorArchitecture: 0 iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 VisionOSSdkVersion: 0 @@ -234,6 +241,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -730,6 +738,7 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 1 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -894,6 +903,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: