Merge branch 'develop' into feature/czq_0617

Assets/Language/Dialog/FP_Day2_night/FP_Day2_night Shared Data.asset

@@ -19,167 +19,167 @@ MonoBehaviour:
     m_Key: line:042d1f4
     m_Metadata:
       m_Items:
-      - rid: 128120713296478236
+      - rid: 8171259629823066436
   - m_Id: 1008678735872
     m_Key: line:046258b
     m_Metadata:
       m_Items:
-      - rid: 128120713296478237
+      - rid: 8171259629823066437
   - m_Id: 1008678735873
     m_Key: line:0c27ec0
     m_Metadata:
       m_Items:
-      - rid: 128120713296478238
+      - rid: 8171259629823066438
   - m_Id: 1008678735874
     m_Key: line:0cf563f
     m_Metadata:
       m_Items:
-      - rid: 128120713296478239
+      - rid: 8171259629823066439
   - m_Id: 1008678735875
     m_Key: line:0fecc92
     m_Metadata:
       m_Items:
-      - rid: 128120713296478240
+      - rid: 8171259629823066440
   - m_Id: 1008678735876
     m_Key: line:0ca5d54
     m_Metadata:
       m_Items:
-      - rid: 128120713296478241
+      - rid: 8171259629823066441
   - m_Id: 1008678735877
     m_Key: line:0a4bb44
     m_Metadata:
       m_Items:
-      - rid: 128120713296478242
+      - rid: 8171259629823066442
   - m_Id: 1008678735878
     m_Key: line:01c3184
     m_Metadata:
       m_Items:
-      - rid: 128120713296478243
+      - rid: 8171259629823066443
   - m_Id: 1008678735879
     m_Key: line:0fac355
     m_Metadata:
       m_Items:
-      - rid: 128120713296478244
+      - rid: 8171259629823066444
   - m_Id: 1008678735880
     m_Key: line:03eeee9
     m_Metadata:
       m_Items:
-      - rid: 128120713296478245
+      - rid: 8171259629823066445
   - m_Id: 1008678735881
     m_Key: line:0e6acdf
     m_Metadata:
       m_Items:
-      - rid: 128120713296478246
+      - rid: 8171259629823066446
   - m_Id: 1008678735882
     m_Key: line:04b5549
     m_Metadata:
       m_Items:
-      - rid: 128120713296478247
+      - rid: 8171259629823066447
   - m_Id: 1008678735883
     m_Key: line:098a997
     m_Metadata:
       m_Items:
-      - rid: 128120713296478248
+      - rid: 8171259629823066448
   - m_Id: 1008678735884
     m_Key: line:031dac4
     m_Metadata:
       m_Items:
-      - rid: 128120713296478249
+      - rid: 8171259629823066449
   - m_Id: 1008678735885
     m_Key: line:0cec1e8
     m_Metadata:
       m_Items:
-      - rid: 128120713296478250
+      - rid: 8171259629823066450
   - m_Id: 1008678735886
     m_Key: line:0d70091
     m_Metadata:
       m_Items:
-      - rid: 128120713296478251
+      - rid: 8171259629823066451
   - m_Id: 1008678735887
     m_Key: line:0e58c86
     m_Metadata:
       m_Items:
-      - rid: 128120713296478252
+      - rid: 8171259629823066452
   - m_Id: 1008678735888
     m_Key: line:07095ca
     m_Metadata:
       m_Items:
-      - rid: 128120713296478253
+      - rid: 8171259629823066453
   - m_Id: 1008678735889
     m_Key: line:0e68376
     m_Metadata:
       m_Items:
-      - rid: 128120713296478254
+      - rid: 8171259629823066454
   - m_Id: 1008678735890
     m_Key: line:0d56122
     m_Metadata:
       m_Items:
-      - rid: 128120713296478255
+      - rid: 8171259629823066455
   - m_Id: 1008678735891
     m_Key: line:00e176f
     m_Metadata:
       m_Items:
-      - rid: 128120713296478256
+      - rid: 8171259629823066456
   - m_Id: 1008678735892
     m_Key: line:0175172
     m_Metadata:
       m_Items:
-      - rid: 128120713296478257
+      - rid: 8171259629823066457
   - m_Id: 1008678735893
     m_Key: line:0bba766
     m_Metadata:
       m_Items:
-      - rid: 128120713296478258
+      - rid: 8171259629823066458
   - m_Id: 1008678735894
     m_Key: line:0945a18
     m_Metadata:
       m_Items:
-      - rid: 128120713296478259
+      - rid: 8171259629823066459
   - m_Id: 1008678735895
     m_Key: line:026c5a8
     m_Metadata:
       m_Items:
-      - rid: 128120713296478260
+      - rid: 8171259629823066460
   - m_Id: 1008678735896
     m_Key: line:09e9be9
     m_Metadata:
       m_Items:
-      - rid: 128120713296478261
+      - rid: 8171259629823066461
   - m_Id: 1008678735897
     m_Key: line:03290f5
     m_Metadata:
       m_Items:
-      - rid: 128120713296478262
+      - rid: 8171259629823066462
   - m_Id: 1008678735898
     m_Key: line:0859319
     m_Metadata:
       m_Items:
-      - rid: 128120713296478263
+      - rid: 8171259629823066463
   - m_Id: 1008678735899
     m_Key: line:006dc9f
     m_Metadata:
       m_Items:
-      - rid: 128120713296478264
+      - rid: 8171259629823066464
   - m_Id: 1008678735900
     m_Key: line:081c8cf
     m_Metadata:
       m_Items:
-      - rid: 128120713296478265
+      - rid: 8171259629823066465
   - m_Id: 1008678735901
     m_Key: line:017319f
     m_Metadata:
       m_Items:
-      - rid: 128120713296478266
+      - rid: 8171259629823066466
   - m_Id: 1008678735902
     m_Key: line:003502b
     m_Metadata:
       m_Items:
-      - rid: 128120713296478267
+      - rid: 8171259629823066467
   - m_Id: 1008678735903
     m_Key: line:057e73e
     m_Metadata:
       m_Items:
-      - rid: 128120713296478268
+      - rid: 8171259629823066468
   m_Metadata:
     m_Items: []
   m_KeyGenerator:
@@ -191,168 +191,168 @@ MonoBehaviour:
       type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization}
       data:
         m_CustomEpoch: 1746432569277
-    - rid: 128120713296478236
+    - rid: 8171259629823066436
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478237
+    - rid: 8171259629823066437
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478238
+    - rid: 8171259629823066438
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478239
+    - rid: 8171259629823066439
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478240
+    - rid: 8171259629823066440
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags:
         - lastline
-    - rid: 128120713296478241
+    - rid: 8171259629823066441
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478242
+    - rid: 8171259629823066442
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478243
+    - rid: 8171259629823066443
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478244
+    - rid: 8171259629823066444
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478245
+    - rid: 8171259629823066445
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478246
+    - rid: 8171259629823066446
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478247
+    - rid: 8171259629823066447
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478248
+    - rid: 8171259629823066448
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478249
+    - rid: 8171259629823066449
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478250
+    - rid: 8171259629823066450
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478251
+    - rid: 8171259629823066451
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478252
+    - rid: 8171259629823066452
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478253
+    - rid: 8171259629823066453
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478254
+    - rid: 8171259629823066454
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478255
+    - rid: 8171259629823066455
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478256
+    - rid: 8171259629823066456
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478257
+    - rid: 8171259629823066457
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478258
+    - rid: 8171259629823066458
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478259
+    - rid: 8171259629823066459
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478260
+    - rid: 8171259629823066460
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478261
+    - rid: 8171259629823066461
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478262
+    - rid: 8171259629823066462
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478263
+    - rid: 8171259629823066463
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478264
+    - rid: 8171259629823066464
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478265
+    - rid: 8171259629823066465
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478266
+    - rid: 8171259629823066466
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478267
+    - rid: 8171259629823066467
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 128120713296478268
+    - rid: 8171259629823066468
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start

Assets/Language/Dialog/FP_Peipei2/FP_Peipei2_zh-Hans.asset

@@ -1621,7 +1621,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 2307470135581
-    m_Localized: "\u7BA1\u4E0D\u4E86\u90A3\u4E48\u591A\u4E86\u2026\u6765\u5427\u3002"
+    m_Localized: "me: \u7BA1\u4E0D\u4E86\u90A3\u4E48\u591A\u4E86\u2026\u6765\u5427\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 2307470135582

Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn

@@ -101,8 +101,6 @@ position: 205,-53
 <<stop_music event:/Music/mus_peipei>>
 <<set_time_of_day "Night">>
 <<fade_out 1>>
-<<init_actor 佩佩挥手 诊室天桥>>
-<<show_fade "天桥小佩佩">>
 <<wait 1>>
 
 [character name="me" role="Aside" /]佩佩？ #line:042d1f4 
@@ -111,6 +109,8 @@ position: 205,-53
 <<hide_dialog>>
 <<wait 1>>
 
+<<init_actor 佩佩挥手 诊室天桥>>
+<<show_actor 佩佩挥手>>
 [character name="peipei" bubbleIdx=1 /]医生！ #line:0c27ec0 
 
 一个熟悉的身影倚靠在头顶的天桥栏杆上，正微笑着看你。 #line:0cf563f 
@@ -118,7 +118,6 @@ position: 205,-53
 [character name="me" role="Aside" /]你不应该跑这么快的，你还很虚弱。 #line:0fecc92 
 
 ->CenterOption: 去天桥 #line:0ca5d54 
-        <<hide_dialog>>
     <<fade_in 1>>
     <<wait 1>>
     <<load_scene Bridge 1>>

Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn

@@ -8,7 +8,7 @@ position: -427,-2903
 <<switch_fix_system_to "BodyModule" "Head">>
 <<Temp_RemoveChip>>
 <<fade_out 1>>
-<<task_moveIn>>
+<<show_task_panel>>
 Task: 找到佩佩的UF模块 #line:01dade5 
 <<DropCable>>
 me:检查佩佩的UF模块<br>将检查线插入模块的绿色插口，以运行检查； #line:03bd677 

Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn

@@ -30,7 +30,7 @@ position: -544,-442
 <<switch_fix_system_to Clinic>>
 <<init_character "佩佩最新">>
 <<switch_character_state 默认扬眉闭眼I>>
-<<hide_character>>
+<<show_character>>
 <<fade_out 1>>
 me: 我不应该提出这个什么“停止想象的”…我早就知道这不会有好结果。 #line:0e06541 
 me: 想象力这种东西……看来不是那么容易被停止的。 #line:05e9941 
@@ -46,7 +46,6 @@ me: 你醒了。 #line:065200d
 //TODO-佩佩出现
 
 <<hide_dialog>>
-<<show_character>>
 <<wait 1>>
 
 peipei: 我的头好轻…我好像…… #line:0fb06e0 

Assets/Resources/Yarn/FP_Peipei2/Stage2_第一次发热.yarn

@@ -11,7 +11,7 @@ position: 322,-1030
 <<SetHeat 1>>
 Task: 检查UF模块 #line:06d0c20 
 <<fade_out 1>>
-<<task_moveIn>>
+<<show_task_panel>>
 
 <<ModuleHightLight UF true>>
 ===

Assets/Resources/Yarn/FP_Peipei2/Stage4_UF拆壳.yarn

@@ -4,23 +4,22 @@ position: 43,-97
 ---
 <<hide_dialog>>
 <<wait 1>>
-<<task_moveOut>>
 <<complete_task "line:06d0c20">>
 Task: 拆开UF #line:0ef5998 
-<<task_moveIn>>
+<<show_task_panel>>
 ->拆开UF #line:0b5f014 
-    管不了那么多了…来吧。 #line:0dc3aa0 
+    me: 管不了那么多了…来吧。 #line:0dc3aa0 
     <<hide_dialog>>
     <<fade_in 1>>
     <<wait  1>>
     <<Temp_RemoveUFCover>>
     <<wait 1>>
-    <<fade_out 1>>
     <<wait  0.5>>
     me: 啊，这是… #line:029951f 
     <<hide_dialog>>
     <<trans_camera -3.82 0.55 2 1>>
     <<wait 0.5>>
+    <<fade_out 1>>
     me: 佩佩的…色觉晶圆？ #line:0a8823e 
     peipei: 什么？医生…你发现了什么？ #line:0a51cab 
     me: 我找到你的色觉晶圆了……它怎么会在…UF内部？ #line:0b93bea 

Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn

@@ -3,6 +3,7 @@ title: 进入UF拆除
 tags:
 position: 43,-97
 ---
+<<wait 0.5>>
 ->拆除UF #line:07af2b3 
     <<hide_dialog>>
     <<fade_in 1>>

Assets/Scenes/Bridge.unity

@@ -596,6 +596,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7ce5564f908241b58f1376a5a6eae55e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  initOnAwake: 1
   defaultTime: 1
   defaultWeather: 0
 --- !u!1 &876650936
@@ -642,10 +643,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1988b7c536404a3d89fd441651bd40ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  slotName: left
+  slotName: "\u5929\u6865\u5DE6"
   sortingLayer: 0
   sortingOrder: 1
-  hasDefaultActor: 1
+  hasDefaultActor: 0
   defaultActorType: 1
   defaultActorName: "\u5929\u6865\u4F69\u4F69"
 --- !u!1 &1049662761
@@ -965,7 +966,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8341b0b94bf446d9b3b3c50a4428ee15, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  delayTime: 300
 --- !u!114 &1695219945
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1095,10 +1095,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1988b7c536404a3d89fd441651bd40ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  slotName: right
+  slotName: "\u5929\u6865\u53F3"
   sortingLayer: 0
   sortingOrder: 1
-  hasDefaultActor: 1
+  hasDefaultActor: 0
   defaultActorType: 1
   defaultActorName: "\u5929\u6865\u533B\u751F"
 --- !u!95 &1160356261298348611

Assets/Scripts/Dialog System/LineView.cs

@@ -1,7 +1,6 @@
 using System;
 using AibisDream.Framework;
 using AibisDream.Utility;
-using UnityEngine;
 using Yarn.Unity;
 
 namespace AibisDream
@@ -23,7 +22,6 @@ namespace AibisDream
 
         private void HandleLineOutput(LocalizedLine dialogueLine, Action onDialogueLineFinished)
         {
-            Debug.Log($"HandleLineOutput: {dialogueLine.TextID}");
             DialogCanvasManager.Instance.ShowLine(dialogueLine.TextWithoutCharacterName.Text,
                 dialogueLine.GetCharacterVo(), onDialogueLineFinished, dialogueLine.TextID, dialogueLine.IsAutoSkipLine());
         }

Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs

@@ -142,25 +142,21 @@ namespace AibisDream.FixSystem
 
         private void HandleDialogueStart()
         {
-            Debug.Log("DialogueStart");
             isInDialog = true;
         }
 
         private void HandleDialogueComplete()
         {
-            Debug.Log("DialogueEnd");
             isInDialog = false;
         }
 
         public void Disable_plugInput()
         {
-            Debug.Log("Disable");
             isActive = false;
         }
 
         public void Enable_plugInput()
         {
-            Debug.Log("Enable");
             isActive = true;
         }
 

Assets/Scripts/FixSystemNew/FixStateMachine.cs

@@ -11,28 +11,35 @@ namespace AibisDream.FixSystem
         public FixState CurState => _curState.GetState;
 
         private IState<FixState> _curState;
-        private string _curArgs;
 
         private StateMachine<FixState> _stateMachine;
+        
+        private FixSystemData _data;
 
-        public FixStateMachine()
+        public FixStateMachine(FixSystemData data)
         {
+            _data = data;
             _stateMachine = new StateMachine<FixState>(CreateState);
             _stateMachine.OnStateSwitch += state => EnumEventSystem.Global.Send(EventEnum.FixStateSwitch, state);
         }
 
         public IEnumerator Init(FixState initState)
         {
+            _data.curState = initState;
+            _data.args = "";
             yield return _stateMachine.Init(initState);
         }
 
         public IEnumerator SwitchState(FixState nextState, string args = "")
         {
+            _data.curState = nextState;
+            _data.args = args;
             yield return _stateMachine.SwitchState(nextState, args);
         }
 
         public IEnumerator QuitState()
         {
+            _data.curState = FixState.Default;
             yield return _stateMachine.QuitState();
         }
 
@@ -108,7 +115,6 @@ namespace AibisDream.FixSystem
         public IEnumerator Enter()
         {
             // 切换相机
-            Debug.Log("相机切换");
             yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic);
             // 注册对话气泡
             var clinicSystem = FixSystemCenter.SystemDic.Get<ClinicSystem>();

Assets/Scripts/FixSystemNew/FixSystemCenter.cs

@@ -16,7 +16,7 @@ namespace AibisDream.FixSystem
         {
             SystemDic ??= new IOCContainer();
             // 初始化状态机
-            StateMachine = new FixStateMachine();
+            StateMachine = new FixStateMachine(_data);
             StartCoroutine(StateMachine.Init(defaultState));
             // 注册
             StorageSystem.Instance.RegisterData(_data);
@@ -24,12 +24,11 @@ namespace AibisDream.FixSystem
 
         public override void OnSingletonDestroy()
         {
+            // 注销
+            StorageSystem.Instance.UnregisterData<FixSystemData>();
             CameraKit.Instance.RemoveAllCam();
             GameManager.Instance.StartCoroutine(StateMachine.QuitState());
             SystemDic.Clear();
-            
-            // 注销
-            StorageSystem.Instance.UnregisterData<FixSystemData>();
         }
         
         /// <summary>
@@ -60,11 +59,12 @@ namespace AibisDream.FixSystem
     [LoadIndex(2)]
     public class FixSystemData : IData
     {
-        private FixState _curState;
+        public FixState curState;
+        public string args;
 
         public IEnumerator Load()
         {
-            yield return FixSystemCenter.StateMachine.SwitchState(_curState);
+            yield return FixSystemCenter.StateMachine.SwitchState(curState, args);
         }
     }
 }

Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs

@@ -103,9 +103,7 @@ namespace AibisDream.FixSystem
                 Destroy(_lineQueue.Dequeue().gameObject);
             }
             _lineQueue.Enqueue(textItemTypewriter);
-            
             // 播放文本
-            Debug.Log($"Screen {dialogLine}");
             textItemTypewriter.ShowText(dialogLine);
             textItemTypewriter.onTextShowed.AddListener(() => AfterLineShown(textItemTypewriter, nextStep));
             // 强制更新布局
@@ -114,11 +112,9 @@ namespace AibisDream.FixSystem
 
         private void AfterLineShown(TypewriterByCharacter typewriter, Action nextStop)
         {
-            Debug.Log("Screen Shown");
             EnumEventSystem.Global.Send(DialogEventEnum.LineShown);
             ActionKit.Delay(0.3f, () =>
             {
-                Debug.Log("Screen Shown Next");
                 EnumEventSystem.Global.Send(DialogEventEnum.LineEnd);
                 nextStop.Invoke();
             }).StartGlobal();
@@ -157,12 +153,12 @@ namespace AibisDream.FixSystem
         {
             textForEstimation.text = text;
             textForEstimation.ForceMeshUpdate();
-            return textForEstimation.textInfo.linkCount;
+            return textForEstimation.textInfo.lineCount;
         }
 
         private int CalcTotalLineNum()
         {
-            return _lineQueue.Select(x => x.GetComponent<TMP_Text>().textInfo.linkCount).Sum();
+            return _lineQueue.Select(x => x.GetComponent<TMP_Text>().textInfo.lineCount).Sum();
         }
     }
 }

Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs

@@ -1,5 +1,4 @@
-using System.Collections;
-using AibisDream.FixSystem;
+using AibisDream.FixSystem;
 using UnityEngine;
 using Yarn.Unity;
 

Assets/Scripts/Game Loop/EventEnums.cs

@@ -1,4 +1,5 @@
-using AibisDream.Kit;
+using System.Text.RegularExpressions;
+using AibisDream.Kit;
 using AibisDream.Utility;
 using Yarn.Unity;
 
@@ -53,7 +54,7 @@ namespace AibisDream
         public string GetDialogText()
         {
             // 先去掉换行
-            var realLine = line.Replace("<br>", "");
+            var realLine = Regex.Replace(line, "[<|{].*?[>|}]", string.Empty);
 
             if (!isOption)
             {

Assets/Scripts/Game Loop/GameManager.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using AibisDream.FixSystem;
 using AibisDream.Framework;
 using AibisDream.Kit;
 using AibisDream.Utility;

Assets/Scripts/Game Loop/SceneLoader.cs

@@ -93,7 +93,7 @@ namespace AibisDream
         
         public IEnumerator Load()
         {
-            yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync();
+            // yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync();
             yield return SceneLoader.Instance.LoadSceneAsync(sceneName);
         }
     }

Assets/Scripts/Utility/CommonUtil.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Unity.VisualScripting;
 using UnityEngine;
@@ -85,7 +86,7 @@ namespace AibisDream.Utility
             }
 
             var range = max - min + 1;
-    
+
             // 计算新的目标值
             var newTarget = target + step;
 
@@ -115,7 +116,7 @@ namespace AibisDream.Utility
             foreach (var sourceField in sourceFields)
             {
                 if (sourceField.IsStatic) return;
-                
+
                 var targetField = targetFields.FirstOrDefault(p =>
                     p.Name == sourceField.Name && p.FieldType == sourceField.FieldType);
                 if (targetField != null && !targetField.IsStatic())
@@ -165,7 +166,7 @@ namespace AibisDream.Utility
         }
 
         #endregion
-        
+
         ///<summary>
         /// 去除原始对话中名称部分
         /// </summary>
@@ -176,7 +177,7 @@ namespace AibisDream.Utility
             var textArr = lineText.Split(":");
             return textArr.Length > 1 ? textArr[1].Trim() : lineText;
         }
-        
+
         /// <summary>
         /// 拆分字符串为若干行
         /// </summary>
@@ -203,7 +204,8 @@ namespace AibisDream.Utility
                     var substring = line.Substring(currentIndex, length);
 
                     // 检查是否需要调整长度以避免在单词中间断开
-                    if (currentIndex + length < line.Length && !char.IsWhiteSpace(line[currentIndex + length]) && !char.IsPunctuation(line[currentIndex + length]))
+                    if (currentIndex + length < line.Length && !char.IsWhiteSpace(line[currentIndex + length]) &&
+                        !char.IsPunctuation(line[currentIndex + length]))
                     {
                         var lastSpace = substring.LastIndexOf(' ');
                         if (lastSpace > 0)