Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

GameClient/Assets/BuildSetting.asset

@@ -18,6 +18,7 @@ MonoBehaviour:
   - Assets/Res/Effect/DressUp
   - Assets/Res/Effect/UI
   - Assets/ResIn/UI
+  - Assets/ResIn/Dll
   dirTypeList:
   - texture_dressup_es_
   - texture_dressup_js_

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

@@ -178,13 +178,13 @@ namespace GFGGame
         }
         private List<GiftBagCfg> GetNoneGiftCfg()
         {
-            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgs(LockType.NONE));
+            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.NONE));
             
             return giftBagCfgs;
         }
         private GiftBagCfg GetStoryLvGiftCfg()
         {
-            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgs(LockType.STORY_LV);
+            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.STORY_LV);
             if (giftBagCfgs.Count == 0) return null;
             giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
             {
@@ -202,7 +202,7 @@ namespace GFGGame
         }
         private GiftBagCfg GetRoleLvGiftCfg()
         {
-            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgs(LockType.ROLE_LV);
+            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.ROLE_LV);
             if (giftBagCfgs.Count == 0) return null;
             giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
             {