Fix error when canceling operation

yojohanshinwataikei · Nov 10, 2023 · bbfe979 · bbfe979
1 parent 1238fb9
commit bbfe979
Show file tree

Hide file tree

Showing 6 changed files with 454 additions and 56 deletions.
diff --git a/Assets/Materials/Player/TrackBorderLeft.mat b/Assets/Materials/Player/TrackBorderLeft.mat
@@ -72,7 +72,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0.26213914
+    - _Phase: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Materials/Player/TrackBorderRight.mat b/Assets/Materials/Player/TrackBorderRight.mat
@@ -72,7 +72,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0.26213914
+    - _Phase: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Materials/Player/TrackMain.mat b/Assets/Materials/Player/TrackMain.mat
@@ -72,7 +72,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0.26213914
+    - _Phase: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Misc/ChangeLog.txt b/Assets/Misc/ChangeLog.txt
@@ -1,3 +1,10 @@
+0.5.2
+
+- 强制音画同步现在默认关闭， 可以在设置窗口内重新打开
+- 修复用快捷键取消部分操作时会报错的问题
+
+---
+
 0.5.1
 
 - 轨道的速度现在会随着谱面流速变化了

diff --git a/Assets/Scripts/Compose/Editing/AdeOperationManager.cs b/Assets/Scripts/Compose/Editing/AdeOperationManager.cs
@@ -62,7 +62,7 @@ void Update()
 				{
 					CancelOngoingOperation();
 				}
-				if (ongoingOperation.Value.task.Status != UniTaskStatus.Pending)
+				if (ongoingOperation?.task.Status != UniTaskStatus.Pending)
 				{
 					ongoingOperation = null;
 				}