Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/Bat/updateArtRes.bat

@@ -1,3 +1,4 @@
 echo %1
 cd ../../../../../../gfg/%1
-svn up --force --accept tc
+svn cleanup
+svn up --force --accept tc

GameClient/Assets/Editor/Bat/updateGameRes.bat

@@ -1,2 +1,3 @@
 cd ../../../Assets/Res
+svn cleanup
 svn up --force --accept tc

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -345,7 +345,7 @@ namespace GFGGame
             {
                 DecomposeSkillCfg decomposeSkillCfg = DecomposeSkillCfgArray.Instance.GetCfg(_curRarity);
                 itemId = decomposeSkillCfg.itemsArr[index][0];
-                itemNum = decomposeSkillCfg.itemsArr[index][1] * _decomposeCount;
+                itemNum = decomposeSkillCfg.itemsArr[index][1] * _decoNormalCount;
             }
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             item.m_txtCount.text = itemNum.ToString();