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

提交h5

Browse Source
This commit is contained in:
changyunjia
2026-07-15 14:24:29 +08:00
parent b4fc8e6ee8
commit bcfb244b0f
46 changed files with 3659 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/CrazyZoo/Runtime/Logic/ModuleUI/GetTaskReward/GetTaskRewardUI.cs
+3 -2
View File
@@ -10,6 +10,7 @@ using FGUI.G009_video;
using Newtonsoft.Json;
using Roy.Datas;
using Random = UnityEngine.Random;
using DontConfuse;
namespace ScrewsMaster
{
@@ -55,7 +56,7 @@ namespace ScrewsMaster
closeCallback?.Invoke();
if (_settlementData != null && _settlementData.is_h5_reward)
{
WebviewManager.Instance.ShowH5View(true);
SdkManager.Instance.ShowH5View(true);
GameDispatcher.Instance.Dispatch(GameMsg.resetH5progress);
}
@@ -87,7 +88,7 @@ namespace ScrewsMaster
if (_settlementData.is_h5_reward)
{
WebviewManager.Instance.ShowH5View(false);
SdkManager.Instance.ShowH5View(false);
}
_isTaskReward = false;
Assets/CrazyZoo/Runtime/Logic/ModuleUI/H5/H5UI.cs
+7 -8
View File
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using DG.Tweening;
using DontConfuse;
using FGUI.G004_webview;
using Roy.Datas;
using UnityEngine;
@@ -111,7 +112,7 @@ namespace ScrewsMaster
{
_flySwitch = GameHelper.GetCommonModel().flyswitch == 1;
_propSwitch = GameHelper.GetCommonModel().propswitch == 1;
WebviewManager.Instance.ShowFlyBtn(true);
SdkManager.Instance.ShowFlyBtn(true);
// HallManager.Instance.SetInH5(true);
model.show102 = GameHelper.Get102();
@@ -195,7 +196,7 @@ namespace ScrewsMaster
float amount = (float)iconTime / ConfigSystem.GetConfig<CommonModel>().ThroughRewardCD;
WebviewManager.Instance.SetIconProgress(amount);
SdkManager.Instance.SetIconProgress(amount);
if (!_propSwitch)
{
@@ -319,8 +320,7 @@ namespace ScrewsMaster
{
GameHelper.showGameUI = true;
WebviewManager.Instance.setInH5View(false);
WebviewManager.Instance.ShowH5View(false);
SdkManager.Instance.ShowH5View(false);
// WebThroughUtil.WebThroughDisable(H5WebThroughType.OnlineH5, ui.btn_icon);
StopFly();
countDownKit?.OnDestroy();
@@ -343,8 +343,7 @@ namespace ScrewsMaster
// ui.TopBox.y += Screen.safeArea.y;
}
WebviewManager.Instance.setInH5View(true);
WebviewManager.Instance.ShowH5View(true);
SdkManager.Instance.ShowH5View(true);
makeupTaskData_saveing = SaveData.GetSaveobject().saveingpot_history[SaveData.GetSaveobject().saveingpot_history.Count - 1];
InitData();
InitView();
@@ -406,7 +405,7 @@ namespace ScrewsMaster
// ui.com_fly.visible = leftTime <= 0;
if (leftTime > 0)
{
WebviewManager.Instance.ShowFlyBtn(false);
SdkManager.Instance.ShowFlyBtn(false);
isFlyShow = false;
StopFlyCountdown();
@@ -414,7 +413,7 @@ namespace ScrewsMaster
}
else
{
if (!isFlyShow) WebviewManager.Instance.ShowFlyBtn(true);
if (!isFlyShow) SdkManager.Instance.ShowFlyBtn(true);
isFlyShow = true;
StartFly();
Assets/CrazyZoo/Runtime/Logic/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+3 -2
View File
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using FGUI.A000_common;
using FGUI.G018_GameHome;
using DontConfuse;
namespace ScrewsMaster
{
@@ -51,7 +52,7 @@ namespace ScrewsMaster
HallManager.Instance.UpdateSecondEvent -= updateSpeedCD;
GameHelper.showGameUI = true;
WebviewManager.Instance.SetDarkThough(true);
SdkManager.Instance.SetDarkThough(true);
gameDispatcher.Dispatch(GameMsg.MakeUpConfirmUIClosed);
}
@@ -66,7 +67,7 @@ namespace ScrewsMaster
userUid = GameHelper.GetLoginModel().uid;
ad_cool_down = ConfigSystem.GetConfig<CommonModel>().WithdrawalaccelerationCD;
//PreferencesMgr.Instance.MakeupTaskH5Time = 999999999;
WebviewManager.Instance.SetDarkThough(false);
SdkManager.Instance.SetDarkThough(false);
if (AppConst.isPt())
{
ui.lang.selectedIndex = com_confirm.Lang_pt;
Assets/CrazyZoo/Runtime/Logic/ModuleUI/Profile/ProfileUI.cs
+3 -2
View File
@@ -1,5 +1,6 @@
namespace ScrewsMaster
{
using DontConfuse;
using FairyGUI;
using FGUI.G006_menu;
@@ -38,7 +39,7 @@ namespace ScrewsMaster
protected override void OnClose()
{
WebviewManager.Instance.SetDarkThough(true);
SdkManager.Instance.SetDarkThough(true);
CommonHelper.FadeOut(ui);
}
@@ -49,7 +50,7 @@ namespace ScrewsMaster
protected override void OnOpenBefore(object args)
{
WebviewManager.Instance.SetDarkThough(false);
SdkManager.Instance.SetDarkThough(false);
InitData();
InitView();
}
Assets/CrazyZoo/Runtime/Logic/ModuleUI/Prop/PropUI.cs
+6 -6
View File
@@ -128,13 +128,13 @@ namespace ScrewsMaster
//初始化页面逻辑
private void InitView()
{
var addPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
var mergePrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
var cleanPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
// 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;
_payBoxPrice = ConfigSystem.GetConfig<CommonModel>().Purchaseprops;
}
@@ -221,7 +221,7 @@ namespace ScrewsMaster
else if (type == 2) GameHelper.AddItemNumber(ItemEnum.ClearHole, 1);
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
ShowScrews.Instance.ShowToast("Exchange successful");
}
else
{
@@ -249,7 +249,7 @@ namespace ScrewsMaster
ShowScrews.Instance.OnSuccessPayBox1(num);
SetButtonsTouchable(false);
CtrlCloseUI();
ShowScrews.Instance.ShowToast("Successful purchase");
ShowScrews.Instance.ShowToast("Exchange successful");
}
else
{
Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs
+3 -2
View File
@@ -10,6 +10,7 @@ using UnityEngine.PlayerLoop;
using Spine.Unity;
using DG.Tweening;
using FGUI.G018_GameHome;
using DontConfuse;
namespace ScrewsMaster
{
@@ -49,7 +50,7 @@ namespace ScrewsMaster
{
HallManager.Instance.UpdateSecondEvent -= updateSpeedCD;
closeCallback?.Invoke();
WebviewManager.Instance.SetDarkThough(true);
SdkManager.Instance.SetDarkThough(true);
GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot);
}
private SkeletonAnimation ske_pot;
@@ -67,7 +68,7 @@ namespace ScrewsMaster
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Close);
ske_pot = FXManager.Instance.SetFx<SkeletonAnimation>(ui.ani_potparent, Fx_Type.fx_savepot, ref closeCallback);
ske_pot.state.SetAnimation(0, "edie", true);
WebviewManager.Instance.SetDarkThough(false);
SdkManager.Instance.SetDarkThough(false);
SaveingPotHelper.TestingClearTime();
makeupTaskData = SaveData.GetSaveobject().saveingpot_history[SaveData.GetSaveobject().saveingpot_history.Count - 1];
// makeupTaskData.H5Time = 99999999999999;
Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs
+11 -11
View File
@@ -643,18 +643,18 @@ namespace ScrewsMaster
ui.btn_task.red.visible = SaveData.getRed();
if (!GameHelper.IsGiftSwitch()) return;
if ((!SaveData.GetSaveobject().is_get_packreward || !SaveData.GetSaveobject().is_get_removead) && !SaveData.GetSaveobject().is_autopack_show
&& GameHelper.showGameUI && (Time.time > (ConfigSystem.GetConfig<CommonModel>().Activetimes * 60)))
{
// if ((!SaveData.GetSaveobject().is_get_packreward || !SaveData.GetSaveobject().is_get_removead) && !SaveData.GetSaveobject().is_autopack_show
// && GameHelper.showGameUI && (Time.time > (ConfigSystem.GetConfig<CommonModel>().Activetimes * 60)))
// {
PackRewardData param = new PackRewardData();
param.isAutoPop = true;
param.isNeedScroll = false;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param);
SaveData.GetSaveobject().is_autopack_show = true;
SaveData.GetSaveobject().is_autopack_show_day = DateTime.Now.Day;
SaveData.saveDataFunc();
}
// PackRewardData param = new PackRewardData();
// param.isAutoPop = true;
// param.isNeedScroll = false;
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param);
// SaveData.GetSaveobject().is_autopack_show = true;
// SaveData.GetSaveobject().is_autopack_show_day = DateTime.Now.Day;
// SaveData.saveDataFunc();
// }
}
}
}