From 2d1c510ae075a3ce51c75035432f78fae2b13dc3 Mon Sep 17 00:00:00 2001 From: changyunjia <905640960@qq.com> Date: Tue, 14 Jul 2026 18:19:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=87=91=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FGUI/Package/G003_play/com_prop.cs | 14 +- .../FGUI/Package/G003_play/sheep_play.cs | 32 ++-- .../FGUI/Package/G008_reward/com_revive.cs | 6 +- .../FGUI/Package/G018_GameHome/GameHome.cs | 40 ++-- .../Runtime/Logic/Helper/GameHelper.cs | 2 +- .../Runtime/Logic/ModuleUI/Prop/PropUI.cs | 181 +++++++++++------- .../Runtime/Logic/ModuleUI/Revive/ReviveUI.cs | 40 ++-- .../Logic/ModuleUI/SaveingPot/SaveingPotUI.cs | 2 +- .../CrazyZooAssets/FGUI/A000_common_fui.bytes | Bin 23642 -> 23642 bytes .../CrazyZooAssets/FGUI/G003_play_fui.bytes | Bin 16923 -> 16621 bytes .../CrazyZooAssets/FGUI/G008_reward_fui.bytes | Bin 15457 -> 15337 bytes .../FGUI/G018_GameHome_fui.bytes | Bin 9330 -> 9231 bytes .../CrazyZooAssets/FGUI/SaveingPot_fui.bytes | Bin 28043 -> 28006 bytes Assets/Scripts/PurchasingManager.cs | 3 +- Assets/Scripts/ShowScrews.cs | 38 ++-- 15 files changed, 197 insertions(+), 161 deletions(-) diff --git a/Assets/CrazyZoo/FGUI/Package/G003_play/com_prop.cs b/Assets/CrazyZoo/FGUI/Package/G003_play/com_prop.cs index 96eb592..bab9407 100644 --- a/Assets/CrazyZoo/FGUI/Package/G003_play/com_prop.cs +++ b/Assets/CrazyZoo/FGUI/Package/G003_play/com_prop.cs @@ -12,9 +12,6 @@ namespace FGUI.G003_play public GTextField txt_Title; public GButton btn_close; public GTextField txt_content; - public GButton btn_clean; - public GButton btn_add; - public GButton btn_merge; public GButton btn_PayBox; public GTextField text_NeedAds; public GTextField text_hasADsCount; @@ -35,13 +32,10 @@ namespace FGUI.G003_play txt_Title = (GTextField)GetChildAt(1); btn_close = (GButton)GetChildAt(2); txt_content = (GTextField)GetChildAt(7); - btn_clean = (GButton)GetChildAt(8); - btn_add = (GButton)GetChildAt(9); - btn_merge = (GButton)GetChildAt(10); - btn_PayBox = (GButton)GetChildAt(15); - text_NeedAds = (GTextField)GetChildAt(18); - text_hasADsCount = (GTextField)GetChildAt(19); - btn_max_pay = (GButton)GetChildAt(20); + btn_PayBox = (GButton)GetChildAt(12); + text_NeedAds = (GTextField)GetChildAt(15); + text_hasADsCount = (GTextField)GetChildAt(16); + btn_max_pay = (GButton)GetChildAt(17); } } } \ No newline at end of file diff --git a/Assets/CrazyZoo/FGUI/Package/G003_play/sheep_play.cs b/Assets/CrazyZoo/FGUI/Package/G003_play/sheep_play.cs index 3fed6f1..dd69f63 100644 --- a/Assets/CrazyZoo/FGUI/Package/G003_play/sheep_play.cs +++ b/Assets/CrazyZoo/FGUI/Package/G003_play/sheep_play.cs @@ -7,17 +7,17 @@ namespace FGUI.G003_play { public partial class sheep_play : GComponent { - public GTextField level_text; + public new_topgold gold; + public GButton Btn_SignIn; + public btn_battle btn_task; public GButton btn_failpack; + public GButton btn_noads; + public GTextField level_text; public GComponent broadcast; public new_topmoney money; - public new_topgold gold; public GButton btn_setting; - public GButton btn_noads; - public btn_battle btn_task; public GButton btn_menu; public GButton btn_saveingpot; - public GButton Btn_SignIn; public GGroup TopBox; public btn_look_ad btn_look_ad; public btn_battle btn_clear; @@ -33,17 +33,17 @@ namespace FGUI.G003_play { base.ConstructFromXML(xml); - level_text = (GTextField)GetChildAt(0); - btn_failpack = (GButton)GetChildAt(1); - broadcast = (GComponent)GetChildAt(2); - money = (new_topmoney)GetChildAt(3); - gold = (new_topgold)GetChildAt(4); - btn_setting = (GButton)GetChildAt(5); - btn_noads = (GButton)GetChildAt(6); - btn_task = (btn_battle)GetChildAt(7); - btn_menu = (GButton)GetChildAt(8); - btn_saveingpot = (GButton)GetChildAt(9); - Btn_SignIn = (GButton)GetChildAt(10); + gold = (new_topgold)GetChildAt(0); + Btn_SignIn = (GButton)GetChildAt(1); + btn_task = (btn_battle)GetChildAt(2); + btn_failpack = (GButton)GetChildAt(3); + btn_noads = (GButton)GetChildAt(4); + level_text = (GTextField)GetChildAt(5); + broadcast = (GComponent)GetChildAt(6); + money = (new_topmoney)GetChildAt(7); + btn_setting = (GButton)GetChildAt(8); + btn_menu = (GButton)GetChildAt(9); + btn_saveingpot = (GButton)GetChildAt(10); TopBox = (GGroup)GetChildAt(11); btn_look_ad = (btn_look_ad)GetChildAt(12); btn_clear = (btn_battle)GetChildAt(13); diff --git a/Assets/CrazyZoo/FGUI/Package/G008_reward/com_revive.cs b/Assets/CrazyZoo/FGUI/Package/G008_reward/com_revive.cs index 08ef251..173f269 100644 --- a/Assets/CrazyZoo/FGUI/Package/G008_reward/com_revive.cs +++ b/Assets/CrazyZoo/FGUI/Package/G008_reward/com_revive.cs @@ -9,7 +9,6 @@ namespace FGUI.G008_reward { public Controller cont_iswacth; public GButton btn_close; - public GButton btn_revive; public GButton btn_AdRevive; public GButton btn_back; public const string URL = "ui://1x1w9cxngxpr2z"; @@ -25,9 +24,8 @@ namespace FGUI.G008_reward cont_iswacth = GetControllerAt(0); btn_close = (GButton)GetChildAt(2); - btn_revive = (GButton)GetChildAt(7); - btn_AdRevive = (GButton)GetChildAt(8); - btn_back = (GButton)GetChildAt(9); + btn_AdRevive = (GButton)GetChildAt(7); + btn_back = (GButton)GetChildAt(8); } } } \ No newline at end of file diff --git a/Assets/CrazyZoo/FGUI/Package/G018_GameHome/GameHome.cs b/Assets/CrazyZoo/FGUI/Package/G018_GameHome/GameHome.cs index f6dfa73..ca51115 100644 --- a/Assets/CrazyZoo/FGUI/Package/G018_GameHome/GameHome.cs +++ b/Assets/CrazyZoo/FGUI/Package/G018_GameHome/GameHome.cs @@ -10,22 +10,22 @@ namespace FGUI.G018_GameHome public Controller Mode; public Controller switchgift; public GButton btn_saveingpot; - public GButton btn_menu; - public GButton btn_setting; public new_topgold gold; - public GComponent money; public btn_battle BattleBtn; public GButton btn_three_day; public SignInBtn SignInBtn; public GButton NoAdsBtn; public GButton btn_failpack; public btn_repur btn_restore; - public GGroup TopBox; public GButton RightBtn; public GButton LeftBtn; public GButton PlayBtn; public GButton LuckySpinBtn; public GButton RankBtn; + public GButton btn_menu; + public GButton btn_setting; + public GComponent money; + public GGroup TopBox; public const string URL = "ui://dypufdsgtrht2i"; public static GameHome CreateInstance() @@ -40,22 +40,22 @@ namespace FGUI.G018_GameHome Mode = GetControllerAt(0); switchgift = GetControllerAt(1); btn_saveingpot = (GButton)GetChildAt(1); - btn_menu = (GButton)GetChildAt(2); - btn_setting = (GButton)GetChildAt(3); - gold = (new_topgold)GetChildAt(4); - money = (GComponent)GetChildAt(5); - BattleBtn = (btn_battle)GetChildAt(6); - btn_three_day = (GButton)GetChildAt(7); - SignInBtn = (SignInBtn)GetChildAt(8); - NoAdsBtn = (GButton)GetChildAt(9); - btn_failpack = (GButton)GetChildAt(10); - btn_restore = (btn_repur)GetChildAt(11); - TopBox = (GGroup)GetChildAt(12); - RightBtn = (GButton)GetChildAt(14); - LeftBtn = (GButton)GetChildAt(15); - PlayBtn = (GButton)GetChildAt(18); - LuckySpinBtn = (GButton)GetChildAt(21); - RankBtn = (GButton)GetChildAt(22); + gold = (new_topgold)GetChildAt(2); + BattleBtn = (btn_battle)GetChildAt(3); + btn_three_day = (GButton)GetChildAt(4); + SignInBtn = (SignInBtn)GetChildAt(5); + NoAdsBtn = (GButton)GetChildAt(6); + btn_failpack = (GButton)GetChildAt(7); + btn_restore = (btn_repur)GetChildAt(8); + RightBtn = (GButton)GetChildAt(10); + LeftBtn = (GButton)GetChildAt(11); + PlayBtn = (GButton)GetChildAt(14); + LuckySpinBtn = (GButton)GetChildAt(17); + RankBtn = (GButton)GetChildAt(18); + btn_menu = (GButton)GetChildAt(20); + btn_setting = (GButton)GetChildAt(21); + money = (GComponent)GetChildAt(22); + TopBox = (GGroup)GetChildAt(23); } } } \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs b/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs index 6c61121..6394c3f 100644 --- a/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs +++ b/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs @@ -1321,7 +1321,7 @@ namespace ScrewsMaster { isAd = false; } - // return true;//zhushi + return true;//zhushi // return false;//zhushi return isAd; } diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs index 435d41d..49a1e17 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs @@ -132,86 +132,129 @@ namespace ScrewsMaster var mergePrice = ConfigSystem.GetConfig().Purchaseprops; var cleanPrice = ConfigSystem.GetConfig().Purchaseprops; _payBoxPrice = (int)ConfigSystem.GetConfig().addspace; - - if (ui.btn_add is btn_revive btnAdd) btnAdd.txt_coin.text = addPrice.ToString(); - ui.btn_add.onClick.Add(() => + if (type != 3) { - if (!GameHelper.CheckGoldNumber(addPrice)) - { - GameHelper.ShowTips("Not Enough Coins"); - return; - } - GameHelper.AddGoldNumber(-addPrice); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); + _payBoxPrice = 1; - GameHelper.AddItemNumber(ItemEnum.AddHole, 1); - SetButtonsTouchable(false); - CtrlCloseUI(); - ShowScrews.Instance.ShowToast("Successful purchase"); - }); + } - if (ui.btn_merge is btn_revive btnMerge) btnMerge.txt_coin.text = mergePrice.ToString(); - ui.btn_merge.onClick.Add(() => - { - if (!GameHelper.CheckGoldNumber(mergePrice)) - { - GameHelper.ShowTips("Not Enough Coins"); - return; - } - GameHelper.AddGoldNumber(-mergePrice); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); + // if (ui.btn_add is btn_revive btnAdd) btnAdd.txt_coin.text = addPrice.ToString(); + // ui.btn_add.onClick.Add(() => + // { + // if (!GameHelper.CheckGoldNumber(addPrice)) + // { + // GameHelper.ShowTips("Not Enough Coins"); + // return; + // } + // GameHelper.AddGoldNumber(-addPrice); + // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - GameHelper.AddItemNumber(ItemEnum.MergeBox, 1); + // GameHelper.AddItemNumber(ItemEnum.AddHole, 1); + // SetButtonsTouchable(false); + // CtrlCloseUI(); + // ShowScrews.Instance.ShowToast("Successful purchase"); + // }); - SetButtonsTouchable(false); - CtrlCloseUI(); - ShowScrews.Instance.ShowToast("Successful purchase"); - }); + // if (ui.btn_merge is btn_revive btnMerge) btnMerge.txt_coin.text = mergePrice.ToString(); + // ui.btn_merge.onClick.Add(() => + // { + // if (!GameHelper.CheckGoldNumber(mergePrice)) + // { + // GameHelper.ShowTips("Not Enough Coins"); + // return; + // } + // GameHelper.AddGoldNumber(-mergePrice); + // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - if (ui.btn_clean is btn_revive btnClean) btnClean.txt_coin.text = cleanPrice.ToString(); - ui.btn_clean.onClick.Add(() => - { - if (!GameHelper.CheckGoldNumber(cleanPrice)) - { - GameHelper.ShowTips("Not Enough Coins"); - return; - } - GameHelper.AddGoldNumber(-cleanPrice); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); + // GameHelper.AddItemNumber(ItemEnum.MergeBox, 1); - GameHelper.AddItemNumber(ItemEnum.ClearHole, 1); - SetButtonsTouchable(false); - CtrlCloseUI(); - ShowScrews.Instance.ShowToast("Successful purchase"); - }); + // SetButtonsTouchable(false); + // CtrlCloseUI(); + // ShowScrews.Instance.ShowToast("Successful purchase"); + // }); + + // if (ui.btn_clean is btn_revive btnClean) btnClean.txt_coin.text = cleanPrice.ToString(); + // ui.btn_clean.onClick.Add(() => + // { + // if (!GameHelper.CheckGoldNumber(cleanPrice)) + // { + // GameHelper.ShowTips("Not Enough Coins"); + // return; + // } + // GameHelper.AddGoldNumber(-cleanPrice); + // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); + + // GameHelper.AddItemNumber(ItemEnum.ClearHole, 1); + // SetButtonsTouchable(false); + // CtrlCloseUI(); + // ShowScrews.Instance.ShowToast("Successful purchase"); + // }); // if (ui.btn_PayBox is btn_revive btnPayBox) btnPayBox.txt_coin.text = payBoxPrice.ToString(); ui.btn_PayBox.onClick.Add(() => { - if (_needWatchAds) + if (type != 3) { - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1); - GameHelper.ShowVideoAd($"PayBox", success => + if (_needWatchAds) { - if (success) + NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyProp + "_" + type, 1); + GameHelper.ShowVideoAd($"Prop", success => { - GameHelper.UpdateAdRewardExchangeTime(); - } - }); - return; - } + if (success) + { + GameHelper.UpdateAdRewardExchangeTime(); + } + }); + return; + } - if (GameHelper.CheckAdWatchCount(_payBoxPrice)) - { - GameHelper.AddAdWatchCount(-_payBoxPrice); - ShowScrews.Instance.OnSuccessPayBox1(num); - SetButtonsTouchable(false); - CtrlCloseUI(); - ShowScrews.Instance.ShowToast("Successful purchase"); + if (GameHelper.CheckAdWatchCount(_payBoxPrice)) + { + GameHelper.AddAdWatchCount(-_payBoxPrice); + + // ShowScrews.Instance.OnSuccessPayBox1(num); + // SetButtonsTouchable(false); + // CtrlCloseUI(); + // ShowScrews.Instance.ShowToast("Successful purchase"); + if (type == 0) GameHelper.AddItemNumber(ItemEnum.AddHole, 1); + else if (type == 1) GameHelper.AddItemNumber(ItemEnum.MergeBox, 1); + else if (type == 2) GameHelper.AddItemNumber(ItemEnum.ClearHole, 1); + SetButtonsTouchable(false); + CtrlCloseUI(); + ShowScrews.Instance.ShowToast("Successful purchase"); + } + else + { + GameHelper.ShowTips("Insufficient AdWatchCount"); + } } - else + else if (type == 3) { - GameHelper.ShowTips("Insufficient AdWatchCount"); + if (_needWatchAds) + { + NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1); + GameHelper.ShowVideoAd($"PayBox", success => + { + if (success) + { + GameHelper.UpdateAdRewardExchangeTime(); + } + }); + return; + } + + if (GameHelper.CheckAdWatchCount(_payBoxPrice)) + { + GameHelper.AddAdWatchCount(-_payBoxPrice); + ShowScrews.Instance.OnSuccessPayBox1(num); + SetButtonsTouchable(false); + CtrlCloseUI(); + ShowScrews.Instance.ShowToast("Successful purchase"); + } + else + { + GameHelper.ShowTips("Insufficient AdWatchCount"); + } } }); @@ -226,14 +269,14 @@ namespace ScrewsMaster { ui.pay_type.selectedIndex = 1; decimal price = (decimal)GameHelper.GetCommonModel().addspace2; - ui.btn_max_pay.title = "$ "+price; + ui.btn_max_pay.title = "$ " + price; if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true; ui.btn_max_pay.SetClick(() => { Debug.Log(BuriedPointEvent.AddBoxClick + "_" + num); - NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1); + NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.AddBoxClick + "_" + num, 1); ApplePayClass maxPayData = new ApplePayClass { amount = (int)Math.Round(price * 100), @@ -248,7 +291,7 @@ namespace ScrewsMaster private void UpdateWatchAdsText() { ui.text_hasADsCount.text = $"Owner ADs:{GameHelper.GetAdWatchCount()}"; - ui.text_NeedAds.text = $"Need {(int)ConfigSystem.GetConfig().addspace} ADs"; + ui.text_NeedAds.text = $"Need {(int)_payBoxPrice} ADs"; } private void UpdateButtonState() @@ -279,9 +322,9 @@ namespace ScrewsMaster private void SetButtonsTouchable(bool b) { - ui.btn_add.touchable = b; - ui.btn_merge.touchable = b; - ui.btn_clean.touchable = b; + // ui.btn_add.touchable = b; + // ui.btn_merge.touchable = b; + // ui.btn_clean.touchable = b; ui.btn_PayBox.touchable = b; } } diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Revive/ReviveUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Revive/ReviveUI.cs index 7d224d7..cbf222c 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Revive/ReviveUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Revive/ReviveUI.cs @@ -108,9 +108,9 @@ namespace ScrewsMaster { ui.btn_back.SetClick(() => { }); ui.btn_close.SetClick(() => { }); - ui.btn_revive.SetClick(() => { }); + // ui.btn_revive.SetClick(() => { }); GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - GameHelper.SetIsWatchAd(1); + GameHelper.SetReviveCount(); GameHelper.SetReviveCount(); isRevive = true; ctrl.CloseUI(); @@ -118,24 +118,24 @@ namespace ScrewsMaster }); }); - var revivalCoins = ConfigSystem.GetConfig().RevivalCoins; - if (ui.btn_revive is btn_revive btnRevive) btnRevive.txt_coin.text = revivalCoins.ToString(); - ui.btn_revive.onClick.Add(() => - { - if (!GameHelper.CheckGoldNumber(revivalCoins)) - { - GameHelper.ShowTips("Not Enough Coins"); - return; - } - //消耗金币复活 - GameHelper.AddGoldNumber(-revivalCoins); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - //CtrlCloseUI(); - GameHelper.SetIsWatchAd(2); - GameHelper.SetReviveCount(); - isRevive = true; - ctrl.CloseUI(); - }); + // var revivalCoins = ConfigSystem.GetConfig().RevivalCoins; + // if (ui.btn_revive is btn_revive btnRevive) btnRevive.txt_coin.text = revivalCoins.ToString(); + // ui.btn_revive.onClick.Add(() => + // { + // if (!GameHelper.CheckGoldNumber(revivalCoins)) + // { + // GameHelper.ShowTips("Not Enough Coins"); + // return; + // } + // //消耗金币复活 + // GameHelper.AddGoldNumber(-revivalCoins); + // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); + // //CtrlCloseUI(); + // GameHelper.SetIsWatchAd(2); + // GameHelper.SetReviveCount(); + // isRevive = true; + // ctrl.CloseUI(); + // }); ui.btn_close.onClick.Add(() => { diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs index 70ef065..84b937e 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs @@ -117,7 +117,7 @@ namespace ScrewsMaster { Debug.Log(PreferencesMgr.Instance.ExchangeAccount); Makeup_2 makeupVo = ConfigSystem.GetConfig().GetData(makeupTaskData.tableId); - ui.text_ad.text = "1. Earn " + makeupVo.ADIncrease + " USD for each ad you watch "; + ui.text_ad.text = "Earn " + makeupVo.ADIncrease + " USD for each ad you watch "; ui.text_pay.text = "2. Pay USD for " + makeupVo.PayIncrease + " times cashback."; initTop(); diff --git a/Assets/Resources/CrazyZooAssets/FGUI/A000_common_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/A000_common_fui.bytes index 2240f742a37100ddfa0b20016975e91a53c9d0a6..c3809e6aaab4d02d634dbe031d7bc7a4b8569aba 100644 GIT binary patch delta 17 Zcmcb$gYni5#tpR`Obn`<>p5-*0{}#>2I~L- delta 17 Zcmcb$gYni5#tpR`O#lCFuIIQN3;RRoghe_m$NDW4?YeZTYWS?;;# zE^oFxA}%fy>&wkq2TA)Ycxc1uu6*M}i9#rp!o0nLNMB5(bV6WSL65b(?RZ1Zbr82%DH%R3)jOz`pqJsAu z9MW*Au4d3&yS1#zM!*;Pj!{khiCWDGgIFV~4w&pS<{#3Zgy%~52#L=7~V z)6CWUYKT>BL_*)ADPC{S+sJVzf0Pib6B3t)#;8-Fnnu&T-rlD$>MXW|+4#-y2#mKr zG*)ebb_UHPl8!@50d1Cn6!Llzi>R_cp;8pOk}6GfH@at0v)6lbGm-8+3>VEuEJm&l zwW{|(*Fv+2n%tzT#4b)j)e2YT+O@3S$iMtK18 zV)_A34a?!vVfLs8X$g81G}X5mV=;+vPP96Cy;IMr;cj&)0{@U6g26x{!wbH8^5XDV z#aFI}sgt*c*Qm>&T}~@7(T!;PU=znSHC=9}M`$IFR2!5>VeuHP;_Yg+^dowlzf>oS z)jZe{rL2KwE&Z5hSW1+2h`F9N@HWc?c^z$l?=?$(6k_VJPnaU8i>$PX2GC}n8R1l( zfa{Y8x-6nxJjDkhW{RJ1f@-KQ8%)_j9={Y3WXr1iZ7PKHEVPB0Uq30oNrx*CBwMzLZ78QHJNA^CiV+@iLXXAiQV0G12zeH7wtiE7j5Iddww-` zr}8qw`%2ShZkgT97L*Eoi&zk=>{dIL`b z+Pyq2xg>BqUPH#mTywpe3`62c)_RSx#Z$9$nqNAl+DBt~6gZJ_DU|*;|(lK5hcem?LH1!sPsgicV{h9u< zF@CZ8ADluWt_ZR5eTgphH2UYz8FU>%`xO0lzM2@Ln$Z7u`V@V*T7+IZ?q`xr zd?V4So`vol{R904Xy^KMLzC>%{q#?sl$2@sjPl^iZ$!n3&wa;GJrAcZ=mH#2Hu0I? zDM9)YlaZ1e#6_Nxe5dp;y2LLfH;Ub?q@0#6)0OV?DXI`(@we`7?US=-U_;7P{|WGY zWJ<|@kNq3NjimqJi4y6zXjjDL2%NWpvJ^^R<0{XWr_wj5@7mPc?D31KPURW`d`s80 zJ$^LW#wVQ-Cb3zj8+4O;xH&CXN4+ct#TqD)a>?rxWr%sgC*hV$qtK7#_G^L2B@ zAerBdvhn3KlblFHP)>h@A|VIFVqpk~9-(M%mj;<7qcHK!LC$!y2qC@pJtyC#(1nj$ zFG%Dd5h}vCHr*+O3ss{9Wa*t?yQKW9xZJVk6{)D`3XhDAo}@<-5p zfn!t_Y-JF!{s?pzA_R{t^de4+U^55_@q754411$aBm^Al;jkb$n84NEmk#;P`l4VR z;p+G6a0~xms^rBH@8RrBd#NlE16E^ijh-Zu12yf0Zf$V%6yfI1Os6zZr1DlUO$_4K zGqa?0k-?vXheRejva;g$imX5kU%}%0V_@~NMGiM-Wl4iYE_cB;Pvi$|pMdR#ep~E` z0#V3kvYgToQN%a1obkoN6R_O@+fDtph+85`xga|$eyAu5*gOE6Y5g{cS1yKeXSP#1 zPZxM=wsS~@@7@x_Vdnc$X(9h^wCP2qrWv92_G>cmaX*FMiWjoo(n-*o_(X?I0GyO>p(NO1UwIJ2lK$gpb@+ZMu9Q8ZYc>I0S*P{ zf(0OhHt;QQ2zWL(MNhpDLh{^Lp9;I}x0ImQPa2KctkAVWb0m@)b_DmNfa1bJ;if#TS#dyZt{twpFMwG zGZ{MCJgs@N$=IIfY4XWruIy-Us%xFyKBk>RN@BUiGmyXb*m#sDfgkgD__)W(X(eUd JD@vYJ{tKb!FA4wv delta 3299 zcmaJ@3s_Xg6+Xk=yLVr(3k$n@VRCUrq;BHHfgIhM4L96s%h-QG|{GwZIY@nYFb;Z+BCJsu=(%elC7V1zn%Hdod29N z=ggg%doQgP+t!MWrKaq?6!_)O-8AaSTw|F;X0lMYzef=13W=0eppB^p&B%i`0Bs&L zHnd2zery#JMGTkqOXyxB)`y7`Y|^dsOi%>bD4&XGB#osBG{Hy+hT#w*p(6B)yut@^yWjG@ib}4yDySfz}0P zD4{aMCu*X#dVi0D>DojO2~of2wn&Ezq{oY~ElS`0m6Nmd?ia`0u7k;^Tq$`bf2rDa@b zO5@#T1CO>OD9d5Lg6`u^%UJ9EkRPCLp;yojYcUPT7n@M%dABLf{2&6Xq*Wki@K94q zAjo!$nXg%#(W_|<^eB|9+TlpW?Df3blgLBEQ)~~xaVf-u{I^}VgY@jE2e?+CUkv6eEqF!ufTU4}- z!8}P@{C@vww9kmkTnYTF)o$I2sh^^!QAR6F(r+zDIG?tr$y=fCVzX_M`V3MgD?Lk* z*pGI4j$-ILFsCpCj}=dFQd$}}x}0JMzh|2+p5L4j!Pd{L#+F67%DRqy@*Rrl?-k>D$-n&>46FVheCOjL#PBgj9d z-R!eBNPFlfyxu<3y_XsTPL(toC!v8FsnJNUptNp!mG#k$VqbSl^cEq%Li?#}v!f>Z zP6ct3Lsfo?=vXLT~na&Iz%}P=?J~aIj&0Sm#BD!t5LkwyIfBBDE$ianbbO2bNw~9s1*T+-yom8 z>NxqgbPT*ccG8{G?~GNIx8e9ZdWUU^*?ch8DZPu_PR5oi$C1|w?2M$iTIu)n9xsT? z*Ef)7OGyb|QWD&Mpf!E#SA!4}X;truJ%}7H#LX6e+??W+w$VOrbMKKK!dC6#`1qR4 z_pt@AFHT}#{0VLtJkWRY$6{Pd_w~m4Gkw5Y;%B%&q$#%2T~5IU?DvT!h2l z=^xxbxl~#~m$)rCQ-7HTX))inCy0M)=gxWsMpx+?9N$IzG~j#__uRjbzr#}}KI0D0 zJ<`AFb3Wv05c@bb<+Su4y54;=#VW*q+2ZXEyj_lX>%2E^?Q!irQH(c5HB}qw3rtr- zH_@NO5#82%DO~Z&+?1+_FL5vD$`4WxR&+<|oj3jFG*!XdQ;-nY#N+iMOh_nlS=zub zA@kL=cpW9vKt9ypBMlOYrqDx?D-4>*IsIi}3@Y=5DJT{Qb5I;CEJ3kQgli(7hF63p z;Y$IT6S+uOg^jK0suU@r*q5#r+eI|#0v{6i5Fj-1wQY=W+?8_*7q3JdRmAePbhRW- zxP!LZ1^P&6oOqEC7qy$z1fOH zL|PacDMEM|jbdeD(e--Q>4~^v$nL!R`oa#ck zERoH7e5y1+Dq%P<}+3VBy%R&kLS5{&s2 zVr~kJSuBPIxh3FU3*|~gDOwsmz-9QuYec(u7&mc^shme}UeU~Z!( zlX1r4j>ehov!-`w%Di5sqA900H*2c=5W9J^7PijnK2lI8cxPb}&n@)wvBErC3n?9i jjcrARb4l0Q+1||8K|WgO=2|pYQ3>Z1CUj3KdRqAkbvG}A diff --git a/Assets/Resources/CrazyZooAssets/FGUI/G008_reward_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/G008_reward_fui.bytes index 84b52acc9224466753d34c9f8d6fcc17225649f3..2a6dea5ea1827d76606cee37b51a1ef2664f5a2d 100644 GIT binary patch delta 691 zcmX|3vdN}NO`A4pZH=)ewU$~#@!&y4tcr+84y8g4 z_9mzW;pst(e=Z&+l;FXW2!hsAZ-NJ*M^V(Hr>t*B$-?_FGvD{UnVsF;Ti@0ml=X*D zPv+;=$*<8d?UP12dEv3!1h|TTdtG#`>2X|!)QHrQtUQ)_BK3;*1%g~R2KjP-fL|Ib zw4Z;QRx3aBl#GU((2H?Q;s#dHKto3fpg!sshJfw}=fVg1cD$!ICi|fa-j2ZWm~pR@ zzl7_kqpstl7zQXJ+>rbi$%l&xC#$KfT7>VvyyFOTSBzWEz_z;_mu<@gei~#eQP84f z@JixTbx3VbG5E;u=m#`{M>+*5{!j6Xl5i9sYU*4wC}S22sG+8lDgBd_;y;PgWbwSY z;7-Fu!<6AovqD+kH81v!;9BQ}Dpan2p!W-_GZX`Hu{i`^5V z7C4+b>nqZvjL%5DQJ1#k+QZLMA>R}omNTu&1^nRpK$LGry!<^CqiL>N0rz|H&(IN0 zTccD`-Sd&4i;hy6@5|CLerr{=Svt<1^f{{VmGtIB73=EjYmcPwYq_G?~myUTthlA8D(7+M2Yeks{iK)S@6oFpY>UuI$bS zLhacIUG*1ei90vq1H@IAZdB?@cP<4nA`aZ|oSE~T?|%2p{l0#%u{EXs0{P@F z?9G3U7wmZjRrG+{Y9N5U2;jQMb$iGySQ@Wmyw33#4t7Ba(&1o;YFZ3Ew5_c>4sl_L zHWOOCKe3Bi&4mzvK^TFna06;kQ?UyGyWxN_%>ADz9|@Ds@KnGHaFithMJ9@lNq%jz zI9irX0S{OfQvm)Kh6yG`v8UC0yCv**Hbp68=-Pv}ofTMxDpXZ?&-@t186N{U9o!We z(uED1w80-8`_k1z&h~^M$>aEsAs=e=#u!!-sMBxbtZ4`V51QabpYVG`L2$ET2$Ri< zk1HvvnPFF&wKABcCuRkE>8rWW(Z{pRp&0cwUU%e4sy!-w(IVJScatl69#-2&nT0d3 z2#YEnXQ2WPaLYTM>`QKoQYGeBn_Dy2HTLpaPXqRjt5o546eO6d;%**HQk zQcKDxj!_^zuAIP=bUuAiABW}kW@9h|Whkrgmgy5X$=J=C{b+d%*l~n=r*VeM zTRgXCf6J%nQf5w>#W~u|T*lL6Wp=PcJK1no*=q2$n`istwzk diff --git a/Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes index d0c4e2510dc656c653e71ca4c43c8cc05b4f7fe1..1c062c4a739c296a0986753919c0785b65df69f8 100644 GIT binary patch delta 1595 zcmZ8hZBSHY6nb>14T^~3{qP~j1&-AL`}?Cl<*V3!@elA zPMTTykz{G+P}bU(ppC8~J9 zFFfE+h_a-~&yHZilbB1=?*L7c&o#f?Nwqo^6xgWYie*>4Pn(DNawNXY@{~eIZp2SX zUx21)BT87;BGjP?O%5!i$Z9N-!i0LghW=taExq(>=|6)dayy|_UrN6Y^|E|itE++j zGBmQF0&3`uo_}jxf^RwENeK2YPD4Bm#bX@8;&x8(HFHxAR+u5cHo#Vy*Nbn>R#`PT z0m*iHeJz9qu#zkr2s=%fT1MD)6Q&U+3le=UFF~u!F#!8x`-uXAa^IPg@GP>}kPu^+ zM`FQ*Tw>Rtl{^<@ePY_^WH@7!(GYD&73L#^S~Q@+fwg3Q4(s?dy(N;Y=d1BDL(g?R zk2tg;!c+cbrd%R=CNsTyuCJY$^`K~FW2VRy{wtlu6rNg&@q9JMDt2him~k|#sIeMD z6xx9oxF?;2#(<3p~UE8~x?_JIo*EXWHkl(2vl6 z5AVw@f0g<`iqlr8qwL&78A!8c9>ejme>7^ik$4Db#t9sk-_st>{BQ(=t0elAw-{|U zd_Xo%5>piLXZFP~9mH%N#gL~H9}%-AP%v{TPK}`AdN@9jQ52b4@bO4a?I6STvAJ4& zLWZk>@yoh!I(AMOQ5(jhw&P4JH|zhoO_V)cCkf1E#A@(ba5g%2pGkSTN1c@=>3P~x zoRyulwX~;bTWGJOPhj>Q-!}0rn31P-(pF`d(Ma@ph_UUAeMQ?v`v+|^ZDKG_o$D_S zeyyZ1%PY&X&h=+xyOrF{oIc66c3SDWM_0ifnLIVzv95h1tZnU))ms@Tek9!1v7s2Y Y+V=Go?OS9<&KDLfGI>h>?VN7)A2DE^Q~&?~ delta 1782 zcmZuxX>3$g6#nkK&equq-DWy7K_27?gwlO(#2^2o>ves`N!A$}icx~6VnYf@3j*do`mH4v9aTV?Kxv^RlafU#l9;hh zd8E$NZqj-HtypfG##mtoR4isN$wZ6aHJL$EP{H?F$})*Mij`eXI0CL945-9&jC)AW zbotsbmY$y-0e4kw2+w0Gtv^r#Ob0(v7Rhxjd(tqy(h!T$2rMuwWDs40>6n8BSYSmp zsi)xu=J6W=0U6`esjHn{Id3+*Ye*j=7+N0@yL9@ql#@FBi0scf{O%dF&qOWXd4OSs z4!uno_%GBoi>$Mm0JLp{hQ(?bV}M;sECJVChRj19-5i+Cx)iFCc24AZ`0 z(!NsVq&@YJa?W_4bpF&5?F?napYt+Z6UbBN-M%Vsu9b{ zev7h~d3xlbHRx)heFY(4AEE7u+Z)n@<_PUCW0f3FZ?&!FdJPYR=_@&vUM^L(a#ss& zujrGaN&({lrycOwKM;B*HV_As{u;W$v!dB#NV`Kr=Cn_`D(u=O-=C0nU za&XiY+y*BcaX@XVk}B?}>kV#aycZqBtzbr%^c%M&!!(%XvEA*;Ats6q3<(i)U&ok- zF>=}dgl!|nvDyauzWbMNtS!LUPHZCo4H@UitNw@EksRd4R3|u_s7GU>m0jrOmXB$7 zvZ_aVD@~dcyaze#d`4@*TDj}&SDR&)>!#Ww=STS^FTsdPcokFR_ee zzODG5^0)DZx8pV0G%Boxv0Uzr+OB$K-so1X2`lCE(fw)%DV~*RW~o+%*X2y+eAOqv zWEPv>U}kS(r+BkMu70j}VM#0&`Zw&{<$-6F zI>(zUv2a?-a2^+=BQMw3hWEJIm-lqTMO=vg8*z_umpO++)X*E5kN1;4eFD2i`rP;+ z>FcC#OUgH1{~dftZl|}@xEddERqf3Ux8vhsyy_+X`xKt%L~v=?XPC%u;;)guUVM@~ zr1Ucdg^xSZeNkQB4@bk;qFW7&D6ift=WFvH`QOL?VzoNx|jMObsP0ff1$cI_`rWh z$%g#O3C6C@)~+Bd9c5(^eTlTS(e=$Rt*Z>Sl{M2|UJ>bRi+01<9_?t^DxZzL<|?a5 hKuwFI8$!{Z!KQJU%1PvugjwTC?&seaJW#Mx{S7Jln%4jT diff --git a/Assets/Resources/CrazyZooAssets/FGUI/SaveingPot_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/SaveingPot_fui.bytes index 0e3edb5f318b430d6f9582dbcdb6da18d47eff27..61d8ee7e7cf6baaf5f17fa547015a007dcf03fe4 100644 GIT binary patch delta 1435 zcmZ`%dr;I>6h4OwEU?y)sKJU42r*d}7YJj4MFD};0ojM)Tlqx(RxHjsMydI{0M{LU zwU8H~B&$}{v4M^(gBPPQJJA}!^>V9+C?bf)NfU6|F$6Owris+G6I1zyWJ=xHp*A&kw_yRD`T-XV>?ipKnOjB(wmUf`W@xxDH{ z-i20|XXH!N%N=azmpPMPVcvbK-Mj~Xy6kDMQc%xAF_qG6s-qwUV|lOW-p8HNY-t70 zM^9cFE~Sq|bHQl!8o!P`1qQ#-UYMxf zqvEH-Rh+7}^D!(eULN~_49|!1wvTYB*qMBs4(M07Wty8M>3Z599Uj!}S%s9z?R)}% zS%z6Mg>mu6I6t{qeZnUZKgGkRFlWj&Yd2k!YvzBB)$`$d2Y3Ms#GW^ z50Ooze2!7&(^NNqfl&Dz+n40kVHGr;swAwMyf?$PzqSsbkJ z@iz!p7<>*!WfGt7YO4GtQhm!8u&8Q*x+p{6T~#cF2dn1sclvu)R>!IDWlEc?lal*& z&n`>x7}=2|b4PSHrIU^Oain^@;1!J#GfX=}qhI4Xjh!0%W{i*OCyH8*(KRV5Um|Ta zn&F#FsW3}x%na=sPiXvAW1QFIbG+k3R6piwuSMg2jTbfE(3t8oW2gIWR{Ixwd?_kj zm=4XK(fGT@p?)*6K;vSKn>8NMc*U%8CF0 delta 1460 zcmZ`&YfzL`7(OotSeCVh1Pl>uSrL;3Tp)}Ec9r|;aM=rrHGeI*R zGov)6yJ@LprKN&p7cxzYC~c;(AI;b}M*o_oVSB&hjQ{#^o_Wu6p7XxX_n!Cr{Tg*% zr(Y031rp|pas!Dd zkt6IPUlfXRQEsGK7S5yj=t(;$7tlgD(rZnN#0Ns?OOAoZl#ELmMqEr!ly$Tix6-|G z3Du)8W3JSw0X-QSHKHXm&J;pR`PP6CA%3(>pNjtUF{qiAOigH;W}zFLX*^C&YmW1a zdRis~1%n|{M2cXLZ;3Iq9C^0Qv=pap8U^?xVqnV*HLakPeA>WP9Gt*{TQ(C`WhTm1 z)Qql7jaI{KjgxC=EsR+KYEip&)QVkM+f3`}5iWC5h)@^q%c@6vcD#I)9>czDjW+0( zsSVK&HPS{sj%ugJxzb)%&msG2+Vfg61tEx9Rpz<$5nOE1E1cgubB z61wcJ2|eNhy-Zemh0V;qUjdX~8_tI~@Y8 zVIU_NLn#x`kvCDkPH*5qoisf;QMhhtnU(xaoXr?8Rw@poZ04Zv08 zl^!~e{YBfA-AT}u)x|CJ83u~eWG#J;k>WZ&t19vFH1w8e@m~nn-Nu%1g;L=XBA%^$ ziNw-bvY);}pmcux*TSu2Wn#9dU|FSb-;s6Wmr{@1LxZrDX$jx_pX?%ii=$;8x`bev zMwg+LkEieY+RJZ*$}4mgODgK*_dM$7Dx6$+v|=IspdMvyWuzRUAJI`cK4Dn(>?bZB z!7EhovT79wmlCRQiOTvowK1bGMgI40=3(w@UX(G3ja}P@#xywo;%h4#Q{%}Okt)+ z@#hu(p>V8MSLP{fP`E?k35D0ZDns}nGJHwW#mZElVhqXH#LT_SZ1m|FdKC`(CezP- zBfenNBuiF?*{!vi=b7jDO3eN>>o{5;Xl`mXH)^fR8??ri8GW~xE+b<^@tWqftD4p~ K_0{=}hW`M)Ptjih diff --git a/Assets/Scripts/PurchasingManager.cs b/Assets/Scripts/PurchasingManager.cs index 9527acc..7566193 100644 --- a/Assets/Scripts/PurchasingManager.cs +++ b/Assets/Scripts/PurchasingManager.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Collections; using System.Linq; using ScrewsMaster; +using System.Text; public class PurchasingManager @@ -176,7 +177,7 @@ public class PurchasingManager { ApplePayClass data_ = statusDictionary[transactionID]; var test = new checkData(); - test.signedPayload = Base64Kit.Encode(transactionID, true); + test.signedPayload = Encoding.UTF8.GetString(Base64Kit.Encrypt(Encoding.UTF8.GetBytes(transactionID),NetworkManager.packName)); test.innerOrderId = data_.innerOrderId; NetworkKit.PostWithHeader("shop/applePayCheck", test, (isSuccess, obj) => { diff --git a/Assets/Scripts/ShowScrews.cs b/Assets/Scripts/ShowScrews.cs index e13fc00..1b3d0e1 100644 --- a/Assets/Scripts/ShowScrews.cs +++ b/Assets/Scripts/ShowScrews.cs @@ -298,7 +298,7 @@ public class ShowScrews : MonoBehaviour, ICanvasRaycastFilter public void InitAllLeveData() { int conf_num = PlayerPrefs.GetInt("game_conf_num", 1); - // Debug.Log(conf_num); + // Debug.Log(conf_num); // Debug.Log(PlayerPrefs.GetInt("game_conf_num", 1)); if (conf_num == 2) { @@ -1508,30 +1508,30 @@ public class ShowScrews : MonoBehaviour, ICanvasRaycastFilter } else { - if ((LevelProgress >= ((float)ConfigSystem.GetConfig().FailedGiftProgress / 100)) && !is_resurgence) - //if (true && !is_resurgence)//zhushi - { + // if ((LevelProgress >= ((float)ConfigSystem.GetConfig().FailedGiftProgress / 100)) && !is_resurgence) + // //if (true && !is_resurgence)//zhushi + // { + + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, LevelProgress); + // is_resurgence = true; + // yield return null; + // } + // else + // { + if (GameHelper.GetReviveCount() < 2) + { + yield return new WaitForSeconds(0.3f); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ReviveUI_Open); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, LevelProgress); - is_resurgence = true; - yield return null; } else { - if (GameHelper.GetReviveCount() < 2) - { - yield return new WaitForSeconds(0.3f); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ReviveUI_Open); + var temp = new SettlementData { is_success = false, cash_number = cashArray[0], is_level_success = true, is_h5_reward = false }; + yield return new WaitForSeconds(0.3f); - } - else - { - var temp = new SettlementData { is_success = false, cash_number = cashArray[0], is_level_success = true, is_h5_reward = false }; - yield return new WaitForSeconds(0.3f); - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - } + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); } + // } } } public bool is_resurgence = false;