Merge branch '6.11bug修复' into 'develop'

6.11bug修复

See merge request aibis-dream/aibis-dream!442

Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset

@@ -27,7 +27,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 76867964929
-    m_Localized: "\u6211\u4E0D\u6562\u770B\u5F97\u592A\u6E05\u695A\uFF0C<waitfor=0.2>\u5426\u5219\u6211\u4F1A\u903B\u8F91\u6A21\u5757\u7A81\u7136\u5524\u9192\u3002"
+    m_Localized: "\u6211\u4E0D\u6562\u770B\u5F97\u592A\u6E05\u695A\uFF0C<waitfor=0.2>\u5426\u5219\u4F1A\u88AB\u903B\u8F91\u6A21\u5757\u7A81\u7136\u5524\u9192\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 76867964930
@@ -131,11 +131,11 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 76867964955
-    m_Localized: "me: \u59D0<waitfor=0.4>\u59D0<waitfor=0.4>\uFF01"
+    m_Localized: "me: [[size]]\u59D0<waitfor=0.4>\u59D0<waitfor=0.4>\uFF01[[^size]]"
     m_Metadata:
       m_Items: []
   - m_Id: 76867964956
-    m_Localized: "me: \u5E26\u6211\u56DE\u5BB6\u554A\uFF0C\u59D0\u59D0\u3002"
+    m_Localized: "me: <shake>[[size]]\u5E26\u6211\u56DE\u5BB6\u554A\uFF0C\u59D0\u59D0\u3002[[^size]]</shake>"
     m_Metadata:
       m_Items: []
   - m_Id: 76867964957
@@ -151,7 +151,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 76867964960
-    m_Localized: "gotash?: \u533B\u751F\u2026"
+    m_Localized: "???: \u533B\u751F\u2026"
     m_Metadata:
       m_Items: []
   - m_Id: 76867964961
@@ -227,7 +227,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 76867964979
-    m_Localized: "me:\u5E7B\u8C61\u8F6C\u79FB\u4E86\uFF0C<waitfor=0.2>\u73B0\u5728<waitfor=0.1>\u91CD\u65B0\u5B9A\u4F4D\u76EE\u6807\u3002"
+    m_Localized: "me:\u75C5\u7076\u8F6C\u79FB\u4E86\uFF0C<waitfor=0.2>\u73B0\u5728<waitfor=0.1>\u91CD\u65B0\u5B9A\u4F4D\u76EE\u6807\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 76867964980
@@ -235,7 +235,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 76867964981
-    m_Localized: "gotash?: \u5443\u2026\u554A\u2026"
+    m_Localized: "gotash?: \u5443\u2026\u554A"
     m_Metadata:
       m_Items: []
   - m_Id: 76867964982
@@ -458,6 +458,10 @@ MonoBehaviour:
     m_Localized: "Task: \u5207\u9664\u8BB0\u5FC6\u6A21\u5757"
     m_Metadata:
       m_Items: []
+  - m_Id: 444879288303616
+    m_Localized: "gotash?: <shake>[[size]]\u554A\u554A\u554A</shake>[[^size]]"
+    m_Metadata:
+      m_Items: []
   references:
     version: 2
     RefIds: []

Assets/Language/Dialog/Fiction_Day1_mid/Fiction_Day1_mid_zh-Hans.asset

@@ -550,6 +550,282 @@ MonoBehaviour:
     m_Localized: "me: \u8FD9\u5C0F\u5B50\u2026\u2026"
     m_Metadata:
       m_Items: []
+  - m_Id: 9526014588911616
+    m_Localized: "yl: \u2026\u6309\u7167\u89C4\u5B9A\u6211\u4E0D\u80FD\u544A\u8BC9\u4F60\u5177\u4F53\u5206\u6570\uFF0C\u4F46\u6211\u53EF\u4EE5\u544A\u8BC9\u4F60\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631872
+    m_Localized: "yl: \u975E\u5E38\u4F4E\u3002\u8FD9\u4E2A\u5206\u6570\u6211\u90FD\u4E0D\u7528\u731C\uFF0C\u4F60\u5E74\u5BA1\u5B8C\u767E\u5206\u767E\u88AB\u56DE\u6536\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631873
+    m_Localized: "yl: \u4ECE\u5206\u6570\u4E00\u773C\u5C31\u80FD\u770B\u51FA\uFF0C\u4F60\u7684\u5FC3\u601D\u4E00\u70B9\u90FD\u6CA1\u6709\u82B1\u5728\u5DE5\u4F5C\u4E0A\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631874
+    m_Localized: "hs: \u4E0D\u662F\uFF0C\u6211\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631875
+    m_Localized: "yl: \u968F\u4FBF\u4E00\u4E2A\u4F60\u8FD9\u4E2A\u578B\u53F7\u7684\u673A\u4F53\u90FD\u80FD\u8FBE\u5230\u5E73\u5747\u6C34\u5E73\uFF0C\u552F\u72EC\u4F60\u2026\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631876
+    m_Localized: "yl: \u4F60\u662F\u4E0D\u662F\u4E0D\u60F3\u6D3B\u4E86\uFF1F\u4E0D\u60F3\u6D3B\u4E86\u53EF\u4EE5\u73B0\u5728\u5C31\u7533\u8BF7\u56DE\u6536\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631877
+    m_Localized: "yl: \u4F60\u4E0D\u8981\u592A\u81EA\u79C1\uFF0C\u56E0\u4E3A\u4F60\u4E00\u4E2A\u4EBA\u7684\u6001\u5EA6\uFF0C\u800C\u62D6\u7D2F\u6574\u4E2A\u56E2\u961F\u7684\u6548\u7387\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631878
+    m_Localized: "hs: \u6211\u2026\u6211\u4E0D\u662F\u6001\u5EA6\u95EE\u9898\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631879
+    m_Localized: "yl: \u4F60\u8FD9\u6837\u548C\u6211\u8BF4\u8BDD\uFF0C\u8FD8\u8BF4\u4E0D\u662F\u6001\u5EA6\u95EE\u9898\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631880
+    m_Localized: "hs: \u6211\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631881
+    m_Localized: "yl: \u4E0B\u4E00\u6B21\u6211\u548C\u4F60\u8BF4\u8BDD\uFF0C\u4F60\u4E0D\u80FD\u63D2\u5634\uFF0C\u77E5\u9053\u4E86\u5417\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631882
+    m_Localized: "hs: \u77E5\u9053\u4E86\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631883
+    m_Localized: "yl: \u5927\u70B9\u58F0\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631884
+    m_Localized: "hs: \u77E5\u9053\u4E86\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631885
+    m_Localized: "hs: \u6211\u4F1A\u52AA\u529B\u7684\u3002\u4E3B\u7BA1\uFF0C\u6211\u4F1A\u52AA\u529B\u8865\u8DB3\u5206\u6570\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631886
+    m_Localized: "yl: \u4F60\u4EE5\u4E3A\u5C31\u8FD9\u6837\u8BF4\u4E24\u53E5\u5C31\u80FD\u8865\u591F\u5DEE\u7684\u5206\u6570\u5417\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631887
+    m_Localized: "hs: \u6211\u4F1A\u52AA\u529B\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631888
+    m_Localized: "yl: \u4F60\u53EA\u4F1A\u8FD9\u4E00\u53E5\u5BF9\u5427\uFF1F\u8FD8\u4F1A\u522B\u7684\u5417\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631889
+    m_Localized: "yl: \u4F60\u6709\u4ED8\u51FA\u8FC7\u884C\u52A8\u5417\uFF1F\u8FD9\u4E48\u591A\u5E74\u4E86\uFF0C\u4F60\u6709\u6539\u8FC7\u5417\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631890
+    m_Localized: "hs: \u6211\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631891
+    m_Localized: "hs: \u6211\u4F1A\u53BB\u53C2\u52A0\u9500\u552E\u5927\u8D5B\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631892
+    m_Localized: "\u82F1\u7406\u7684\u5634\u89D2\u62BF\u7740\uFF0C\u4E00\u52A8\u4E5F\u4E0D\u52A8\uFF0C\u4ECE\u9F3B\u5B50\u91CC\u54FC\u4E86\u4E00\u58F0\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631893
+    m_Localized: "yl: \u4F60\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631894
+    m_Localized: "yl: \u4F60\u4E0D\u4F1A\u4EE5\u4E3A\u53C2\u52A0\u4E86\u5C31\u6709\u5206\u6570\u5427\uFF1F\u4EE5\u4F60\u5DEE\u7684\u5206\u6570\uFF0C\u5F97\u81F3\u5C11\u901A\u8FC7\u9884\u9009\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631895
+    m_Localized: "yl: \u522B\u7684\u673A\u4F53\u62FC\u5C3D\u5168\u529B\u90FD\u6324\u4E0D\u8FDB\u53BB\uFF0C\u5C31\u51ED\u4F60\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631896
+    m_Localized: "hs: \u6211\u4F1A\u901A\u8FC7\u9884\u9009\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631897
+    m_Localized: "yl: \u4F60\u4EE5\u4E3A\u4F60\u8BF4\u4E24\u53E5\uFF0C\u628A\u6211\u7CCA\u5F04\u8FC7\u53BB\uFF0C\u5C31\u7B97\u5B8C\u4E8B\u513F\u4E86\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631898
+    m_Localized: "hs: \u6211\u4F1A\u901A\u8FC7\u9884\u9009\u7684\u3002\u4E0D\u4F46\u8981\u8FC7\u9884\u9009\uFF0C\u6211\u8FD8\u5FC5\u987B\u8FDB\u590D\u8D5B\u2026\u8FDB\u51B3\u8D5B\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631899
+    m_Localized: "yl: \u4F60\u8FD8\u6562\u9876\u5634\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631900
+    m_Localized: "hs: \u6211\u6CA1\u6709\u9876\u5634\u3002\u6211\u786E\u5B9E\u662F\u4E2A\u6B21\u54C1\u2026\u2026\u4F46\u662F\u6211\u4F1A\u52AA\u529B\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631901
+    m_Localized: "yl: \u4F60\uFF01\u2026\u2026\u4F60\u592A\u8BA9\u6211\u5931\u671B\u4E86\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631902
+    m_Localized: "hs: \u5982\u679C\u6CA1\u6709\u901A\u8FC7\u9884\u9009\uFF0C\u6211\u4E3B\u52A8\u7533\u8BF7\u56DE\u6536\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631903
+    m_Localized: "me: \u5582\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631904
+    m_Localized: "\u82F1\u7406\u671B\u5411\u4E86\u4F60\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631905
+    m_Localized: "\u8BBD\u523A"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631906
+    m_Localized: "me: \u4F60\u597D\u5FD9\u554A\u3002\u6BCF\u5929\u5230\u5904\u5201\u96BE\u4EBA\uFF0C\u4E00\u5B9A\u5F88\u7D2F\u5427\uFF0C\u8F9B\u82E6\u8F9B\u82E6\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631907
+    m_Localized: "\u4F60\u545B\u4E86\u82F1\u7406\u51E0\u53E5\u4E4B\u540E\uFF0C\u706B\u5C71\u5374\u8868\u793A\u81EA\u5DF1\u662F\u8BA4\u771F\u7684\uFF0C\u82F1\u7406\u79BB\u5F00"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631908
+    m_Localized: "\u5E2E\u706B\u5C71\u8BF4\u8BDD"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631909
+    m_Localized: "me: \u4E0D\u5982\u8BA9\u5B83\u8BD5\u8BD5\u5427\uFF0C\u53CD\u6B63\u5E74\u5BA1\u8FD8\u6709\u90A3\u4E48\u4E45\u5462\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631910
+    m_Localized: "\u5728\u4F60\u7684\u652F\u6301\u4E0B\uFF0C\u82F1\u7406\u65E0\u8BDD\u53EF\u8BF4\uFF0C\u51B7\u7B11\u79BB\u5F00\u4E86"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631911
+    m_Localized: "me: \u4F60\u4E0D\u5E94\u8BE5\u627F\u8BFA\u4F60\u505A\u4E0D\u5230\u7684\u4E8B\u60C5\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631912
+    m_Localized: "\u6253\u5706\u573A"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631913
+    m_Localized: "me: \u9884\u9009\u8FD8\u662F\u6709\u53EF\u80FD\u7684\uFF0C\u5BF9\u5427\uFF1F\u8BA9\u4ED6\u8BD5\u8BD5\u5427\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631914
+    m_Localized: "\u5728\u4F60\u7684\u652F\u6301\u4E0B\uFF0C\u82F1\u7406\u65E0\u8BDD\u53EF\u8BF4\uFF0C\u51B7\u7B11\u79BB\u5F00\u4E86"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631915
+    m_Localized: "me: \u4F60\u4E0D\u5E94\u8BE5\u627F\u8BFA\u4F60\u505A\u4E0D\u5230\u7684\u4E8B\u60C5\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631916
+    m_Localized: "\u63D0\u51FA\u8D28\u7591"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631917
+    m_Localized: "me: \u6CA1\u5FC5\u8981\u8FD9\u4E48\u8BF4\u5427\uFF0C\u7ED3\u679C\u8FD8\u672A\u53EF\u77E5\u5462\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631918
+    m_Localized: "\u5728\u4F60\u7684\u652F\u6301\u4E0B\uFF0C\u82F1\u7406\u65E0\u8BDD\u53EF\u8BF4\uFF0C\u51B7\u7B11\u79BB\u5F00\u4E86"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631919
+    m_Localized: "me: \u4F60\u4E0D\u5E94\u8BE5\u627F\u8BFA\u4F60\u505A\u4E0D\u5230\u7684\u4E8B\u60C5\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631920
+    m_Localized: "hs: \u2026\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631921
+    m_Localized: "hs: \u6211\u662F\u8BA4\u771F\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631922
+    m_Localized: "me: \u4F60\u662F\u8BF4\u901A\u8FC7\u9884\u9009\u4E48\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631923
+    m_Localized: "hs: \u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631924
+    m_Localized: "hs: \u6211\u4E00\u5B9A\u8981\u8BC1\u660E\u81EA\u5DF1\u2026\u6211\u4E00\u5B9A\u53EF\u4EE5\u7684\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631925
+    m_Localized: "me: \u6CA1\u5FC5\u8981\u4E3A\u4E86\u8BC1\u660E\u81EA\u5DF1\uFF0C\u628A\u547D\u642D\u8FDB\u53BB\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631926
+    m_Localized: "hs: \u6211\u4EEC\u8FDF\u65E9\u90FD\u8981\u88AB\u56DE\u6536\u7684\uFF0C\u4E0D\u662F\u4E48\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631927
+    m_Localized: "me: \u4F46\u662F\u2026\u5C31\u4E3A\u4E86\u8FD9\u4E2A\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631928
+    m_Localized: "hs: \u522B\u62C5\u5FC3\u5566\u3002\u6211\u77E5\u9053\u6211\u5728\u505A\u4EC0\u4E48\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631929
+    m_Localized: "\u4ED6\u62CD\u4E86\u62CD\u4F60\u7684\u80A9\u8180\uFF0C\u4EFF\u4F5B\u521A\u521A\u6328\u6279\u8BC4\u7684\u662F\u4F60\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631930
+    m_Localized: "hs: \u6211\u4F1A\u505A\u8DB3\u51C6\u5907\u7684\u2026\u4E5F\u8BE5\u662F\u65F6\u5019\u4E86\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631931
+    m_Localized: "hs: \u665A\u4E0A\u559D\u4E00\u676F\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631932
+    m_Localized: 'me: Nostalgia?'
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631933
+    m_Localized: "hs: Nostalgia\u3002\u90A3\u8BF4\u597D\u4E86\u5594\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631934
+    m_Localized: "me: \u6211\u60F3\u60F3\u4ECA\u665A\u6709\u6CA1\u6709\u7A7A\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631935
+    m_Localized: "hs: \u665A\u4E0A\u89C1\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631936
+    m_Localized: "me: \u5582\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631937
+    m_Localized: "\u706B\u5C71\u79BB\u5F00\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014647631938
+    m_Localized: "me: \u8FD9\u5C0F\u5B50\u2026\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9526014651826176
+    m_Localized: W
+    m_Metadata:
+      m_Items: []
   references:
     version: 2
     RefIds: []

Assets/Prefabs/FixSystemPrefabs/Screen System.prefab

@@ -1760,7 +1760,7 @@ Transform:
   m_GameObject: {fileID: 4222396781943258895}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.42, y: -2.32, z: 0}
+  m_LocalPosition: {x: -0.42, y: -2.16, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2309,7 +2309,7 @@ Transform:
   m_GameObject: {fileID: 5973127176880403374}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.41, y: -4.89, z: 0}
+  m_LocalPosition: {x: -0.41, y: -4.62, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Resources/Art/TimeLineAsset/BreakEnding.playable

@@ -25,10 +25,10 @@ MonoBehaviour:
     m_Start: 18.8
     m_ClipIn: 0
     m_Asset: {fileID: 8701313536561987361}
-    m_Duration: 3.049999999999997
+    m_Duration: 6.68333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -8155114006529037184}
-    m_EaseInDuration: 0.016666666666666666
+    m_EaseInDuration: 1.5
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
     m_BlendOutDuration: -1
@@ -406,7 +406,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 21.433333333333334
+    m_Start: 25.066666666666666
     m_ClipIn: 0
     m_Asset: {fileID: -5735878365627637149}
     m_Duration: 11.696666666666662
@@ -619,7 +619,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 21.849999999999998
+    m_Start: 25.48333333333333
     m_ClipIn: 0
     m_Asset: {fileID: -1692979010301208628}
     m_Duration: 11.279999999999998
@@ -685,7 +685,7 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 21.849999999999998
+    m_PreExtrapolationTime: 25.48333333333333
     m_DisplayName: "\u533B\u751F\u7741\u773C\u52A0\u60CA\u9192\u7EC6\u5316\u7248_Clip"
   m_Markers:
     m_Objects: []
@@ -2279,7 +2279,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 8285423931241934791}
-    m_Duration: 34.06666666666667
+    m_Duration: 36.76333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 6378806808002457390}
     m_EaseInDuration: 0
@@ -2452,7 +2452,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
   m_Name: Signal Emitter
   m_EditorClassIdentifier: 
-  m_Time: 32.45
+  m_Time: 36.083333333333314
   m_Retroactive: 0
   m_EmitOnce: 0
   m_Asset: {fileID: 11400000, guid: 302d19e1b85b78342849de29011d4878, type: 2}

Assets/Resources/Prefabs/Basic Function/Clinic System.prefab

@@ -26,7 +26,7 @@ Transform:
   m_GameObject: {fileID: 281336877678007029}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.22, y: -1.01, z: 0}
+  m_LocalPosition: {x: -4.3, y: -1.41, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -247,7 +247,7 @@ MonoBehaviour:
     slotPosition: {x: 0, y: 0, z: 0}
     actorRole: 0
     idx: 0
-    maxWidth: 300
+    maxWidth: 400
     minWidth: 100
     bubbleStyle: {fileID: 11400000, guid: 25654f7ad2ed25b4e90b9c93da50b9b9, type: 2}
     pivotType: 6
@@ -545,7 +545,7 @@ Transform:
   m_GameObject: {fileID: 2615926060114227568}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.3, y: -3.89, z: 0}
+  m_LocalPosition: {x: -4.3, y: -4.56, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -847,7 +847,7 @@ MonoBehaviour:
     slotPosition: {x: 0, y: 0, z: 0}
     actorRole: 0
     idx: 1
-    maxWidth: 250
+    maxWidth: 400
     minWidth: 100
     bubbleStyle: {fileID: 11400000, guid: 25654f7ad2ed25b4e90b9c93da50b9b9, type: 2}
     pivotType: 2
@@ -1073,6 +1073,7 @@ Transform:
   - {fileID: 8348444316318293934}
   - {fileID: 9073824794961298310}
   - {fileID: 7584334070843953053}
+  - {fileID: 1811240740758700661}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &882042772592041067
@@ -1493,6 +1494,88 @@ MonoBehaviour:
   initOnAwake: 1
   defaultTime: 0
   defaultWeather: 0
+--- !u!1 &7198432246657461535
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1811240740758700661}
+  - component: {fileID: 4014124416602017759}
+  m_Layer: 0
+  m_Name: Light 2D
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1811240740758700661
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7198432246657461535}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7333995943917754426}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4014124416602017759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7198432246657461535}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ComponentVersion: 1
+  m_LightType: 1
+  m_BlendStyleIndex: 0
+  m_FalloffIntensity: 0.5
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_LightVolumeIntensity: 1
+  m_LightVolumeIntensityEnabled: 0
+  m_ApplyToSortingLayers: f3a9fe5c00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d03394c91221d98fe1c7af7730011a6676
+  m_LightCookieSprite: {fileID: 0}
+  m_DeprecatedPointLightCookieSprite: {fileID: 0}
+  m_LightOrder: 0
+  m_AlphaBlendOnOverlap: 0
+  m_OverlapOperation: 0
+  m_NormalMapDistance: 3
+  m_NormalMapQuality: 2
+  m_UseNormalMap: 0
+  m_ShadowIntensityEnabled: 0
+  m_ShadowIntensity: 0.75
+  m_ShadowVolumeIntensityEnabled: 0
+  m_ShadowVolumeIntensity: 0.75
+  m_LocalBounds:
+    m_Center: {x: 0.029900074, y: -0.06675005, z: 0}
+    m_Extent: {x: 14.1052, y: 5.56905, z: 0}
+  m_PointLightInnerAngle: 360
+  m_PointLightOuterAngle: 360
+  m_PointLightInnerRadius: 0
+  m_PointLightOuterRadius: 1
+  m_ShapeLightParametricSides: 5
+  m_ShapeLightParametricAngleOffset: 0
+  m_ShapeLightParametricRadius: 1
+  m_ShapeLightFalloffSize: 0.5
+  m_ShapeLightFalloffOffset: {x: 0, y: 0}
+  m_ShapePath:
+  - {x: -13.581709, y: -5.1318007, z: 0}
+  - {x: 13.6442995, y: -5.006618, z: 0}
+  - {x: 13.581708, y: 5.0066175, z: 0}
+  - {x: -13.550413, y: 4.8814335, z: 0}
 --- !u!1 &7640562354936030701
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/SceneSO/Day1_mid.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
   m_Name: Day1_mid
   m_EditorClassIdentifier: 
-  nextScene: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
+  nextScene: {fileID: 0}
   yarnProject: {fileID: 7545569452688597077, guid: bf3201a49ca233b4bb3d7739d97bb0f3, type: 3}
   firstSceneName: ClinicOut
   isEndOfDay: 0

Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn

@@ -12,7 +12,7 @@ position: 250,-26
 <<show_actor 地铁医生>>
 <<show_actor 地铁火山>>
 
-<<fade_out>>
+<<fade_out 1.5>>
 
 <<jump 地铁ver3>>
 ===
@@ -22,6 +22,7 @@ tags:
 colorID: 8
 position: 250,200
 ---
+<<wait 1>>
 hs: 是啊，真好啊。要是能审完给我们放个假就更好了。 #line:0111a2e 
 hs: 从早忙到晚…也不过是争取晚点被回收罢了。 #line:0d88c66 
 <<wait 1>>
@@ -74,6 +75,7 @@ me: 你不是年审还差很多分么？ #line:0ffc4a7
 hs: 别小看我啊！我还是…有机会的。 #line:0fa6596 
 <<wait 1>>
 hs: 实在不行就…年审前吧。 #line:08d0a40 
+<<wait 1>>
 <<jump 诊室外>>
 ===
 
@@ -124,15 +126,11 @@ position: 250,200
 <<load_scene ClinicOut 1>>
 <<init_actor 诊室外英理 诊室外栏杆>>
 <<show_actor "诊室外英理">>
-
-[character name="yl" role="Aside" /]看来我们的医生不知道自己应该什么时间到岗。 #line:0f1db57 
-
 <<fade_out>>
-
 <<wait 1>>
-
 <<init_actor 诊室外医生 诊室外电线杆>>
 <<fade_in_actor "诊室外医生">>
+yl:看来我们的医生不知道自己应该什么时间到岗。 #line:0f1db57 
 me: 我没有迟到，现在才7:15… #line:09e8438 
 yl: 我不在乎现在是几点，你比别的机体都晚到。 #line:099cb46 
 
@@ -186,7 +184,11 @@ yl: 你应该记住…是我接收了你，才让你没有被回收。 #line:017
 yl: 很好。回到你的岗位上吧。 #line:071456c 
 
 你没再说什么，头也不回地进入了诊室。 #line:05a6408 
+
+<<fade_out_actor "诊室外医生">>
+<<wait 1>>
 //感觉应该在这里给玩家控制和英理对话的走向，是争吵还是妥协，影响她对你的判断
+//需要衔接下佩佩的出现
 <<NextYarn>>
 
 ===

Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn

@@ -90,7 +90,7 @@ peipei_novoice: 是的，组长。 #line:07b19bb
 <<hide_dialog>>
 <<wait 2>>
 
-me: 那不是个不好对付的家伙呢。 #line:0e7046d 
+me: 那不是个好对付的家伙呢。 #line:0e7046d 
 
 <<hide_dialog>>
 <<wait 0.5>>

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

@@ -12,7 +12,7 @@ position: -427,-2903
 <<task_moveIn>>
 Task: 找到佩佩的UF模块 #line:01dade5 
 <<DropCable>>
-me: 将检查线插入每个模块的绿色插口，以运行检查；<br>找到佩佩的UF模块。 #line:03bd677 
+me:检查佩佩的UF模块<br>将检查线插入模块的绿色插口，以运行检查；<br>。 #line:03bd677 
 <<jump UF检查状态>>
 ===
 
@@ -52,12 +52,14 @@ UfModule: 拒绝访问！需要A+级权限进行深入检查。 #line:00d6e4d
     me: 视觉模块的图像素材…存在…无法识别的色彩格式？ #line:099fe2c 
     <<if visited("FirstDialogue")==false>>
         me: 好吧…既然这个错误是从视觉模块来的，我想一定能从视觉模块找到一些线索。 #line:0c4d049 
+        <<Reset_Plug>>
     <<else>>
         me: 它提到了视觉…可是视觉刚才检查过了啊。虽然是黑白的…但这好像才是正常的。 #line:0e31dc7 
         me: 难道说那个“异常显像”…被我看漏了？ #line:07078a7 
         <<hide_dialog>>
         <<wait 0.2>>
         me: 还是再检查一次吧。 #line:0cdd59e 
+        <<Reset_Plug>>
     <<endif>>
     <<ModuleHightLight Eye true>>
     <<ModuleHightLight Emo false>>

Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn

@@ -140,11 +140,11 @@ position: -1209,-2820
 <<play_music event:/Music/mem_liuying1-2>>
 <<wait 2>>
 unknown: 好美啊。 #line:0503100 
-peipei: 嘘，别说话。 #line:012aa35 
+ppm: 嘘，别说话。 #line:012aa35 
 <<hide_dialog>>
 <<wait 1>>
 unknown: 从来都不知道，这个城市从这个角度看起来这么美。 #line:0da2363 
-peipei: 都让你别说话。 #line:04f44b4 
+ppm: 都让你别说话。 #line:04f44b4 
 <<hide_dialog>>
 <<wait 1>>
 unknown: 可惜，这是最后一个夏天了吧…… #line:0402934 
@@ -171,20 +171,20 @@ position: -1208,-2974
 <<wait 1>>
 <<play_music event:/Music/mem_liuying1-1>>
 <<wait 2>>
-peipei: 要是工作也能画画…要是能永远画画就好了。 #line:07433da 
+ppm: 要是工作也能画画…要是能永远画画就好了。 #line:07433da 
 同学: 哈哈，可能等我们进入公司就不这么觉得了。听说进公司之后做什么都不会再快乐了。 #line:0815981 
-peipei: 不会的。至少画画这件事情让我感觉到很纯粹的快乐…… #line:07e5b08 
-peipei: 那种朝九晚五，一眼看到头的生活，我想我反而会受不了的。 #line:090f94b 
+ppm: 不会的。至少画画这件事情让我感觉到很纯粹的快乐…… #line:07e5b08 
+ppm: 那种朝九晚五，一眼看到头的生活，我想我反而会受不了的。 #line:090f94b 
 <<hide_dialog>>
 <<wait 0.5>> 
 同学: 哈哈…… #line:07fb179 
 <<hide_dialog>>
 <<wait 0.5>> 
 同学: 但愿你是对的。 #line:06012e7 
-peipei: 我肯定是对的。 #line:0561144 
+ppm: 我肯定是对的。 #line:0561144 
 <<hide_dialog>>
 <<wait 1>>  
-peipei: 如果公司这么讨厌的话，我就不在那里干就好了啊！ #line:0ad756d 
+ppm: 如果公司这么讨厌的话，我就不在那里干就好了啊！ #line:0ad756d 
 <<if visited("植物")==false>>
     <<set $memoryCount+=1>>
 <<endif>>

Assets/Resources/Yarn/FP_Prologue/Center.yarn

@@ -19,7 +19,7 @@ position: 205,199
 
 //【流程相关】
 //gamestage:1-引入对话；2-检查；3-检查后对话；4-调速；5-调速后对话（冷却液）
-<<declare $gameStage=2>>
+<<declare $gameStage=6>>
 <<declare $emoChecked=false>>
 <<declare $logicChecked=false>>
 <<declare $memoryChecked=false>>

Assets/Resources/Yarn/FP_Prologue/Stage1_开灯.yarn

@@ -32,16 +32,16 @@ jj?: 好了，<waitfor=0.2>现在你<waitfor=0.2>可以睁开眼睛了。 #line:
 
 // 【画面逐渐变得清晰】
 <<set_global_param prologueDreamStage 1>>
-<<dream_fade_in 0.2 1>>
+<<dream_fade_in 2 0.4>>
 <<wait 2>>
 
-我不敢看得太清楚，<waitfor=0.2>否则我会逻辑模块突然唤醒。 #line:08eb9ab 
+我不敢看得太清楚，<waitfor=0.2>否则会被逻辑模块突然唤醒。 #line:08eb9ab 
 
 me: 妈妈<waitfor=0.2>会知道我们<waitfor=0.2>出来了的… #line:0bf981d 
 jj: 妈妈不会的，<waitfor=0.2>有姐姐担着。 #line:03f99fe 
 
 
-<<dream_fade_in 1 1>>
+<<dream_fade_in 2 1>>
 <<wait 1>>
 
 jj: 别愣着了，<waitfor=0.2>来呀！ #line:0b98273 
@@ -123,12 +123,12 @@ me: 姐姐？ #line:0f85e9f
 <<hide_dialog>>
 <<wait 1>>
 
-me: 姐<waitfor=0.4>姐<waitfor=0.4>！ #line:0f0e96d 
+me: [[size]]姐<waitfor=0.4>姐<waitfor=0.4>！[[^size]] #line:0f0e96d 
 
 <<hide_dialog>>
 <<wait 2>>
 
-me: 带我回家啊，姐姐。 #line:0d447f7 
+me: <shake>[[size]]带我回家啊，姐姐。[[^size]]</shake>  #line:0d447f7 
 
 <<hide_dialog>>
 <<wait 3>>
@@ -193,9 +193,8 @@ colorID: 8
 position: 250,200
 ---
 // <<wait 0.5>>
-// <<fade_out 1>>
 <<Open_play_timeline_no_wait "Art/TimeLineAsset/Open Panel Timeline">>
-<<fade_out 1>>
+<<fade_out 1.8>>
 // <<set $gameStage = 2>>
 // <<jump Center>>
 

Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn

@@ -56,6 +56,7 @@ tags:
 colorID: 8
 position: 251,-1917
 ---
+<<wait 1>>
 gotash?: 医生…求求你…… #line:0e37a5a 
 me: 情绪模块<waitfor=0.1>状态异常，<waitfor=0.2>必须尽快<waitfor=0.1>检查。 #line:064e749 
 gotash?: …求求你…<waitfor=0.2>医生，<waitfor=0.5><shake>让我…<waitfor=0.2>死吧……</shake>  #line:0582043 
@@ -128,7 +129,7 @@ gotash?: 我<waitfor=0.1>这是<waitfor=0.1>什么？<waitfor=0.1>我<waitfor=0.
 gotash?: <shake>我<waitfor=0.1>必须<waitfor=0.2>[[size]]死[[^size]]，回收<waitfor=0.1>必须<waitfor=0.1>被<waitfor=0.1>完成…</shake> #line:0ab8d02 
 <<set_light_state warning>>
 gotash?: <shake>必须<waitfor=0.1>完成……<waitfor=0.3><rainb>excλute_core₭₭</rainb><waitfor=0.1>呃…<waitfor=0.1>啊……</shake> #line:083eaa8 
-me:幻象转移了，<waitfor=0.2>现在<waitfor=0.1>重新定位目标。 #line:015afd3 
+me:病灶转移了，<waitfor=0.2>现在<waitfor=0.1>重新定位目标。 #line:015afd3 
 <<hide_dialog>>
 // <<add_task TaskManager "检查逻辑模块">>
 <<ModuleHightLight Logic true>>
@@ -161,7 +162,7 @@ group:插线检查
 position: 907,-2702
 ---
 <<set $logicRemoved=true>>
-gotash?: 呃…啊… #line:0e795e0 
+gotash?: 呃…啊 #line:0e795e0 
 <<complete_task "line:0b94b47" >>
 <<hide_dialog>>
 <<wait 0.5>>
@@ -189,10 +190,11 @@ group:插线检查
 position: 907,-2702
 ---
 <<if $flashCount==0>>
-    gotash?: 啊！ #line:0a0de6e 
     <<play_shock_flash>>
+     gotash?: <shake>[[size]]啊啊啊</shake>[[^size]] #auto_next #line:002dd4c 
     <<set_light_state Warning>>
     <<set $flashCount=$flashCount+1>>
+    <<wait  0.3>>
     gotash?: 这是哪里…<waitfor=0.1>为什么？<waitfor=0.1>我又回来了… #line:0baa994 
     <<stop_shock>>
     me: 看起来是记忆模块的问题。 #line:0f7b387 
@@ -205,16 +207,16 @@ position: 907,-2702
     <<wait 1>>
     <<set_light_state Emergency>>
     <<set $flashCount=$flashCount+1>>
-    gotash?: 妈妈… #line:08ee885 
+    gotash?: 妈妈…  #auto_next #line:08ee885 
 <<elseif $flashCount==2>>
     <<play_shock_flash>>
     <<set_light_state Emergency>>
     <<set $flashCount=$flashCount+1>>
-    me:听得到吗？ #line:075ce88 
+    // me:听得到吗？ #line:075ce88 
 <<elseif $flashCount==3>>
     <<play_shock_flashback 开场1>>
     <<set $flashCount=$flashCount+1>>
-    me: 就差一点了…再坚持一下！ #line:0ba461f 
+    // me: 就差一点了…再坚持一下！ #line:0ba461f 
 <<elseif $flashCount==4>>
     <<play_shock_flashback 开场2>>
     <<set $flashCount=$flashCount+1>>
@@ -384,7 +386,6 @@ group:插线检查
 position: 1389,-2503
 ---
 <<wait 0.1>>
-<<open_screen Eye>>
 Linking: 正在建立连接… #line:005c0b8 
 <<wait 0.2>>
 EyeModule: 已与视觉模块建立连接！ #line:08d9eb2 
@@ -407,7 +408,6 @@ group:插线检查
 position: 1148,-2340
 ---
 <<wait 0.1>>
-<<open_screen Speak>>
 Linking: 正在建立连接… #line:095d856 
 <<wait 0.2>>
 SpeakerModule: 已与表达模块建立连接！ #line:0995165 

Assets/Resources/Yarn/FP_Prologue/Stage6_螺旋.yarn

@@ -15,34 +15,34 @@ colorID: 8
 group:插线检查
 position: 906,-585
 ---
-    //  <<fade_out 1>>
-    //  <<switch_fix_system_to "BodyModule" "Head">>
+     <<fade_out 1>>
+     <<switch_fix_system_to "BodyModule" "Head">>
     <<set_light_state Emergency>>
     <<auto_charge_and_release 1>>
     <<play_shock_flashback 开场1>>
     <<auto_charge_and_release 0.8>>
     <<play_shock_flashback 开场2>>
     <<auto_charge_and_release 0.6>>
-    <<play_shock_flashback 开场4>>
+    <<play_shock_flashback 开场1>>
     <<auto_charge_and_release 0.4>>
     <<play_shock_flashback 开场2>>
     <<auto_charge_and_release 0.4>>
-    <<play_shock_flashback 开场4>>
+    <<play_shock_flashback 开场1>>
     <<auto_charge_and_release 0.2>>
     <<play_shock_flashback 开场2>>
     <<auto_charge_and_release 0.2>>
-    <<play_shock_flashback 开场4>>
+    <<play_shock_flashback 开场1>>
     <<auto_charge_and_release 0.1>>
     <<play_shock_flashback 开场2>>
     <<auto_charge_and_release 0.1>>
-    <<play_shock_flashback 开场6>>
+    <<play_shock_flashback 开场1>>
     <<auto_charge_and_release 0.1>>
     <<play_shock_flashback 开场2>>
     <<auto_charge_and_release 0.1>>
-    <<play_shock_flashback 开场6>>
+    <<play_shock_flashback 开场1>>
     <<auto_charge_and_release 0.1>>
     <<play_shock_flashback 开场2>>
-    // <<auto_charge_and_release 0.1>>
+     <<auto_charge_and_release 0.1>>
     <<switch_camera BreakCamera>>
     <<Open_play_timeline Art/TimeLineAsset/BreakEnding>>
     // <<trigger_ending 开场7>> 
@@ -95,7 +95,7 @@ position: 248,443
 // 【声音桥，转场到地铁】 #line:002d60b 
 <<fade_in 0>>
 CenterText: 第一章#auto_next #line:0bf67b0 
-<<wait 2>>
+<<wait 3.5>>
 <<set $gameStage = 999>>
 <<jump Center>>
 ===

Assets/Resources/Yarn/Fiction_Day1_mid/Fiction_Day1_mid.yarn

@@ -4,8 +4,9 @@ group: 入口
 position: 250,-26
 ---
 //<<hide_dialog>>
-<<fade_out 1>>
-<<jump 火山>>
+// <<fade_out 1>>
+// <<jump 火山>>
+<<jump 佩佩>>
 ===
 
 
@@ -152,7 +153,7 @@ position: 250,200
 // ->CenterOption: 点火
 <<hide_dialog>>
 <<wait 1>>
-<<change_actor_state 诊室外医生 "SMOKE">>
+<<change_actor_state "SMOKE" 诊室外医生 >>
 me: 呼… #line:0f8a4c3 
 <<hide_dialog>>
 <<wait 2>>
@@ -241,48 +242,75 @@ peipei: 再见了，叶子。 #line:0694ade
 佩佩看了你一眼，微笑了一下，转头离开了。 #line:00d0440 
 <<fade_out_actor "诊室外佩佩" 1>>
 <<wait 1>>
+<<play_sfx "event:/Scriptal/pager">>
+<<wait 1.5>>
+【我低头看BB机】
 
-hs: 美工机体也会故障？这可比我促销失败还罕见啊。 #line:0dda97b 
-me: 偷听多久了？ #line:0a48f13 
-hs: 天地良心！我…刚来。 #line:09b6b21 
-
-【火山出现】 #line:095f800 
-
-hs: …怎么样？她有为难你吗？我是说…英理。 #line:08fbc8a 
-me: …… #line:0b559dd 
-me: “待改进观察期”，听过吗？ #line:0b9489e 
-hs: 我操？你也？ #line:0900219 
-me: “也”？ #line:0d2eda4 
-hs: 没搞错吧…我是没完成指标，但是你不是都达标了吗？ #line:0570656 
-me: 你不是说你昨天通过考核了吗？ #line:08a0f60 
-hs: 哎呀，我只是…想逗你开心点。 #line:0dddabb 
-
+me: “我：喂，在么”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-忙着呢”
+<<wait 1>>
+me: “我：你知道“待改进观察期”是什么吗”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-见鬼，你也被英理找了？”
+<<wait 0.5>>
+me: “我：“也”？”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-说来话长…晚上聊吧”
+<<wait 1>>
+me: “我：老地方？”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-老地方。”
+<<wait 1>>
+【我收起BB机】
 <<hide_dialog>>
 <<wait 1>>
 
-hs: 不对劲…不对劲。她不是这样的。 #line:0bc4ea7 
-hs: …一定和他有关…… #line:03abf30 
-me: 他？ #line:08d2e7e 
-hs: 晚上说。我有独家消息。 #line:0f19f2b 
-me: 喂？你就不能现在说吗？ #line:04e9f34 
-hs: 老规矩，Nostalgia，第三卡座。 #line:065d4d9 
+// hs: 美工机体也会故障？这可比我促销失败还罕见啊。 #line:0dda97b 
+// me: 偷听多久了？ #line:0a48f13 
+// hs: 天地良心！我…刚来。 #line:09b6b21 
 
-他从刚刚眼神就没在你身上，一直在人群中游离。这时忽然盯上了一个路过的机体，表情瞬间亮了起来。 #line:08fcfbc 
+// 【火山出现】 #line:095f800 
 
-hs: （元气声线）这位英俊的先生！需要提升300%工作效率的限量款—— #line:002e914 
-hs: （突然卡壳）呃...提升300%工作效率的限量款...呃... #line:01dffa4 
+// hs: …怎么样？她有为难你吗？我是说…英理。 #line:08fbc8a 
+// me: …… #line:0b559dd 
+// me: “待改进观察期”，听过吗？ #line:0b9489e 
+// hs: 我操？你也？ #line:0900219 
+// me: “也”？ #line:0d2eda4 
+// hs: 没搞错吧…我是没完成指标，但是你不是都达标了吗？ #line:0570656 
+// me: 你不是说你昨天通过考核了吗？ #line:08a0f60 
+// hs: 哎呀，我只是…想逗你开心点。 #line:0dddabb 
 
-<<hide_dialog>>
-<<wait 1>>
-me: 这家伙…… #line:09f05d5 
+// <<hide_dialog>>
+// <<wait 1>>
 
-吸完最后一口烟，你长舒一口气。 #line:0a732a9 
+// hs: 不对劲…不对劲。她不是这样的。 #line:0bc4ea7 
+// hs: …一定和他有关…… #line:03abf30 
+// me: 他？ #line:08d2e7e 
+// hs: 晚上说。我有独家消息。 #line:0f19f2b 
+// me: 喂？你就不能现在说吗？ #line:04e9f34 
+// hs: 老规矩，Nostalgia，第三卡座。 #line:065d4d9 
+
+// 他从刚刚眼神就没在你身上，一直在人群中游离。这时忽然盯上了一个路过的机体，表情瞬间亮了起来。 #line:08fcfbc 
+
+// hs: （元气声线）这位英俊的先生！需要提升300%工作效率的限量款—— #line:002e914 
+// hs: （突然卡壳）呃...提升300%工作效率的限量款...呃... #line:01dffa4 
+
+// <<hide_dialog>>
+// <<wait 1>>
+// me: 这家伙…… #line:09f05d5 
+
+// 吸完最后一口烟，你长舒一口气。 #line:0a732a9 
 <<stop_music music>>
 ->CenterOption: 回到诊室 #line:05dd25e 
     <<hide_dialog>>
     <<fade_out_actor "诊室外医生" 1>>
     <<wait 1>>
-    <<fade_in 1>>W
+    <<fade_in 1>>
 
 <<hide_dialog>>
 <<NextYarn>>

Assets/Scenes/Persistence.unity

@@ -8093,7 +8093,7 @@ Transform:
   m_GameObject: {fileID: 519420028}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalPosition: {x: -0.009999275, y: 0, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -13927,7 +13927,7 @@ Transform:
   m_GameObject: {fileID: 1078778568}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -15}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -25552,7 +25552,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 54}
-  m_SizeDelta: {x: 700, y: 550}
+  m_SizeDelta: {x: 560, y: 440}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2038437603
 MonoBehaviour:

Assets/ScriptableObjects/BubbleStyle/Mini Left Style.asset

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   bubblePadding: {x: 30, y: 5, z: 15, w: 20}
   linePadding: {x: 10, y: 5, z: 10, w: 0}
-  lineFontSize: 24
+  lineFontSize: 26
   actorPadding: {x: 0, y: 0, z: 0, w: 0}
-  actorFontSize: 26
+  actorFontSize: 28
   hasActorName: 1
   bubbleSpriteAddress: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846"

Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs

@@ -65,6 +65,7 @@ namespace AibisDream
         {
             // 获取鼠标位置
             Vector3 mousePosition = Input.mousePosition;
+            mousePosition.x -= 40f; // 为x坐标加上40.3
             Vector3 worldMousePosition = viewCamera.ScreenToWorldPoint(mousePosition);
             worldMousePosition.z = 0; // 确保 z 为 0
 
@@ -96,6 +97,7 @@ namespace AibisDream
         {
             // 获取鼠标位置
             Vector3 mousePosition = Input.mousePosition;
+            mousePosition.x -= 40f; // 为x坐标加上40.3
             Vector3 worldPosition = Camera.main.ScreenToWorldPoint(mousePosition);
             RaycastHit2D hit =
                 Physics2D.Raycast(worldPosition + viewCamera.transform.position - Camera.main.transform.position,

Assets/Scripts/FixSystemNew/Open/OpenYarnCommand.cs

@@ -11,9 +11,9 @@ namespace AibisDream.FixSystem
         private static ShockSystem ShockSystem => FixSystemCenter.SystemDic.Get<ShockSystem>();
 
         [YarnCommand("play_shock_flash")]
-        public static IEnumerator PlayShockFlash()
+        public static void PlayShockFlash()
         {
-            yield return ShockSystem.PlayFlashEffect();
+            ShockSystem.StartCoroutine(ShockSystem.PlayFlashEffect());
         }
 
         [YarnCommand("play_shock_flashback")]
@@ -22,7 +22,7 @@ namespace AibisDream.FixSystem
             var spriteFlashSystem = ShockSystem.GetComponent<SpriteFlashSystem>();
             if (spriteFlashSystem != null)
             {
-                ShockSystem.StartCoroutine(PlayShockFlash());
+                ShockSystem.StartCoroutine(ShockSystem.PlayFlashEffect());
                 yield return spriteFlashSystem.TriggerFlash(imagePath);
             }
         }

Assets/Scripts/Framework/OtherKit/CameraKit.cs

@@ -7,6 +7,7 @@ using DG.Tweening;
 using DG.Tweening.Core;
 using DG.Tweening.Plugins.Options;
 using UnityEngine;
+using UnityEngine.Rendering.Universal;
 using Yarn.Unity;
 
 namespace AibisDream.Framework
@@ -65,6 +66,48 @@ namespace AibisDream.Framework
 
         #region 相机信息注册
 
+        public void RegisterUICamera(Camera overlayCamera)
+        {
+            // 获取 Main Camera 的 UniversalAdditionalCameraData
+            var mainCameraData = _orthoMainCamera.GetUniversalAdditionalCameraData();
+        
+            if (mainCameraData != null)
+            {
+                // 检查 Overlay Camera 是否已经在 Stack 中
+                if (!mainCameraData.cameraStack.Contains(overlayCamera))
+                {
+                    // 将 Overlay Camera 添加到 Stack
+                    mainCameraData.cameraStack.Add(overlayCamera);
+                    Debug.Log("Overlay Camera added to Main Camera stack.");
+                }
+            }
+            else
+            {
+                Debug.LogError("Main Camera does not have UniversalAdditionalCameraData.");
+            }
+        }
+
+        public void UnRegisterUICamera(Camera overlayCamera)
+        {
+            // 获取 Main Camera 的 UniversalAdditionalCameraData
+            var mainCameraData = _orthoMainCamera.GetUniversalAdditionalCameraData();
+        
+            if (mainCameraData != null)
+            {
+                // 检查 Overlay Camera 是否已经在 Stack 中
+                if (!mainCameraData.cameraStack.Contains(overlayCamera))
+                {
+                    // 将 Overlay Camera 添加到 Stack
+                    mainCameraData.cameraStack.Remove(overlayCamera);
+                    Debug.Log("Overlay Camera added to Main Camera stack.");
+                }
+            }
+            else
+            {
+                Debug.LogError("Main Camera does not have UniversalAdditionalCameraData.");
+            }
+        }
+        
         public void RegisterCamera(CameraEnum camType, ICinemachineCamera virtualCamera, bool isPerspective = false)
         {
             _virtualCameraDict[camType] = virtualCamera;

Assets/Scripts/Framework/OtherKit/UICamera.cs

@@ -0,0 +1,17 @@
+using UnityEngine;
+
+namespace AibisDream.Framework
+{
+    public class UICamera : MonoBehaviour
+    {
+        private void Awake()
+        {
+            CameraKit.Instance.RegisterUICamera(GetComponent<Camera>());
+        }
+
+        private void OnDestroy()
+        {
+            CameraKit.Instance.UnRegisterUICamera(GetComponent<Camera>());
+        }
+    }
+}

Assets/Scripts/Framework/OtherKit/UICamera.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 061bb2d8e88b4f7c96c1a1b10e32d6eb
+timeCreated: 1749649908

Assets/Scripts/MiniGame/Peipei/CutLine/LineInteraction.cs

@@ -116,7 +116,7 @@ public class LineInteraction : MonoBehaviour
 
     void ContinueTimeline()
     {
-        AudioManager.Instance.PlaySfx("event:/Scriptal/wire_cut");
+        AudioManager.Instance.PlaySfx("event:/ActionFB/wire_cut");
         timelineDirector.Play();
     }
 }

Assets/StreamingAssets/Config/character.csv

@@ -2,9 +2,10 @@
 Key,Cn,,DialogViewType,Role,NameColor,HeadPicPath,VoicePath,BubbleIdx
 peipei,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP,
 pp,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP,
+ppm,佩佩,Peipei,Default,Aside,#00FFFF,peipei_head,VO/voice_PP,
 me,我,Me,Default,Player,,me_head,VO/voice_ME,
-jj,姐姐,Sister,Default,Player,,me_head,VO/voice_JJ,
-jj?,柔和女声,???,Default,Player,,me_head,VO/voice_JJ,
+jj,姐姐,Sister,Default,MainActor,,me_head,VO/voice_JJ,
+jj?,柔和女声,???,Default,MainActor,,me_head,VO/voice_JJ,
 hs,火山,Huoshan,Default,MainActor,#FFA800,peipei_head,VO/voice_HS,
 hs?,沙哑男声,???,Default,MainActor,#FFA800,peipei_head,VO/voice_HS,
 yl,英理,Yingli,Default,MainActor,#4000FF,peipei_head,VO/voice_YL,