diff --git a/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta b/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta new file mode 100644 index 000000000..4801b3793 --- /dev/null +++ b/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 560a88da2bbc70140bed167f0ba7fe37 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta b/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta new file mode 100644 index 000000000..77d64a86c --- /dev/null +++ b/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fb01be13d6e88ca488dda82150319bfc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta b/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta new file mode 100644 index 000000000..05e590027 --- /dev/null +++ b/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 117dcc671050f5247bd8743b91ecaab7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 5b96b11bd..29128ec49 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -18,6 +18,8 @@ namespace AibisDream.FixSystem public IEnumerator SwitchState(FixState nextState, string args = "") { + if (CurState == nextState) yield break; + _curArgs = args; yield return _curState?.Exit(); diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs index 63fe76b2d..22c3c3a4f 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs @@ -121,7 +121,10 @@ namespace AibisDream.FixSystem // 先清除文字 ClearTextScreen(); // 旋转隐藏 - _textScreen.DORotate(new Vector3(0, 0, -90), rotateDuration, RotateMode.FastBeyond360); + if (transform.eulerAngles.z >= -80f) + { + _textScreen.DORotate(new Vector3(0, 0, -90), rotateDuration, RotateMode.FastBeyond360); + } } #endregion diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs index 73553a911..b9e8d02f7 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs @@ -9,9 +9,9 @@ namespace AibisDream.FixSystem private static ScreenSystem ScreenSystem => FixSystemCenter.SystemDic.Get(); [YarnCommand("open_screen")] - public static IEnumerator OpenScreen() + public static IEnumerator OpenScreen(string picName = "gear") { - Sprite sprite = Resources.Load("Art/Obj/gear"); + Sprite sprite = Resources.Load($"Art/Obj/{picName}"); return ScreenSystem.OnLink(sprite); } diff --git a/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs b/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs index 21a900c0c..1f64f9fd7 100644 --- a/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs +++ b/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs @@ -9,10 +9,9 @@ namespace AibisDream private static GearSystem GearSystem => FixSystemCenter.SystemDic.Get(); [YarnCommand("move_needle")] - public static IEnumerator MoveNeedle() + public static IEnumerator MoveNeedle(int discIdx) { - DialogController.Instance.TryGetVariable("$discIdx", out var discIdx); - return FixSystemCenter.SystemDic.Get().MoveNeedle((int) discIdx); + return FixSystemCenter.SystemDic.Get().MoveNeedle(discIdx); } [YarnCommand("open_gear_panel")]