修改编辑下相机报错
parent
4ede122621
commit
dbfb8f5be7
|
|
@ -122,7 +122,7 @@ public class CameraController : MonoBehaviour
|
||||||
targetZoomScale = ZoomScale;
|
targetZoomScale = ZoomScale;
|
||||||
targetPanPosition = transform.position;
|
targetPanPosition = transform.position;
|
||||||
|
|
||||||
var useOrthographic = CameraServiceLocator.CameraService.UseOrthographicMode;
|
var useOrthographic = Application.isPlaying && CameraServiceLocator.CameraService.UseOrthographicMode;
|
||||||
|
|
||||||
if (useOrthographic)
|
if (useOrthographic)
|
||||||
{
|
{
|
||||||
|
|
@ -362,8 +362,7 @@ public class CameraController : MonoBehaviour
|
||||||
|
|
||||||
public void InitializeCameraPosition(Vector3 targetPosition, MapData.CameraInfo cameraInfo = null)
|
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);
|
mainCamera.transform.position = CalculateCell2CameraPosition(targetPosition);
|
||||||
|
|
||||||
// 进入关卡初始化相机
|
// 进入关卡初始化相机
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,6 @@ public class ScenePostProcessor : PostProcessor
|
||||||
EditorSceneManager.CloseScene(scene, true);
|
EditorSceneManager.CloseScene(scene, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
DebugUtil.LogError($"克隆的Scene是{Scene.name}");
|
|
||||||
AssetDatabase.CopyAsset(Scene.path, OutputAssetPath);
|
AssetDatabase.CopyAsset(Scene.path, OutputAssetPath);
|
||||||
AssetDatabase.Refresh();
|
AssetDatabase.Refresh();
|
||||||
ClonedScene = EditorSceneManager.OpenScene(OutputAssetPath, OpenSceneMode.Additive);
|
ClonedScene = EditorSceneManager.OpenScene(OutputAssetPath, OpenSceneMode.Additive);
|
||||||
|
|
|
||||||
|
|
@ -358,10 +358,15 @@ public static class MaterialUtils
|
||||||
|
|
||||||
// 如果是预制体实例,解包它
|
// 如果是预制体实例,解包它
|
||||||
if (PrefabUtility.IsPartOfPrefabInstance(obj))
|
if (PrefabUtility.IsPartOfPrefabInstance(obj))
|
||||||
|
{
|
||||||
|
// 只有在对象是预制体根节点时才解包
|
||||||
|
GameObject prefabRoot = PrefabUtility.GetOutermostPrefabInstanceRoot(obj);
|
||||||
|
if (prefabRoot == obj)
|
||||||
{
|
{
|
||||||
PrefabUtility.UnpackPrefabInstance(obj, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
|
PrefabUtility.UnpackPrefabInstance(obj, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 在整个场景中查找并替换所有材质引用
|
/// 在整个场景中查找并替换所有材质引用
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue