diff --git a/Cyan-Stars/Assets/BundleRes/Scenes/ChartEditor.unity b/Cyan-Stars/Assets/BundleRes/Scenes/ChartEditor.unity index 12fc66a81..4005aa967 100644 --- a/Cyan-Stars/Assets/BundleRes/Scenes/ChartEditor.unity +++ b/Cyan-Stars/Assets/BundleRes/Scenes/ChartEditor.unity @@ -641,12 +641,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 927531575} - - {fileID: 239559644} - - {fileID: 941236135} - - {fileID: 1322313311} - - {fileID: 1785560136} - - {fileID: 1080855815} + - {fileID: 817993296} + - {fileID: 1943367338} - {fileID: 1643976276} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -670,6 +666,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9164618fce3f9d84c869493f9f8af678, type: 3} m_Name: m_EditorClassIdentifier: + sceneCamera: {fileID: 817993299} mvvmBindManager: {fileID: 927531576} commandStack: {fileID: 239559645} musicManager: {fileID: 941236136} @@ -1311,7 +1308,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1595764877} m_Direction: 2 m_Value: 1 - m_Size: 0.60533637 + m_Size: 0.60096276 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2109,7 +2106,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 157.99997, y: -249.99994} + m_AnchoredPosition: {x: 158, y: -249.99994} m_SizeDelta: {x: -315, y: -320} m_Pivot: {x: 0, y: 1} --- !u!114 &129409717 @@ -3608,12 +3605,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 239559643} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1201.4104, y: -869.08887, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 32066487} + m_Father: {fileID: 1943367338} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &239559645 MonoBehaviour: @@ -4600,7 +4597,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1070775234} m_Direction: 2 m_Value: 1 - m_Size: 0.41103238 + m_Size: 0.4086415 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4660,7 +4657,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -210.00003} + m_AnchoredPosition: {x: -40, y: -210} m_SizeDelta: {x: 3, y: -210.00003} m_Pivot: {x: 1, y: 1} --- !u!1 &308499684 @@ -8440,7 +8437,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1573881464} m_HandleRect: {fileID: 1573881463} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -9996,7 +9993,6 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CyanStars.Gameplay.ChartEditor.View.BpmGroupView closeCanvasButton: {fileID: 584011670} bpmListItemPrefab: {fileID: 1084994031255308922, guid: a5036c9887aeb494f912cb0b7b23c632, type: 3} - bpmListToggleGroup: {fileID: 0} itemContentTransform: {fileID: 475630455} bpmGroupListGameObject: {fileID: 2075881149} addBpmItemButton: {fileID: 1372622811} @@ -11266,7 +11262,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 57909431} m_HandleRect: {fileID: 57909430} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -14230,6 +14226,134 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 0 +--- !u!1 &817993295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 817993296} + - component: {fileID: 817993299} + - component: {fileID: 817993297} + m_Layer: 0 + m_Name: SceneCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &817993296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817993295} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 32066487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &817993297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817993295} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!20 &817993299 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817993295} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &836863333 GameObject: m_ObjectHideFlags: 0 @@ -15120,12 +15244,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 927531574} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1201.4104, y: -869.08887, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 32066487} + m_Father: {fileID: 1943367338} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &927531576 MonoBehaviour: @@ -15465,12 +15589,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 941236134} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1201.4104, y: -869.08887, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 32066487} + m_Father: {fileID: 1943367338} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &941236136 MonoBehaviour: @@ -16669,7 +16793,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 477995409} m_HandleRect: {fileID: 477995407} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -16700,7 +16824,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -210.00003} + m_AnchoredPosition: {x: -40, y: -210} m_SizeDelta: {x: 3, y: -210.00003} m_Pivot: {x: 1, y: 1} --- !u!1 &1013333565 @@ -18110,12 +18234,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1080855814} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1201.4104, y: -869.08887, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 32066487} + m_Father: {fileID: 1943367338} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1080855816 MonoBehaviour: @@ -18164,7 +18288,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 158, y: -210.00003} + m_AnchoredPosition: {x: 158, y: -210} m_SizeDelta: {x: -315, y: -210} m_Pivot: {x: 0, y: 1} --- !u!114 &1108209279 @@ -21706,7 +21830,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -9.572607} + m_AnchoredPosition: {x: 0, y: -9.572601} m_SizeDelta: {x: -315, y: -327.235} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1320205474 @@ -21834,12 +21958,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322313310} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1201.4104, y: -869.08887, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 32066487} + m_Father: {fileID: 1943367338} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1322313312 MonoBehaviour: @@ -22946,7 +23070,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -210.00003} + m_AnchoredPosition: {x: -40, y: -210} m_SizeDelta: {x: 3, y: -210.00003} m_Pivot: {x: 1, y: 1} --- !u!114 &1389153731 @@ -26622,8 +26746,8 @@ Canvas: m_GameObject: {fileID: 1643976272} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} + m_RenderMode: 1 + m_Camera: {fileID: 817993299} m_PlaneDistance: 100 m_PixelPerfect: 1 m_ReceivesEvents: 1 @@ -28202,12 +28326,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1785560135} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1201.4104, y: -869.08887, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 32066487} + m_Father: {fileID: 1943367338} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1785560137 MonoBehaviour: @@ -29245,7 +29369,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 158, y: -210.00003} + m_AnchoredPosition: {x: 158, y: -210} m_SizeDelta: {x: -315, y: -210} m_Pivot: {x: 0, y: 1} --- !u!114 &1897666587 @@ -29727,6 +29851,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1939229441} m_CullTransparentMesh: 1 +--- !u!1 &1943367337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1943367338} + m_Layer: 0 + m_Name: Management + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1943367338 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943367337} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 927531575} + - {fileID: 239559644} + - {fileID: 941236135} + - {fileID: 1322313311} + - {fileID: 1785560136} + - {fileID: 1080855815} + m_Father: {fileID: 32066487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1945787382 GameObject: m_ObjectHideFlags: 0 @@ -31217,7 +31378,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 158, y: -210.00003} + m_AnchoredPosition: {x: 158, y: -210} m_SizeDelta: {x: -315, y: -280} m_Pivot: {x: 0, y: 1} --- !u!114 &2076785562 @@ -31321,7 +31482,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 158, y: -250.00003} + m_AnchoredPosition: {x: 158, y: -250} m_SizeDelta: {x: -315, y: -320} m_Pivot: {x: 0, y: 1} --- !u!114 &2093964918 diff --git a/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorProcedure.cs b/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorProcedure.cs index 5e7651e03..d7c34e3a7 100644 --- a/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorProcedure.cs +++ b/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorProcedure.cs @@ -21,9 +21,12 @@ public class ChartEditorProcedure : BaseState public override async void OnEnter() { + GameRoot.MainCamera.gameObject.SetActive(false); + // 打开场景并检查制谱器 SceneRoot 状态 chartEditorSceneHandler = await GameRoot.Asset.LoadSceneAsync(ScenePath); Scene chartEditorScene = chartEditorSceneHandler.Scene; + SceneManager.SetActiveScene(chartEditorScene); ChartEditorSceneRoot? sceneRoot = null; int foundCount = 0; @@ -68,6 +71,8 @@ public override void OnUpdate(float deltaTime) public override void OnExit() { + GameRoot.MainCamera.gameObject.SetActive(true); + ChartEditorDataModule chartEditorDataModule = GameRoot.GetDataModule(); chartEditorDataModule.OnExitChartEditorProcedure(); GameRoot.Asset.UnloadScene(chartEditorSceneHandler); diff --git a/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorSceneRoot.cs b/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorSceneRoot.cs index ff5882b95..5f163a62e 100644 --- a/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorSceneRoot.cs +++ b/Cyan-Stars/Assets/Scripts/Gameplay/ChartEditor/ChartEditorSceneRoot.cs @@ -13,6 +13,9 @@ namespace CyanStars.Gameplay.ChartEditor { public class ChartEditorSceneRoot : MonoBehaviour { + [SerializeField] + private Camera sceneCamera = null!; + [SerializeField] private MvvmBindManager mvvmBindManager = null!;