Merge remote-tracking branch 'remotes/origin/master' into GFG

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

@@ -177,6 +177,10 @@ namespace GFGGame
             {
                 return true;
             }
+            else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE && shopCfg.menu2 == 2)
+            {
+                return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold) || RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold);
+            }
             else if (shopCfg.lockType == LockType.STORY_LV)
             {
                 return InstanceZonesDataManager.CheckLevelPass(shopCfg.lockValue);