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

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanUpView.cs

@@ -89,7 +89,7 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(itemData);
             (obj.data as ItemView).SetComItemScale = 0.85f;
-            (obj.data as ItemView).SetTxtCountPos(185, 155);
+            //(obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainStory/ArenaFightResultView.cs

@@ -84,7 +84,8 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightResult"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);