diff --git a/Assets/Plugins/Flee b/Assets/Plugins/Flee index c9e2493..a09b3c1 160000 --- a/Assets/Plugins/Flee +++ b/Assets/Plugins/Flee @@ -1 +1 @@ -Subproject commit c9e249379698b92caeeb9486ce07237f664f48ac +Subproject commit a09b3c1eb1f6b2ea840540d1e46737de6573560a diff --git a/Assets/Scenes/Game/EditorWord.prefab b/Assets/Scenes/Game/EditorWord.prefab index b89e48d..ab0ddae 100644 --- a/Assets/Scenes/Game/EditorWord.prefab +++ b/Assets/Scenes/Game/EditorWord.prefab @@ -198,7 +198,6 @@ 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 48d2a59..21560ba 100644 --- a/Assets/Scripts/Framework/GameContent/GameController.cs +++ b/Assets/Scripts/Framework/GameContent/GameController.cs @@ -355,6 +355,7 @@ namespace Demo.Game { try { + Stop(); yield return MainObject.UnloadScript(); } finally diff --git a/Assets/Scripts/MoreSpline/SplineAnchor.cs b/Assets/Scripts/MoreSpline/SplineAnchor.cs index d984583..4f454fd 100644 --- a/Assets/Scripts/MoreSpline/SplineAnchor.cs +++ b/Assets/Scripts/MoreSpline/SplineAnchor.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace Demo.Game { - public class SplineAnchor : ScriptableObject,IDependOnSplineCore, IDependOnSplineRenderer + public class SplineAnchor : ScriptableObject, IDependOnSplineCore, IDependOnSplineRenderer { public static SplineAnchor Make() { @@ -77,8 +77,7 @@ namespace Demo.Game Updater = () => { var result = MySplineRenderer.EvaluateClipTo(MySplineOffset); - transform.position = result.position; - transform.rotation = result.rotation; + transform.SetPositionAndRotation(result.position, result.rotation); }; } else if (bIsFollowPosition)