diff --git a/ProjectNLD/Assets/Code/Scripts/GameWrapper/Camera/CameraController.cs b/ProjectNLD/Assets/Code/Scripts/GameWrapper/Camera/CameraController.cs index 57f396005dc..283b723a046 100644 --- a/ProjectNLD/Assets/Code/Scripts/GameWrapper/Camera/CameraController.cs +++ b/ProjectNLD/Assets/Code/Scripts/GameWrapper/Camera/CameraController.cs @@ -122,7 +122,7 @@ public class CameraController : MonoBehaviour targetZoomScale = ZoomScale; targetPanPosition = transform.position; - var useOrthographic = CameraServiceLocator.CameraService.UseOrthographicMode; + var useOrthographic = Application.isPlaying && CameraServiceLocator.CameraService.UseOrthographicMode; if (useOrthographic) { @@ -362,8 +362,7 @@ public class CameraController : MonoBehaviour public void InitializeCameraPosition(Vector3 targetPosition, MapData.CameraInfo cameraInfo = null) { - var useOrthographic = CameraServiceLocator.CameraService.UseOrthographicMode; - + var useOrthographic = Application.isPlaying && CameraServiceLocator.CameraService.UseOrthographicMode; mainCamera.transform.position = CalculateCell2CameraPosition(targetPosition); // 进入关卡初始化相机 diff --git a/ProjectNLD/Assets/Editor/Scene/PostProcesser/ScenePostProcessor.cs b/ProjectNLD/Assets/Editor/Scene/PostProcesser/ScenePostProcessor.cs index 277b47c1b20..39322284390 100644 --- a/ProjectNLD/Assets/Editor/Scene/PostProcesser/ScenePostProcessor.cs +++ b/ProjectNLD/Assets/Editor/Scene/PostProcesser/ScenePostProcessor.cs @@ -72,7 +72,6 @@ public class ScenePostProcessor : PostProcessor EditorSceneManager.CloseScene(scene, true); } - DebugUtil.LogError($"克隆的Scene是{Scene.name}"); AssetDatabase.CopyAsset(Scene.path, OutputAssetPath); AssetDatabase.Refresh(); ClonedScene = EditorSceneManager.OpenScene(OutputAssetPath, OpenSceneMode.Additive); diff --git a/ProjectNLD/Assets/Editor/Scene/PostProcesser/Utils/MaterialUtils.cs b/ProjectNLD/Assets/Editor/Scene/PostProcesser/Utils/MaterialUtils.cs index 5ad69716afb..bc3bc0e9992 100644 --- a/ProjectNLD/Assets/Editor/Scene/PostProcesser/Utils/MaterialUtils.cs +++ b/ProjectNLD/Assets/Editor/Scene/PostProcesser/Utils/MaterialUtils.cs @@ -359,7 +359,12 @@ public static class MaterialUtils // 如果是预制体实例,解包它 if (PrefabUtility.IsPartOfPrefabInstance(obj)) { - PrefabUtility.UnpackPrefabInstance(obj, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction); + // 只有在对象是预制体根节点时才解包 + GameObject prefabRoot = PrefabUtility.GetOutermostPrefabInstanceRoot(obj); + if (prefabRoot == obj) + { + PrefabUtility.UnpackPrefabInstance(obj, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction); + } } }