Browse Source

拍照bug修复

guodong 2 years ago
parent
commit
1396468a97

+ 1 - 1
GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -78,7 +78,7 @@ namespace GFGGame
         /// <param name="resetData">是否重置装备数据</param>
         public void setSceneObj(GameObject sceneObj, bool needSetMask = false, bool showSceneType = true, GameObject roleObj = null, bool showBg = true)
         {
-            if (_sceneObj != null)
+            if (_sceneObj != null && _sceneObj != sceneObj)
             {
                 GameObject.Destroy(_sceneObj);
             }

+ 1 - 5
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -131,8 +131,8 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
             }
+            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
             _ui.m_comboBox.selectedIndex = CustomSuitDataManager.currentIndex;
             MyDressUpHelper.PutOnSuitSavedByPos(CustomSuitDataManager.currentIndex);
             // UpdateStepBtn();
@@ -145,7 +145,6 @@ namespace GFGGame
             base.OnHide();
             listTypeItem_FreedomDress = null;
             // MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
-            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);//在拍照界面断线返回登录,需要重新设置_sceneObject
             MyDressUpHelper.dressUpObj.TakeOffAll();
 
             if (_sceneObject != null)
@@ -982,9 +981,6 @@ namespace GFGGame
         {
             _ui.target.visible = true;
             this._sceneObject.gameObject.SetActive(true);
-
-            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
-
         }
         private void SetBtnShowVisable(object param)
         {

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -125,9 +125,8 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
-                PhotographSceneManager.Instance.sceneObject = _sceneObject;
             }
+            PhotographSceneManager.Instance.sceneObject = _sceneObject;
             pinchGesture = new PinchGesture(_ui.target);
             pinchGesture.onAction.Add(OnPinch);
             rotationGesture = new RotationGesture(_ui.target);