From fb0570bdb7e73e7d4dca211f365ee67b43628240 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 03 四月 2026 14:03:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/UIBase/UIJumpManager.cs | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/Main/System/UIBase/UIJumpManager.cs b/Main/System/UIBase/UIJumpManager.cs
index 09c5160..4ee0d2d 100644
--- a/Main/System/UIBase/UIJumpManager.cs
+++ b/Main/System/UIBase/UIJumpManager.cs
@@ -62,10 +62,9 @@
}
}
}
- else if (config.WinName == "HeroDebutCallWin" ||
- config.WinName == "HeroDebutSkinWin" ||
- config.WinName == "HeroDebutCheckInWin" ||
- config.WinName == "HeroDebutGiftWin" ||
+ //姝﹀皢鐧诲満鐩稿叧
+ else if (config.WinName == "HeroDebutCallWin" || config.WinName == "HeroDebutSkinWin" ||
+ config.WinName == "HeroDebutCheckInWin" || config.WinName == "HeroDebutGiftWin" ||
config.WinName == "HeroDebutShopWin")
{
var heroDebutAct = HeroDebutManager.Instance.GetOperationHeroAppearInfo();
@@ -97,6 +96,40 @@
UIManager.Instance.OpenWindowAsync(config.WinName).Forget();
}
}
+ //姝﹀皢杩斿満鐩稿叧
+ else if (config.WinName == "HeroReturnCallWin" || config.WinName == "HeroReturnSkinWin" ||
+ config.WinName == "HeroReturnCheckInWin" || config.WinName == "HeroReturnGiftWin" ||
+ config.WinName == "HeroReturnShopWin")
+ {
+ var heroDebutAct = HeroReturnManager.Instance.GetOperationHeroAppearInfo();
+ if (heroDebutAct == null)
+ {
+ SysNotifyMgr.Instance.ShowTip("ActivityNoOpen");
+ return;
+ }
+ var actHeroAppearConfig = ActHeroAppearConfig.Get(heroDebutAct.CfgID);
+ if (actHeroAppearConfig == null)
+ {
+ SysNotifyMgr.Instance.ShowTip("ActivityNoOpen");
+ return;
+ }
+
+ // 鐨偆鍟嗗簵闇�瑕佸垽鏂墿鍝両D
+ if (config.WinName == "HeroReturnSkinWin")
+ {
+ if (!HeroReturnManager.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);
+ }
+ }
if (!UIManager.Instance.IsOpened(config.WinName))
{
--
Gitblit v1.8.0