From 5539431a5b72b736fc88a07249a06b5d40c3c066 Mon Sep 17 00:00:00 2001 From: ninemine <1371605831@qq.com> Date: Fri, 10 Oct 2025 01:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=8E=B0=E4=BA=86=E4=BD=8D=E4=BA=8ENa?= =?UTF-8?q?tive=E5=A0=86=E4=B8=8A=E4=B8=A5=E9=87=8D=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AD=98=E6=B3=84=E9=9C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Convention | 2 +- Assets/Scenes/Game/EditorScene.unity | 90 ++++++++++++++++++- Assets/Scenes/Game/EditorWord.prefab | 1 + .../Framework/GameContent/GameController.cs | 9 +- Assets/Scripts/Framework/ScriptableObject.cs | 10 +-- ProjectSettings/ProjectSettings.asset | 2 +- 6 files changed, 98 insertions(+), 16 deletions(-) diff --git a/Assets/Convention b/Assets/Convention index 7906203..6271171 160000 --- a/Assets/Convention +++ b/Assets/Convention @@ -1 +1 @@ -Subproject commit 7906203f84a68c8af632ea4368ac919f494a8aba +Subproject commit 6271171ab4cb5e3e293844abe073c4943207a5d5 diff --git a/Assets/Scenes/Game/EditorScene.unity b/Assets/Scenes/Game/EditorScene.unity index b95e88d..a2a422c 100644 --- a/Assets/Scenes/Game/EditorScene.unity +++ b/Assets/Scenes/Game/EditorScene.unity @@ -158,13 +158,37 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 388988344062002487, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 388988344062002487, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 388988344062002487, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 388988344062002487, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 737963510356043975, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 737963510356043975, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 775572912073539602, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.00001859665 + value: -0.000014662743 objectReference: {fileID: 0} - target: {fileID: 775572912073539602, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000013947487 + value: -0.000990873 objectReference: {fileID: 0} - target: {fileID: 997591790961255738, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchorMax.y @@ -202,6 +226,18 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1896719660929114435, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1946711086260906226, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1946711086260906226, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1990926332213494272, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -242,6 +278,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2348122663873981995, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2348122663873981995, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2348122663873981995, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2348122663873981995, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2406476460239080808, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2406476460239080808, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2406476460239080808, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2521196912701259155, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -292,12 +356,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3369554770199677005, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.0000010728836 + value: -0.000009849668 objectReference: {fileID: 0} - target: {fileID: 3400394456054819598, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3444697562495124443, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3444697562495124443, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4490919212454996252, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -322,6 +394,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4537333342180246510, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4537333342180246510, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4796788112176853989, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_Name value: EditorWord @@ -334,6 +414,10 @@ PrefabInstance: propertyPath: m_Value value: 1 objectReference: {fileID: 0} + - target: {fileID: 5832146162940797674, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} + propertyPath: IsDisableGC + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6049043771459676306, guid: c659abfe74df5de47a769f8d52c18fcc, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Scenes/Game/EditorWord.prefab b/Assets/Scenes/Game/EditorWord.prefab index ab0ddae..b89e48d 100644 --- a/Assets/Scenes/Game/EditorWord.prefab +++ b/Assets/Scenes/Game/EditorWord.prefab @@ -198,6 +198,7 @@ MonoBehaviour: BPMFraction: 1 SongOffset: 0 BPM: 60 + IsDisableGC: 0 ToolSongTimeButton: {fileID: 8680706935683541890} CameraPositionButton: {fileID: 8665890749222113748} CameraRotationButton: {fileID: 8233090674995911520} diff --git a/Assets/Scripts/Framework/GameContent/GameController.cs b/Assets/Scripts/Framework/GameContent/GameController.cs index 88d8ccc..48d2a59 100644 --- a/Assets/Scripts/Framework/GameContent/GameController.cs +++ b/Assets/Scripts/Framework/GameContent/GameController.cs @@ -278,9 +278,8 @@ namespace Demo.Game private bool IsScrollTimeline = false; -#if UNITY_EDITOR + public ProfilerMarker s_PreparePerfMarkerForSetSongCurrentTime = new(nameof(GameController) + "RuntimeForSetSongCurrentTime"); public ProfilerMarker s_PreparePerfMarker = new(nameof(GameController) + "Runtime"); -#endif private void Update() { @@ -294,15 +293,15 @@ namespace Demo.Game // TODO : 修正这个逻辑，这个逻辑是反常的 if (MainAudio.IsPlaying()) { + s_PreparePerfMarkerForSetSongCurrentTime.Begin(); SetSongCurrentTime(CurrentTime); + s_PreparePerfMarkerForSetSongCurrentTime.End(); MainObject.ScriptUpdate(CurrentTime, deltaTime, ScriptableObject.TickType.Update); } if (IsMain == false) return; -#if UNITY_EDITOR s_PreparePerfMarker.Begin(this); -#endif #if UNITY_EDITOR if (Keyboard.current[Key.LeftShift].isPressed) #else @@ -349,9 +348,7 @@ namespace Demo.Game } } } -#if UNITY_EDITOR s_PreparePerfMarker.End(); -#endif } public IEnumerator GameExit() diff --git a/Assets/Scripts/Framework/ScriptableObject.cs b/Assets/Scripts/Framework/ScriptableObject.cs index 3eeb6d5..383532a 100644 --- a/Assets/Scripts/Framework/ScriptableObject.cs +++ b/Assets/Scripts/Framework/ScriptableObject.cs @@ -647,8 +647,8 @@ namespace Demo public void EnableScript(string sourcePath, string scriptPath, string scriptType, ScriptableObject parent) { -#if UNITY_EDITOR - s_PreparePerfMarker = new(scriptPath); +#if UNITY_EDITOR||true + s_PreparePerfMarker = new(ScriptName); #endif if (isEnableScript) { @@ -705,7 +705,7 @@ namespace Demo public string ScriptPath; public string ScriptTypename; -#if UNITY_EDITOR +#if UNITY_EDITOR||true public ProfilerMarker s_PreparePerfMarker; #endif public ScriptableObject Parent; @@ -1129,7 +1129,7 @@ namespace Demo return; if (gameObject.activeInHierarchy == false) return; -#if UNITY_EDITOR +#if UNITY_EDITOR||true s_PreparePerfMarker.Begin(this); #endif if (tickType == TickType.Reset) @@ -1148,7 +1148,7 @@ namespace Demo { child.ScriptUpdate(currentTime, deltaTime, tickType); } -#if UNITY_EDITOR +#if UNITY_EDITOR||true s_PreparePerfMarker.End(); #endif } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9a10787..8c416b9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -960,7 +960,7 @@ PlayerSettings: QNX: UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING Server: UNITY_VISUAL_SCRIPTING Stadia: UNITY_POST_PROCESSING_STACK_V2 - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;PLATFORM_WINDOWS;DREAMTECK_SPLINES;UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;PLATFORM_WINDOWS;DREAMTECK_SPLINES;UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING;ENABLE_CLASS_Interaction VisionOS: UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING WebGL: UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING;DREAMTECK_SPLINES;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 Windows Store Apps: UNITY_VISUAL_SCRIPTING