diff --git a/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs b/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs index 90177ef..7792508 100644 --- a/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs +++ b/Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs @@ -10,6 +10,7 @@ using System.Text.RegularExpressions; using System.Linq; using AppsFlyerSDK; using static ScrewsMaster.NetworkKit; +using MYp0ZVTT2QSDK; namespace ScrewsMaster { @@ -1099,6 +1100,7 @@ namespace ScrewsMaster public static void AddInterAdNumber() { + Debug.Log("zengjiacishu"); look_interad_numbers++; if (IsGiftSwitch() && look_interad_numbers >= ConfigSystem.GetConfig().playtimes) { @@ -1106,7 +1108,7 @@ namespace ScrewsMaster if (Random.Range(0, 100) < ConfigSystem.GetConfig().interstitialtype) { - GameHelper.ShowInterstitial("interstitial_h5reward"); + GameHelper.ShowInterstitial("interstitial_gameend"); } } // if (IsGiftSwitch() && !SaveData.GetSaveobject().is_get_removead && look_interad_numbers >= ConfigSystem.GetConfig().playtimes) diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs index a8a33f3..65db40f 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs @@ -131,12 +131,24 @@ namespace ScrewsMaster // var addPrice = ConfigSystem.GetConfig().Purchaseprops; // var mergePrice = ConfigSystem.GetConfig().Purchaseprops; // var cleanPrice = ConfigSystem.GetConfig().Purchaseprops; - _payBoxPrice = (int)ConfigSystem.GetConfig().addspace; + + if (type != 3) { _payBoxPrice = 1; } + else + { + if (num == 1) + { + _payBoxPrice = (int)ConfigSystem.GetConfig().addspace; + } + else + { + _payBoxPrice = (int)ConfigSystem.GetConfig().addspace2; + } + } // if (ui.btn_add is btn_revive btnAdd) btnAdd.txt_coin.text = addPrice.ToString(); // ui.btn_add.onClick.Add(() => @@ -203,7 +215,7 @@ namespace ScrewsMaster if (success) { GameDispatcher.Instance.Dispatch(GameMsg.use_prop, type); - // GameHelper.AddAdWatchCount(-_payBoxPrice); + // GameHelper.AddAdWatchCount(-_payBoxPrice); SetButtonsTouchable(false); CtrlCloseUI(); ShowScrews.Instance.ShowToast("Successfully used the props"); @@ -242,7 +254,11 @@ namespace ScrewsMaster }); return; } - + if (num == 2 && !GameHelper.GetPayBox1()) + { + GameHelper.ShowTips("Please unlock the first one"); + return; + } if (GameHelper.CheckAdWatchCount(_payBoxPrice)) { GameHelper.AddAdWatchCount(-_payBoxPrice); diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs index b3d32be..6a1568b 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs @@ -138,8 +138,15 @@ namespace ScrewsMaster ui.btn_cash.title = "Go"; ui.btn_cash.SetClick(() => { + + + var level = ShowScrews.Instance.gameMode == GameHome.Mode_difficult ? 1 : GameHelper.GetLevel(); ; + ShowScrews.Instance.InitLogic(level); + + AudioManager.Instance.PlayBGM(AudioConst.PlayingBg); CtrlCloseUI(); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Open, false); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GameHomeUI_Close); + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Open, false); }); } diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs index 3c15019..597f0d5 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs @@ -54,7 +54,7 @@ namespace ScrewsMaster protected override void OnClose() { - // HallManager.Instance.UpdateSecondEvent -= GameHelper.addGameTime; + // HallManager.Instance.UpdateSecondEvent -= GameHelper.addGameTime; HallManager.Instance.UpdateSecondEvent -= TimeEvent; HallManager.Instance.UpdateSecondEvent -= UpData; HallManager.Instance.UpdateEvent -= UpdateEvent; @@ -89,7 +89,7 @@ namespace ScrewsMaster // ui.btn_h5.visible = showH5Btn; - ui.money.visible = ui.gold.red.visible = ui.btn_look_ad.visible = GameHelper.IsGiftSwitch(); + ui.money.visible = ui.gold.red.visible = ui.btn_look_ad.visible = GameHelper.IsGiftSwitch(); ui.btn_menu.touchable = false; SetAvatar(); @@ -381,7 +381,7 @@ namespace ScrewsMaster { //CreatSheepCard.instance.SetCameraVisible(false); - // CtrlDispatcher.Instance.Dispatch(CtrlMsg.Webview_StateChange, WebUIType.H5); + // CtrlDispatcher.Instance.Dispatch(CtrlMsg.Webview_StateChange, WebUIType.H5); uiCtrlDispatcher.Dispatch(UICtrlMsg.H5UI_Open); GameHelper.showGameUI = false; @@ -473,8 +473,8 @@ namespace ScrewsMaster if (!GameHelper.IsGiftSwitch()) return; var probability = GameHelper.GetCommonModel().Smallrewardsrate; - var range = Random.Range(0, 101); - if (range > probability) return; + var range = Random.Range(0, 100); + if (range >= probability) return; reward_data temp = args as reward_data; @@ -630,12 +630,12 @@ namespace ScrewsMaster _paidcoinsList ??= ConfigSystem.GetConfig().dataList; int time = SaveData.GetSaveobject()._goldtime0; - if ( time + _paidcoinsList[0].receive_CD < GameHelper.GetNowTime()) + if (time + _paidcoinsList[0].receive_CD < GameHelper.GetNowTime()) { ui.gold.state.selectedIndex = 2; ui.gold.red.visible = true; } - else + else { ui.gold.state.selectedIndex = 1; } diff --git a/Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes index 1c062c4..6a91437 100644 Binary files a/Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes and b/Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes differ diff --git a/Assets/Resources/CrazyZooAssets/FGUI/bkg_jilu_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/bkg_jilu_fui.bytes index db7cc79..c31680e 100644 Binary files a/Assets/Resources/CrazyZooAssets/FGUI/bkg_jilu_fui.bytes and b/Assets/Resources/CrazyZooAssets/FGUI/bkg_jilu_fui.bytes differ diff --git a/Assets/Scripts/BoxTypeLogic.cs b/Assets/Scripts/BoxTypeLogic.cs index 120fbd1..4d7e7c4 100644 --- a/Assets/Scripts/BoxTypeLogic.cs +++ b/Assets/Scripts/BoxTypeLogic.cs @@ -58,8 +58,8 @@ namespace SGame if (GameHelper.IsGiftSwitch()) { var rewardRate = GameHelper.GetCommonModel().rewardrate; - var range = Random.Range(0, 101); - _isCashBox = range <= rewardRate; + var range = Random.Range(0, 100); + _isCashBox = range < rewardRate; cashImg.gameObject.SetActive(_isCashBox); } diff --git a/Assets/Scripts/ShowScrews.cs b/Assets/Scripts/ShowScrews.cs index ea5ffe1..7afc7ab 100644 --- a/Assets/Scripts/ShowScrews.cs +++ b/Assets/Scripts/ShowScrews.cs @@ -130,15 +130,15 @@ public class ShowScrews : MonoBehaviour, ICanvasRaycastFilter errorBtn.gameObject.SetActive(false); -#if !JarvisRelease - errorBtn.gameObject.SetActive(true); - if (errorBtn == null) return; +// #if !JarvisRelease +// errorBtn.gameObject.SetActive(true); +// if (errorBtn == null) return; - errorBtn.onClick.AddListener(() => - { - GameHelper.SendErrorToServer("TestError 001", LogType.Error.ToString()); - }); -#endif +// errorBtn.onClick.AddListener(() => +// { +// GameHelper.SendErrorToServer("TestError 001", LogType.Error.ToString()); +// }); +// #endif }