Merge remote-tracking branch 'remotes/origin/guodong' into zhaoyang

# Conflicts:

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 0189864671f6a536cc933657fa7585307a63eb4b
+Subproject commit 5590777eebf2bdb8132ab0659dd8453e9409a198

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/ClothingShopCfgManager.cs

@@ -28,24 +28,6 @@ namespace GFGGame
             return list;
         }
 
-        private List<ShopCfg> ShopCfgs(int storeId)
-        {
-            ShopCfg[] shopCfgs = null;
-            switch (storeId)
-            {
-                case ConstStoreId.CLOTHING_STORE_ID:
-                    shopCfgs = ShopCfgClothingArray.Instance.dataArray;
-                    break;
-                case ConstStoreId.LUCKY_BOX_STORE_ID:
-                    shopCfgs = ShopCfgCJArray.Instance.dataArray;
-
-                    break;
-                case ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID:
-                    shopCfgs = ShopCfgCJAArray.Instance.dataArray;
-                    break;
-            }
-            return new List<ShopCfg>(shopCfgs);
-        }
         public ShopCfg GetShopCfg(int buyId, int shopType)
         {
             switch (shopType)