fix:1、同步ios修复的bug

This commit is contained in:
2026-07-01 10:26:18 +08:00
parent 6ff428bdf2
commit af7617c352
1080 changed files with 2059 additions and 484310 deletions
@@ -1,5 +1,6 @@
using System;
using FGUI.Arrow_game;
using IgnoreOPS;
using UnityEngine;
namespace ChillConnect
@@ -21,7 +22,7 @@ namespace ChillConnect
{
uiInfo.packageName = "Arrow_game";
uiInfo.assetName = "com_tips";
uiInfo.layerType = UILayerType.Loading;
uiInfo.layerType = UILayerType.Popup;
uiInfo.isNeedUIMask = true;
uiInfo.isNeedOpenAnim = true;
uiInfo.isNeedCloseAnim = true;
@@ -36,6 +37,9 @@ namespace ChillConnect
GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true);
CommonHelper.FadeOut(ui);
HallManager.Instance.UpdateSecondEvent -= UpdateCd;
}
protected override void OnBind()
@@ -43,12 +47,24 @@ namespace ChillConnect
ui = baseUI as com_tips;
}
private int state_;
protected override void OnOpenBefore(object args)
{
GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false);
if (args != null)
{
InitView((int)args);
state_ = (int)args + 5;
}
HallManager.Instance.UpdateSecondEvent += UpdateCd;
UpdateCd();
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
{
ui.btn_watch.img_saveingpot.visible = true;
}
}
protected override void OnOpen(object args)
@@ -79,7 +95,7 @@ namespace ChillConnect
if (isSuccess)
{
Debug.Log($"isSuccess tips state = {state} ");
GameHelper.SetWatchCd(state_);
GameDispatcher.Instance.Dispatch(GameMsg.UseProps, state);
CtrlCloseUI();
}
@@ -88,5 +104,24 @@ namespace ChillConnect
ui.btn_close.SetClick(CtrlCloseUI);
}
private void UpdateCd()
{
var btnWatch = ui.btn_watch ;
// Debug.Log($"DataMgr.NewWatchCd.Value[state_ + 2]==={DataMgr.NewWatchCd.Value[state_ + 2]}");
if (DataMgr.NewWatchCd.Value[state_] > Convert.ToInt32(GameHelper.GetNowTime()))
{
btnWatch.enabled = false;
btnWatch.can.selectedIndex = 1;
btnWatch.text.text = CommonHelper.TimeFormat(DataMgr.NewWatchCd.Value[state_] - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
}
else
{
ui.btn_watch.enabled = true;
btnWatch.can.selectedIndex = 0;
btnWatch.text.text = "Use Item";
}
}
}
}