From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/UIBase/UIJumpManager.cs | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/Main/System/UIBase/UIJumpManager.cs b/Main/System/UIBase/UIJumpManager.cs
index d5ac708..0098864 100644
--- a/Main/System/UIBase/UIJumpManager.cs
+++ b/Main/System/UIBase/UIJumpManager.cs
@@ -9,8 +9,6 @@
/// </summary>
public class UIJumpManager : GameSystemManager<UIJumpManager>
{
-
-
public override void Init()
{
}
@@ -22,11 +20,20 @@
{
return false;
}
- if (config.FuncID !=0 && !FuncOpen.Instance.IsFuncOpen(config.FuncID, showTip))
+
+ if (config.FuncID != 0 && !FuncOpen.Instance.IsFuncOpen(config.FuncID, showTip))
{
return false;
}
+ if (config.ActiveType != 0 && !OperationTimeHepler.Instance.SatisfyOpenCondition((OperationType)config.ActiveType))
+ {
+ if (showTip)
+ {
+ SysNotifyMgr.Instance.ShowTip("ActivityNoOpen");
+ }
+ return false;
+ }
//娲诲姩鍚庣画琛ュ厖
return true;
}
@@ -41,15 +48,53 @@
if (config.WinName == "StoreBaseWin")
{
- //鎸囧畾鍟嗗搧
- StoreModel.Instance.jumpShopID = int.Parse(config.Extra);
- if (StoreModel.Instance.jumpShopID == 0)
+ if (int.TryParse(config.Extra, out int result))
{
- StoreModel.Instance.selectStoreFuncType = StoreFunc.Normal;
+ //鎸囧畾鍟嗗搧
+ StoreModel.Instance.jumpShopID = result;
+ if (StoreModel.Instance.jumpShopID == 0)
+ {
+ StoreModel.Instance.selectStoreFuncType = StoreFunc.Normal;
+ }
+ else
+ {
+ StoreModel.Instance.selectStoreFuncType = (StoreFunc)StoreConfig.Get(StoreModel.Instance.jumpShopID).ShopType;
+ }
}
- else
+ }
+ else if (config.WinName == "HeroDebutCallWin" ||
+ config.WinName == "HeroDebutSkinWin" ||
+ config.WinName == "HeroDebutCheckInWin" ||
+ config.WinName == "HeroDebutGiftWin" ||
+ config.WinName == "HeroDebutShopWin")
+ {
+ var heroDebutAct = HeroDebutManager.Instance.GetOperationHeroAppearInfo();
+ if (heroDebutAct == null)
{
- StoreModel.Instance.selectStoreFuncType = (StoreFunc)StoreConfig.Get(StoreModel.Instance.jumpShopID).ShopType;
+ SysNotifyMgr.Instance.ShowTip("ActivityNoOpen");
+ return;
+ }
+ var actHeroAppearConfig = ActHeroAppearConfig.Get(heroDebutAct.CfgID);
+ if (actHeroAppearConfig == null)
+ {
+ SysNotifyMgr.Instance.ShowTip("ActivityNoOpen");
+ return;
+ }
+
+ // 鐨偆鍟嗗簵闇�瑕佸垽鏂墿鍝両D
+ if (config.WinName == "HeroDebutSkinWin")
+ {
+ if (!HeroDebutManager.Instance.HasItemInSkinCTGIDList(heroDebutAct.CfgID, int.Parse(config.Extra)))
+ {
+ SysNotifyMgr.Instance.ShowTip("ActivityNoOpen");
+ return;
+ }
+ }
+
+ if (UIManager.Instance.IsOpened(config.WinName))
+ {
+ UIManager.Instance.CloseWindow(config.WinName);
+ UIManager.Instance.OpenWindow(config.WinName);
}
}
--
Gitblit v1.8.0