Merge remote-tracking branch 'remotes/origin/master' into ios_test

GameClient/Assets/Editor/ToolsMenu.cs

@@ -40,6 +40,12 @@ namespace GFGEditor
         {
             
         }
+#elif PT_IOS
+        [MenuItem("IOS/")]
+        public static void VersionTag()
+        {
+            
+        }
 #elif PT_DOUYOU
         [MenuItem("DouYou/")]
         public static void VersionTag()

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -130,7 +130,7 @@ namespace GFGGame
                         modelInfos[_index] = new ModelInfo();
                         _dressUpObjUIs[_index].UpdateWrapper(comRes.m_holder);
                         comRes.m_holder.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
-                        _dressUpObjUIs[_index].ResetSceneObj(scale, false, false, null, false);
+                        _dressUpObjUIs[_index].ResetSceneObj(scale, false, true, null, false);
                         _dressUpObjUIs[_index].dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitIdArr[_modelIndex], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                         Timers.inst.StartCoroutine(DelayShowModel(direction));
                     }
@@ -230,7 +230,7 @@ namespace GFGGame
         private void ShowModel()
         {
             ChangeModelAlphaAnim(_index, 0, 1);
-            Transform obj = _dressUpObjUIs[_index].sceneObject.transform.Find("Role");
+            Transform obj = _dressUpObjUIs[_index].sceneObject.transform;
             if(obj != null)
             {
                 obj.gameObject.SetActive(true);
@@ -241,7 +241,7 @@ namespace GFGGame
         {
             InitModel(_index);
             ChangeModelAlphaAnim(_index, 1, 0);
-            Transform obj = _dressUpObjUIs[_index].sceneObject.transform.Find("Role");
+            Transform obj = _dressUpObjUIs[_index].sceneObject.transform;
             if(obj != null)
             {
                 obj.gameObject.SetActive(false);