guodong 1 年之前
父節點
當前提交
0f18b1365c

+ 11 - 8
GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjUI.cs

@@ -21,7 +21,8 @@ namespace GFGGame
 
         public void ResetSceneObj(int scale = 100, bool needSetMask = false, bool showSceneType = true, GameObject roleObj = null, bool showBg = true)
         {
-            if(sceneObject == null)
+            dressUpObj.TakeOffAll();
+            if (sceneObject == null)
                 sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath(this.prefabName));
             sceneObject.transform.localScale = new Vector3(scale, scale, scale);
             dressUpObj.setSceneObj(sceneObject, needSetMask, showSceneType, roleObj, showBg);
@@ -33,12 +34,7 @@ namespace GFGGame
             holder.SetNativeObject(wrapper);
             wrapper.wrapTarget = sceneObject;
         }
-
-        public void SetScale(Vector2 vector2)
-        {
-            wrapper.scale = vector2;
-        }
-
+        
         public void Dispose()
         {
             if (sceneObject != null)
@@ -55,6 +51,10 @@ namespace GFGGame
 
             if (wrapper != null)
             {
+                if (wrapper.wrapTarget != null)
+                {
+                    wrapper.wrapTarget = null;
+                }
                 wrapper.Dispose();
                 wrapper = null;
             }
@@ -67,7 +67,10 @@ namespace GFGGame
                 Timers.inst.Remove(OnUpdate);
                 return;
             }
-            wrapper.wrapTarget = sceneObject;
+            if(wrapper != null)
+            {
+                wrapper.wrapTarget = sceneObject;
+            }
             //wrapper.CacheRenderers();
         }
     }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Effect/EffectUI.cs

@@ -51,6 +51,7 @@ namespace GFGGame
                     _wrapper.wrapTarget = null;
                 }
                 _wrapper.Dispose();
+                _wrapper = null;
             }
         }