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

GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -212,9 +212,9 @@ namespace GFGGame
             });
         }
 
-        public static string GetItemResExt(int itemType, int type)
+        public static string GetItemResExt(int itemType, int type, bool isIcon = false)
         {
-            if (itemType == ConstItemType.DRESS_UP && type == ConstDressUpItemType.BEI_JING)
+            if (itemType == ConstItemType.DRESS_UP && type == ConstDressUpItemType.BEI_JING && !isIcon)
             {
                 return "jpg";
             }

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -33,7 +33,7 @@ namespace GFGGame
         }
         public static string GetIconPath(ItemCfg itemCfg)
         {
-            return GetIconPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            return GetIconPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true));
         }
         public static string GetBgImgPath(string res, string extName = "png")
         {