tron_wz/MergeGangRush_unity_IOS
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
changyunjia
2026-07-16 16:09:09 +08:00
parent 67b3dc1e31
commit cc161eed88
8 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/CrazyZoo/Runtime/Logic/Helper/GameHelper.cs
+3 -1
View File
@@ -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<CommonModel>().playtimes)
{
@@ -1106,7 +1108,7 @@ namespace ScrewsMaster
if (Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().interstitialtype)
{
GameHelper.ShowInterstitial("interstitial_h5reward");
GameHelper.ShowInterstitial("interstitial_gameend");
}
}
// if (IsGiftSwitch() && !SaveData.GetSaveobject().is_get_removead && look_interad_numbers >= ConfigSystem.GetConfig<CommonModel>().playtimes)
Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs
+19 -3
View File
@@ -131,12 +131,24 @@ namespace ScrewsMaster
// var addPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
// var mergePrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
// var cleanPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
_payBoxPrice = (int)ConfigSystem.GetConfig<CommonModel>().addspace;
if (type != 3)
{
_payBoxPrice = 1;
}
else
{
if (num == 1)
{
_payBoxPrice = (int)ConfigSystem.GetConfig<CommonModel>().addspace;
}
else
{
_payBoxPrice = (int)ConfigSystem.GetConfig<CommonModel>().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);
Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs
+8 -1
View File
@@ -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);
});
}
Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs
+7 -7
View File
@@ -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<PaidcoinsModel>().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;
}
Assets/Resources/CrazyZooAssets/FGUI/G018_GameHome_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/CrazyZooAssets/FGUI/bkg_jilu_fui.bytes
BIN
View File
Binary file not shown.
Assets/Scripts/BoxTypeLogic.cs
+2 -2
View File
@@ -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);
}
Assets/Scripts/ShowScrews.cs
+8 -8
View File
@@ -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
}