商店

GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs

@@ -208,7 +208,7 @@ namespace GFGGame
             {
                 return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldEndTime);
             }
-            return false;
+            return true;
         }
         public static OtherRoleInfoData GetOtherRoleInfoData(OtherRoleInfoProto otherRoleInfo)
         {

GameClient/Assets/Game/HotUpdate/Data/ShopDataManager.cs

@@ -307,33 +307,39 @@ namespace GFGGame
         //     return shopExchangeCfgs;
         // }
         /// <summary>
-        /// 根据商品Id获取商品是否解锁解锁
+        /// 根据商品Id获取商品是否已解锁
         /// /// </summary>
         /// <param name="goodsId"></param>
         /// <returns></returns>
         public bool GetShopGoodsStateById(int goodsId)
         {
-            ShopCfg cfg = ShopCfgArray.Instance.GetCfg(goodsId);
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
 
-            if (cfg.lockType == LockType.NONE)
+            if (shopCfg.lockType == LockType.NONE)
             {
                 return true;
             }
-            else if (cfg.lockType == LockType.STORY_LV)
+            else if (shopCfg.lockType == LockType.STORY_LV)
             {
-                return InstanceZonesDataManager.CheckLevelPass(cfg.lockValue);
+                return InstanceZonesDataManager.CheckLevelPass(shopCfg.lockValue);
             }
-            else if (cfg.lockType == LockType.ROLE_LV)
+            else if (shopCfg.lockType == LockType.ROLE_LV)
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= cfg.lockValue;
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= shopCfg.lockValue;
             }
-            else if (cfg.lockType == LockType.MONTH_CARD_TYPE)
+            else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
             {
-                return RoleDataManager.CheckIsMonthCardOpenByType(cfg.lockValue);
+                return RoleDataManager.CheckIsMonthCardOpenByType(shopCfg.lockValue);
             }
-            else if (cfg.lockType == LockType.AREND_GRADE)
+            else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
-                return ArenaDataManager.Instance.Grade >= cfg.lockValue;
+                int lockValue = shopCfg.lockValue;
+                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
+                {
+                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
+                    lockValue = isDown ? Math.Min(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
+                }
+                return ArenaDataManager.Instance.Grade >= lockValue;
             }
             return true;
         }
@@ -360,7 +366,14 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
-                ArenaRankCfg arenaRankCfg = ArenaRankCfgArray.Instance.GetCfg(shopCfg.lockValue);
+                int lockValue = shopCfg.lockValue;
+                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
+                {
+                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
+                    lockValue = isDown ? Math.Min(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
+                }
+                ArenaRankCfg arenaRankCfg = ArenaRankCfgArray.Instance.GetCfg(lockValue);
+
                 return string.Format("飞花令段位达到{0}解锁", arenaRankCfg.gradeName);
             }
             return "";