Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 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;
         }

         // 皮肤商店需要判断物品ID
         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);
         }
      }