Merge branch 'bugfix/fadein' into 'develop'

Bugfix/fadein See merge request aibis-dream/aibis-dream!259
2025-02-21 03:15:03 +00:00
parent 6cf743afc7 91263a98bc
commit bfe7db351c
9 changed files with 33 additions and 8 deletions
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 560a88da2bbc70140bed167f0ba7fe37
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fb01be13d6e88ca488dda82150319bfc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 117dcc671050f5247bd8743b91ecaab7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -476,7 +476,7 @@ shitou: 该播放音乐了吗？医生！
 // <<wait 2>>
 me: 音乐？

-<<move_needle>>
+<<move_needle 1>>
 <<wait 1>>
 <<play_loop_audio disc>>
 <<wait 2>>
@@ -199,7 +199,7 @@ shitou: 我好紧张，感觉~像演唱会一样！
 <<hide_dialog>>
 <<fade_out 1>>
 <<wait 1>>
-<<move_needle>>
+<<move_needle 1>>
 me: 好了…接下来，只需要唱出来，声音就会被这个齿轮记录下来。
 <<hide_dialog>>
 <<step_on_gas 0.5 3>>
@@ -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();
@@ -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
@@ -9,9 +9,9 @@ namespace AibisDream.FixSystem
        private static ScreenSystem ScreenSystem => FixSystemCenter.SystemDic.Get<ScreenSystem>();

        [YarnCommand("open_screen")]
-        public static IEnumerator OpenScreen()
+        public static IEnumerator OpenScreen(string picName = "gear")
        {
-            Sprite sprite = Resources.Load<Sprite>("Art/Obj/gear");
+            Sprite sprite = Resources.Load<Sprite>($"Art/Obj/{picName}");
            return ScreenSystem.OnLink(sprite);
        }

@@ -9,10 +9,9 @@ namespace AibisDream
        private static GearSystem GearSystem => FixSystemCenter.SystemDic.Get<GearSystem>();
        
        [YarnCommand("move_needle")]
-        public static IEnumerator MoveNeedle()
+        public static IEnumerator MoveNeedle(int discIdx)
        {
-            DialogController.Instance.TryGetVariable<float>("$discIdx", out var discIdx);
-            return FixSystemCenter.SystemDic.Get<GearSystem>().MoveNeedle((int) discIdx);
+            return FixSystemCenter.SystemDic.Get<GearSystem>().MoveNeedle(discIdx);
        }
        
        [YarnCommand("open_gear_panel")]