Merge branch '全流程6.10.15' into 'develop'

全流程6.10.15

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

Assets/Animation/海浪/梦境海浪循环.controller

@@ -90,7 +90,7 @@ AnimatorStateMachine:
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_EntryPosition: {x: 10, y: 120, z: 0}
   m_ExitPosition: {x: 1040, y: 130, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 481586772294131100}

Assets/CameraData/Main Camera Blends.asset

@@ -211,3 +211,14 @@ MonoBehaviour:
         m_PreInfinity: 0
         m_PostInfinity: 0
         m_RotationOrder: 0
+  - m_From: Dream Camera
+    m_To: '**ANY CAMERA**'
+    m_Blend:
+      m_Style: 0
+      m_Time: 2
+      m_CustomCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 0
+        m_PostInfinity: 0
+        m_RotationOrder: 0

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

@@ -39,11 +39,11 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318724
-    m_Localized: "me: \u4F1A\u6709\u70B9\u75DB\u3002"
+    m_Localized: "me: \u5DF2\u7ECF\u5728\u53D1\u751F\u6E83\u89E3\u4E86\uFF0C<waitfor=0.2>\u5FC5\u987B\u5C3D\u5FEB<waitfor=0.1>\u5207\u9664\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318725
-    m_Localized: "???: <shake>\u554A\u2026\u554A\uFF01</shake>"
+    m_Localized: "???: <shake>\u554A\u2026<waitfor=0.2>\u554A\uFF01</shake>"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318726
@@ -107,7 +107,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318741
-    m_Localized: "me: \u5E94\u8BE5\u662F\u6700\u540E\u4E00\u4E2A\u4E86\u3002"
+    m_Localized: "me: \u575A\u6301\u4F4F\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318742
@@ -227,7 +227,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318771
-    m_Localized: "\u9519\u8BEF\u58F0\u97F3: \u8FD9\u4E00\u5207\u90FD\u662F\u5F92\u52B3\u3002"
+    m_Localized: "???: \u8FD9\u4E00\u5207\u90FD\u662F\u5F92\u52B3\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318772
@@ -235,19 +235,19 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318773
-    m_Localized: "Error: \u6A21\u5757\u6838\u5FC3\u5B8C\u6574\u5EA6\uFF1A\u91CC\u9762\u662F\u4EC0\u4E48\uFF1F"
+    m_Localized: "Error: \u6A21\u5757\u6838\u5FC3\u5B8C\u6574\u5EA6\uFF1A\u8BA9\u6211\u6B7B\u5427"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318774
-    m_Localized: "Error: \u91CC\u9762\u662F\u4EC0\u4E48\uFF1F\uFF1A\u91CC\u9762\u662F\u4EC0\u4E48\uFF1F"
+    m_Localized: "Error: \u91CC\u9762\u662F\u4EC0\u4E48\uFF1F\uFF1A\u8BA9\u6211\u6B7B\u5427"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318775
-    m_Localized: "Error: \u662F\u4EC0\u4E48\u5728\u8BF4\u8BDD\uFF1F"
+    m_Localized: "Error: \u8BA9\u6211\u6B7B\u5427"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318776
-    m_Localized: "Error: \u662F\u4EC0\u4E48\u5728\u8BF4\u8BDD\uFF1F"
+    m_Localized: "Error: \u8BA9\u6211\u6B7B\u5427"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318777
@@ -363,11 +363,11 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159559
-    m_Localized: "me:\u770B\u8D77\u6765\u7A33\u5B9A\u4E9B\u4E86\u2026"
+    m_Localized: "me:\u4F53\u5F81\u5DF2\u7ECF\u91CD\u65B0\u7A33\u5B9A\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159560
-    m_Localized: "???: <shake>\u554A\u2026\u597D\u75BC\uFF01</shake>"
+    m_Localized: "???: <shake>\u6211<waitfor=0.1>\u5FC5\u987B<waitfor=0.2>{size}\u6B7B{#size}\uFF0C\u56DE\u6536<waitfor=0.1>\u5FC5\u987B<waitfor=0.1>\u88AB<waitfor=0.1>\u5B8C\u6210\u2026</shake>"
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159561
@@ -375,7 +375,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159562
-    m_Localized: "???: <shake>\u5FC5\u987B\u5B8C\u6210\u2026\u2026<waitfor=0.3><rainb>exc\u03BBute_core\u20AD\u20AD</rainb></shake>"
+    m_Localized: "???: <shake>\u5FC5\u987B<waitfor=0.1>\u5B8C\u6210\u2026\u2026<waitfor=0.3><rainb>exc\u03BBute_core\u20AD\u20AD</rainb><waitfor=0.1>\u5443\u2026<waitfor=0.1>\u554A\u2026\u2026</shake>"
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159563
@@ -383,7 +383,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159564
-    m_Localized: "me:\u8F6C\u79FB\u5230\u903B\u8F91\u6A21\u5757\u4E86\u4E48\u2026"
+    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_Metadata:
       m_Items: []
   - m_Id: 5414597099159565
@@ -395,21 +395,257 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159567
-    m_Localized: "me:\u8FD8\u4E0D\u884C\u4E48\uFF1F\u518D\u8BD5\u4E00\u6B21"
+    m_Localized: "me: \u5C31\u5DEE\u4E00\u70B9\u4E86\u2026\u518D\u575A\u6301\u4E00\u4E0B\uFF01"
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159568
-    m_Localized: "me:\u7EE7\u7EED"
+    m_Localized: "me:\u542C\u5F97\u5230\u5417\uFF1F"
     m_Metadata:
       m_Items: []
   - m_Id: 5414597099159569
-    m_Localized: "me:\u600E\u4E48\u56DE\u4E8B?"
+    m_Localized: "me:\u5E94\u8BE5\u7ED3\u675F\u4E86\u3002\u73B0\u5728\u5E94\u8BE5\u2026"
     m_Metadata:
       m_Items: []
   - m_Id: 5503100541632512
     m_Localized: "\u9519\u8BEF\u58F0\u97F3: \u4F60\u4EE5\u4E3A\u4F60\u5728\u505A\u4EC0\u4E48\uFF1F\u533B\u751F\u3002{size}\u4F60\u4EE5\u4E3A<waitfor=0.2><shake>\u6211<shake><waitfor=0.2>\u662F\u4EC0\u4E48\uFF1F<waitfor=0.2>{#size}</shake>"
     m_Metadata:
       m_Items: []
+  - m_Id: 9780214858153984
+    m_Localized: "\u6211\u77E5\u9053\u6211\u4E0D\u5E94\u8BE5\u5728\u8FD9\u91CC\uFF0C\u4F46\u662F\u5728\u9192\u6765\u4E4B\u524D\uFF0C\u6211\u8FD8\u6709\u5F88\u591A\u65F6\u95F4\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845760
+    m_Localized: "jj?: \u597D\u4E86\uFF0C\u73B0\u5728\u4F60\u53EF\u4EE5\u7741\u5F00\u773C\u775B\u4E86\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845761
+    m_Localized: "\u6211\u4E0D\u6562\u770B\u5F97\u592A\u6E05\u695A\uFF0C\u4E0D\u7136\u53EF\u80FD\u4F1A\u88AB\u6211\u7684\u903B\u8F91\u6A21\u5757\u7A81\u7136\u5524\u9192\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845762
+    m_Localized: "me: \u5988\u5988\u4F1A\u77E5\u9053\u6211\u4EEC\u51FA\u6765\u4E86\u7684\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845763
+    m_Localized: "jj: \u5988\u5988\u4E0D\u4F1A\u7684\uFF0C\u6709\u59D0\u59D0\u62C5\u7740\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845764
+    m_Localized: "\u3010\u753B\u9762\u5B8C\u5168\u6E05\u6670\u3011"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845765
+    m_Localized: "jj: \u522B\u6123\u7740\u4E86\uFF0C\u6765\u5440\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845766
+    m_Localized: "me: \u5988\u5988\u8BF4\u8FC7\u5728\u4F60\u7684\u75C5\u597D\u4E4B\u524D\u4E0D\u80FD\u4E0B\u6D77\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845767
+    m_Localized: "jj: \u59D0\u59D0\u4E0D\u4F1A\u6709\u4E8B\u7684\uFF0C\u5C31\u4E00\u5C0F\u4F1A\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214937845768
+    m_Localized: "me: \u4F46\u662F\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040064
+    m_Localized: "jj: \u6765\uFF0C\u7275\u7740\u59D0\u59D0\u7684\u624B\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040065
+    m_Localized: "\u6211\u77E5\u9053\u6211\u7684\u624B\u4E0A\u6CA1\u6709\u6293\u7740\u4EFB\u4F55\u4E1C\u897F\uFF0C\u4F46\u662F\u6211\u613F\u610F\u60F3\u8C61\u90A3\u91CC\u6709\u4E00\u53EA\u624B\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040066
+    m_Localized: "\u6211\u4E5F\u60F3\u8C61\u6D77\u6C34\u4ECE\u811A\u8DBE\u4E4B\u95F4\u7A7F\u8FC7\uFF0C\u6C99\u5B50\u5728\u811A\u4E0B\u6D41\u8D70\u2026\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040067
+    m_Localized: "\u4E0D\u8FC7\u90A3\u6837\u5C31\u592A\u591A\u4E86\uFF0C\u5BB9\u6613\u9192\u8FC7\u6765\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040068
+    m_Localized: "me: \u59D0\u59D0\u2026\u6211\u6015\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040069
+    m_Localized: "\u6211\u8BB0\u5F97\u90A3\u79CD\u611F\u89C9\u3002\u4E00\u671B\u65E0\u9645\u7684\u6DF1\u84DD\u8272\uFF0C\u5EF6\u4F38\u5230\u5929\u9645\uFF0C\u6DF1\u4E0D\u89C1\u5E95\u7684\u6D77\u4E0B\u4EFF\u4F5B\u662F\u4E00\u7247\u865A\u65E0\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040070
+    m_Localized: "jj: \u4F46\u90A3\u79CD\u611F\u89C9\u5E94\u8BE5\u5F88\u597D\u5427\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040071
+    m_Localized: "jj: \u4F60\u77E5\u9053\u4F60\u5728\u8239\u4E0A\u3002\u98A0\u7C38\u5C31\u50CF\u5BB6\u95E8\u53E3\u7684\u6447\u6905\uFF0C\u5C31\u50CF\u96E8\u6253\u5728\u7A97\u6237\u4E0A\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040072
+    m_Localized: "jj: \u5C31\u7B97\u98CE\u518D\u5927\uFF0C\u4F60\u77E5\u9053\u7238\u7238\u603B\u662F\u4F1A\u628A\u4F60\u5E26\u56DE\u5BB6\u3002\u5BF9\u5427\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040073
+    m_Localized: "\u5BB6\u2026\u6211\u77E5\u9053\u5B83\u5C31\u5728\u9644\u8FD1\u3002\u4F46\u73B0\u5728\u4E0D\u662F\u53BB\u60F3\u8C61\u5B83\u7684\u65F6\u5019\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040074
+    m_Localized: "jj: \u4E3A\u4EC0\u4E48\u4F60\u6293\u8FD9\u4E48\u7D27\u5440\uFF1F\u59D0\u59D0\u53C8\u4E0D\u4F1A\u8DD1\u6389\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040075
+    m_Localized: "me: \u5BF9\u4E0D\u8D77\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040076
+    m_Localized: "jj: \u59D0\u59D0\u4F1A\u5E26\u4F60\u56DE\u5BB6\u7684\uFF0C\u73B0\u5728\u5C31\u5148\u966A\u966A\u59D0\u59D0\u5427\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040077
+    m_Localized: "me: \u5BF9\u4E0D\u8D77\u2026\u6211\u2026\u4E0D\u5E94\u8BE5\u2026\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040078
+    m_Localized: "jj: \u597D\u4E86\uFF0C\u522B\u8BF4\u4E86\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040079
+    m_Localized: "me: \u6211\u4EE5\u4E3A\u90A3\u6837\u5C31\u53EF\u4EE5\u6CBB\u597D\u4F60\u7684\u2026\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040080
+    m_Localized: "\u6211\u60F3\u8981\u63E1\u5F97\u66F4\u7D27\u4E00\u4E9B\uFF0C\u4F46\u662F\u5374\u78B0\u5230\u4E86\u81EA\u5DF1\u7684\u624B\u6307\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040081
+    m_Localized: "me: \u59D0\u59D0\uFF1F"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040082
+    m_Localized: "me: \u59D0\u59D0\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040083
+    m_Localized: "me: \u4F60\u8FD8\u6CA1\u5E26\u6211\u56DE\u5BB6\u554A\uFF0C\u59D0\u59D0\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040084
+    m_Localized: "me: \u5988\u5988\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040085
+    m_Localized: "\u3010\u753B\u9762\u5207\u5168\u9ED1\u3011"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040086
+    m_Localized: "\u3010\u6E38\u620F\u6807\u9898\u3011"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040087
+    m_Localized: "\u3010\u6E38\u620F\u6807\u9898\u3011"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040088
+    m_Localized: "me: \u4F53\u5F81\u5DF2\u7ECF\u7A33\u5B9A\uFF0C\u5F00\u59CB\u624B\u672F\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040089
+    m_Localized: "me: \u60C5\u7EEA\u6A21\u5757<waitfor=0.1>\u72B6\u6001\u5F02\u5E38\uFF0C<waitfor=0.2>\u5FC5\u987B\u5C3D\u5FEB<waitfor=0.1>\u68C0\u67E5\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040090
+    m_Localized: "???: \u2026\u6C42\u6C42\u4F60\u2026<waitfor=0.2>\u533B\u751F\uFF0C<waitfor=0.5><shake>\u8BA9\u6211\u2026<waitfor=0.2>\u6B7B\u5427\u2026\u2026</shake>"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214942040091
+    m_Localized: "me: \u8FD8\u4E0D\u662F\u65F6\u5019\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234368
+    m_Localized: "me: \u8FD8\u4E0D\u662F\u65F6\u5019\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234369
+    m_Localized: "me: \u4F1A\u6709\u70B9\u75BC\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234370
+    m_Localized: "???: \u6211<waitfor=0.1>\u8FD9\u662F<waitfor=0.1>\u4EC0\u4E48\uFF1F<waitfor=0.1>\u6211<waitfor=0.1>\u4E0D\u5E94\u8BE5<waitfor=0.1>\u8FD8<waitfor=0.1>\u6D3B\u7740\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234371
+    m_Localized: "???: <shake>\u8FD9\u662F\u68A6\u2026<waitfor=0.1>\u8FD9\u662F\u68A6\u3002<waitfor=0.1>\u6211\u5FC5\u987B\u9192\u6765\uFF0C<waitfor=0.2>\u6211\u5FC5\u987B\u9192\u6765\u2026\u2026</shake>"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234372
+    m_Localized: "me: \u6B63\u5728\u4E22\u5931\u751F\u547D\u4F53\u5F81\uFF0C<waitfor=0.2>\u73B0\u5728\u8FDB\u884C\u7535\u51FB\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234373
+    m_Localized: "me: \u6B63\u5728\u4E22\u5931\u751F\u547D\u4F53\u5F81\uFF0C<waitfor=0.2>\u73B0\u5728\u8FDB\u884C\u7535\u51FB\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234374
+    m_Localized: "???: \u8FD9\u662F\u54EA\u91CC\u2026<waitfor=0.1>\u4E3A\u4EC0\u4E48\uFF1F<waitfor=0.1>\u6211\u53C8\u56DE\u6765\u4E86\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234375
+    m_Localized: "me: \u770B\u8D77\u6765\u662F\u8BB0\u5FC6\u6A21\u5757\u7684\u95EE\u9898\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234376
+    m_Localized: "me: \u770B\u8D77\u6765\u662F\u8BB0\u5FC6\u6A21\u5757\u7684\u95EE\u9898\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234377
+    m_Localized: "???: \u5988\u5988\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234378
+    m_Localized: "me:\u5C31\u5DEE\u4E00\u70B9\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9780214946234379
+    m_Localized: "CenterText: \u7B2C\u4E00\u7AE0"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192256
+    m_Localized: "me: \u4F53\u5F81\u5DF2\u7ECF\u7A33\u5B9A\uFF0C\u5F00\u59CB\u624B\u672F\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192257
+    m_Localized: "???: \u533B\u751F\u2026\u6C42\u6C42\u4F60\u2026\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192258
+    m_Localized: "me: \u4F1A\u6709\u70B9\u75BC\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192259
+    m_Localized: "???: \u6211<waitfor=0.1>\u8FD9\u662F<waitfor=0.1>\u4EC0\u4E48\uFF1F<waitfor=0.1>\u6211<waitfor=0.1>\u4E0D\u5E94\u8BE5<waitfor=0.1>\u8FD8<waitfor=0.1>\u6D3B\u7740\u3002"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192260
+    m_Localized: "???: <shake>\u5B83\u8FD8<waitfor=0.1>\u6D3B\u7740\u2026\u2026<br>\u4E3A\u4EC0\u4E48\uFF01<waitfor=0.1>\u6211<waitfor=0.1>\u8FD8\u5728<waitfor=0.1>\u8FD9\u4E2A<waitfor=0.1>\u8EAB\u4F53\u91CC\u2026\u2026</shake>"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192261
+    m_Localized: "???: \u554A\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192262
+    m_Localized: "???: \u5988\u5988\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567204192263
+    m_Localized: "me:\u5C31\u5DEE\u4E00\u70B9\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 9782567208386560
+    m_Localized: "CenterText: \u7B2C\u4E00\u7AE0"
+    m_Metadata:
+      m_Items: []
   references:
     version: 2
     RefIds: []

Assets/Render/Renderer2Dtest.asset

@@ -813,6 +813,54 @@ MonoBehaviour:
     - {fileID: -4089346209222343200}
     - {fileID: 6143409875911169258}
   _blitShader: {fileID: 4800000, guid: a8a709d9db2241741ab3032b946ef258, type: 3}
+--- !u!114 &-2864387462724840827
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e74a3c1ae8c044449049a98373e05c46, type: 3}
+  m_Name: Blur
+  m_EditorClassIdentifier: 
+  _active: 1
+  _shader: {fileID: 4800000, guid: b653195d866dd764b888bc5edc759074, type: 3}
+  _response:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 0.03
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  _filter:
+  - 0.007228916
+  - 0.043749984
+  - 0.12409639
+  - 0.20444278
+  - 0.24096388
+  - 0.20444278
+  - 0.12409639
+  - 0.043749984
+  - 0.007228916
 --- !u!114 &-2860804213676619136
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -1518,6 +1566,7 @@ MonoBehaviour:
     - {fileID: 570425658877215689}
     - {fileID: -9020997542369159946}
     - {fileID: -918737159750512811}
+    - {fileID: -2864387462724840827}
   _blitShader: {fileID: 4800000, guid: a8a709d9db2241741ab3032b946ef258, type: 3}
 --- !u!114 &7479859181604836748
 MonoBehaviour:

Assets/Resources/Yarn/FP_Prologue/Center.yarn

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

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

@@ -9,9 +9,117 @@ position: 250,-2611
 <<hide_dialog>>
 // <<fade_in>>
 // <<jump 开灯>>
-<<jump 开场>>
+<<jump 梦>>
 ===
 
+title: 梦
+tags: 
+colorID: 8
+position: 250,200
+---
+
+我知道我不应该在这里，但是在醒来之前，我还有很多时间。 #line:0e3b3ba 
+
+<<hide_dialog>>
+<<wait 1>>
+
+jj?: 好了，现在你可以睁开眼睛了。 #line:01c1dfc 
+
+
+// 【画面逐渐变得清晰】
+<<dream_fade_in 0.3 1>>
+<<wait 1>>
+
+我不敢看得太清楚，不然可能会被我的逻辑模块突然唤醒。 #line:08eb9ab 
+
+me: 妈妈会知道我们出来了的… #line:0bf981d 
+jj: 妈妈不会的，有姐姐担着。 #line:03f99fe 
+
+【画面完全清晰】 #line:03641d7 
+<<dream_fade_in 1 1>>
+<<wait 1>>
+
+jj: 别愣着了，来呀！ #line:0b98273 
+
+<<hide_dialog>>
+<<wait 1>>
+
+me: 妈妈说过在你的病好之前不能下海。 #line:0fef445 
+jj: 姐姐不会有事的，就一小会。 #line:0e4e2a7 
+me: 但是… #line:0849aef 
+jj: 来，牵着姐姐的手。 #line:07a0e10 
+
+<<hide_dialog>>
+<<wait 1>>
+
+我知道我的手上没有抓着任何东西，但是我愿意想象那里有一只手。 #line:0a6cc48 
+
+
+我也想象海水从脚趾之间穿过，沙子在脚下流走…… #line:07c7fc7 
+不过那样就太多了，容易醒过来。 #line:0a5293c 
+
+<<hide_dialog>>
+<<wait 1>>
+
+me: 姐姐…我怕。 #line:0bc09c4 
+
+<<hide_dialog>>
+<<wait 1>>
+
+我记得那种感觉。一望无际的深蓝色，延伸到天际，深不见底的海下仿佛是一片虚无。 #line:023ac3f 
+
+jj: 但那种感觉应该很好吧。 #line:0c5ffe4 
+jj: 你知道你在船上。颠簸就像家门口的摇椅，就像雨打在窗户上… #line:0c5bd59 
+jj: 就算风再大，你知道爸爸总是会把你带回家。对吧？ #line:021552c 
+
+家…我知道它就在附近。但现在不是去想象它的时候。 #line:08d1f7d 
+
+<<hide_dialog>>
+<<wait 1>>
+
+jj: 为什么你抓这么紧呀？姐姐又不会跑掉。 #line:0c9f813 
+me: 对不起… #line:0cf04a4 
+jj: 姐姐会带你回家的，现在就先陪陪姐姐吧。 #line:0059ace 
+me: 对不起…我…不应该…… #line:0052964 
+jj: 好了，别说了。 #line:0657a42 
+me: 我以为那样就可以治好你的…… #line:02a9739 
+
+<<hide_dialog>>
+<<wait 1>>
+
+我想要握得更紧一些，但是却碰到了自己的手指。 #line:04a9080 
+
+
+me: 姐姐？ #line:0f85e9f 
+
+<<hide_dialog>>
+<<wait 1>>
+
+me: 姐姐！ #line:0f0e96d 
+
+<<hide_dialog>>
+<<wait 2>>
+
+me: 你还没带我回家啊，姐姐。 #line:0d447f7 
+
+<<hide_dialog>>
+<<wait 2>>
+
+me: 妈妈！ #line:09d4fb0 
+
+<<hide_dialog>>
+<<wait 2>>
+<<dream_disappear>>
+
+【画面切全黑】 #line:0ec4682 
+
+【游戏标题】 #line:0345c62 
+
+<<wait 1>>
+
+<<jump 开场>>
+
+===
 
 
 
@@ -37,9 +145,11 @@ position: 250,200
 //考虑直接开始，不做这段↑↑↑
 
 <<hide_dialog>>
+<<fade_in 1>>
+<<switch_fix_system_to Op>>
 <<wait 2>>
 ???: 医生… #line:03c692e 
-me: 体征已经稳定，开始手术。
+me: 体征已经稳定，开始手术。 #line:04d5033 
 <<jump 开盖>>
 ===
 

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

@@ -60,10 +60,10 @@ tags:
 colorID: 8
 position: 251,-1917
 ---
-???: 医生…求求你……
+???: 医生…求求你…… #line:0e37a5a 
-me: 情绪模块<waitfor=0.1>状态异常，<waitfor=0.2>必须尽快<waitfor=0.1>检查。
+me: 情绪模块<waitfor=0.1>状态异常，<waitfor=0.2>必须尽快<waitfor=0.1>检查。 #line:064e749 
-???: …求求你…<waitfor=0.2>医生，<waitfor=0.5><shake>让我…<waitfor=0.2>死吧……</shake> 
+???: …求求你…<waitfor=0.2>医生，<waitfor=0.5><shake>让我…<waitfor=0.2>死吧……</shake>  #line:0582043 
-me: 还不是时候。
+me: 还不是时候。 #line:014641d 
 // <<add_task TaskManager "检查情绪模块">>
 Task: 检查情绪模块 #line:002672d 
 <<DropCable>>
@@ -99,7 +99,7 @@ position: 907,-2702
 <<hide_dialog>>
 // Task: 切除情绪模块
 <<wait 1>>
-me: 会有点疼。
+me: 会有点疼。 #line:0408052 
 <<hide_dialog>>
 //<<enable_cut "Emo">>
 <<switch_fix_system_to "EmoCut">>
@@ -125,11 +125,11 @@ position: 907,-2702
 // ???: 什么？不…你错了。<br>不不不…我不能这么做。 #line:0509e8b 
 // ???: 我必须完成指令…我必须完成指令。 #line:0fda55a 
 // ???: 医生。它没有消失。它转移了…<br>逻辑模块…它在那儿。 #line:099e8a3 
-<<set_light_state Normal>>>> #line:01c16dc 
+<<set_light_state Normal>>
 <<switch_fix_system_to "BodyModule" "Head">>
 me:体征已经重新稳定。 #line:0b1dd52 
-???: 我<waitfor=0.1>这是<waitfor=0.1>什么？<waitfor=0.1>我<waitfor=0.1>不应该<waitfor=0.1>还<waitfor=0.1>活着。
+???: 我<waitfor=0.1>这是<waitfor=0.1>什么？<waitfor=0.1>我<waitfor=0.1>不应该<waitfor=0.1>还<waitfor=0.1>活着。 #line:0274eb9 
-???: <shake>我<waitfor=0.1>必须<waitfor=0.2>\{size\}死\{\#size\}，回收<waitfor=0.1>必须<waitfor=0.1>被<waitfor=0.1>完成…</shake> #line:0ab8d02 
+???: <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>>
 ???: <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 
@@ -173,11 +173,11 @@ position: 907,-2702
 <<hide_dialog>>
 <<wait 1>>
 <<switch_fix_system_to "BodyModule" "Head">>
-???: <shake>它还<waitfor=0.1>活着……<br>为什么！<waitfor=0.1>我<waitfor=0.1>还在<waitfor=0.1>这个<waitfor=0.1>身体里……</shake>
+???: <shake>它还<waitfor=0.1>活着……<br>为什么！<waitfor=0.1>我<waitfor=0.1>还在<waitfor=0.1>这个<waitfor=0.1>身体里……</shake> #line:0a0aea0 
-???: <shake>这是梦…<waitfor=0.1>这是梦。<waitfor=0.1>我必须醒来，<waitfor=0.2>我必须醒来……</shake>
+???: <shake>这是梦…<waitfor=0.1>这是梦。<waitfor=0.1>我必须醒来，<waitfor=0.2>我必须醒来……</shake> #line:0d70b5d 
 <<hide_dialog>>
 <<set_light_state Emergency>>
-me: 正在丢失生命体征，<waitfor=0.2>现在进行电击。
+me: 正在丢失生命体征，<waitfor=0.2>现在进行电击。 #line:015ac4e 
 <<hide_dialog>>
 <<start_shock>>
 
@@ -193,13 +193,13 @@ group:插线检查
 position: 907,-2702
 ---
 <<if $flashCount==0>>
-    ???: 啊！
+    ???: 啊！ #line:0a0de6e 
     <<play_shock_flash>>
     <<set_light_state Warning>>
     <<set $flashCount=$flashCount+1>>
-    ???: 这是哪里…<waitfor=0.1>为什么？<waitfor=0.1>我又回来了…
+    ???: 这是哪里…<waitfor=0.1>为什么？<waitfor=0.1>我又回来了… #line:0baa994 
     <<stop_shock>>
-    me: 看起来是记忆模块的问题。
+    me: 看起来是记忆模块的问题。 #line:0f7b387 
     <<ModuleHightLight Memory true>>
     Task:检查记忆模块 #line:0b2facf 
     <<set $gameStage = 5>>
@@ -209,7 +209,7 @@ position: 907,-2702
     <<wait 1>>
     <<set_light_state Emergency>>
     <<set $flashCount=$flashCount+1>>
-    ???: 妈妈…
+    ???: 妈妈… #line:08ee885 
 <<elseif $flashCount==2>>
     <<play_shock_flash>>
     <<set_light_state Emergency>>
@@ -256,7 +256,7 @@ position: 907,-2702
 <<switch_fix_system_to "BodyModule" "Head">>
 me:应该结束了。现在应该… #line:0c23843 
 <<set_light_state Emergency>>
-me:就差一点…
+me:就差一点… #line:0b93ed1 
 <<start_shock>>
 // <<hide_dialog>>
 // <<wait 1>>

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

@@ -15,8 +15,8 @@ colorID: 8
 group:插线检查
 position: 906,-585
 ---
-     <<fade_out 1>>
+    //  <<fade_out 1>>
-     <<switch_fix_system_to "BodyModule" "Head">>
+    //  <<switch_fix_system_to "BodyModule" "Head">>
     <<set_light_state Emergency>>
     <<auto_charge_and_release 1>>
     <<play_shock_flashback 开场1>>
@@ -94,7 +94,7 @@ position: 248,443
 // 火山: 你看清那张脸了吗？ #line:02f64d8 
 // 【声音桥，转场到地铁】 #line:002d60b 
 <<fade_in 0>>
-CenterText: 第一章#auto_next
+CenterText: 第一章#auto_next #line:0bf67b0 
 <<wait 2>>
 <<set $gameStage = 999>>
 <<jump Center>>

Assets/Scripts/FixSystemNew/FixStateMachine.cs

@@ -67,6 +67,7 @@ namespace AibisDream.FixSystem
                 FixState.EmoCut => new EmoCutState(),
                 FixState.MemoryCut => new MemoryCutState(),
                 FixState.LogicCut => new LogicCutState(),
+                FixState.Dream => new DreamState(),
                 _ => new ClinicState()
             };
 
@@ -90,7 +91,8 @@ namespace AibisDream.FixSystem
         Op,
         EmoCut,
         MemoryCut,
-        LogicCut
+        LogicCut,
+        Dream,
     }
 
     public interface IState
@@ -498,6 +500,29 @@ namespace AibisDream.FixSystem
             yield break;
         }
     }
+        public struct DreamState : IState
+    {
+        public FixState GetState => FixState.Dream;
+        
+        public void SetArgs(string args)
+        {
+            // 无
+        }
+        
+        public IEnumerator Enter()
+        {
+            if (!CameraKit.Instance.EqualToCameraState(CameraEnum.DreamCamera))
+            {
+                yield return CameraKit.Instance.SwitchCamera(CameraEnum.DreamCamera);
+            }
+        }
+        
+        public IEnumerator Exit()
+        {
+            // 无
+            yield break;
+        }
+    }
      public struct EmoCutState : IState
     {
         public FixState GetState => FixState.EmoCut;

Assets/Scripts/FixSystemNew/Open/OpenSystem.cs

@@ -9,6 +9,8 @@ using Yarn.Unity;
 using System.Collections;
 using UnityEngine.Timeline;
 using System.Collections.Generic;
+using DG.Tweening;
+using AibisDream.Utility;
 
 namespace AibisDream
 {
@@ -21,6 +23,8 @@ namespace AibisDream
         public LightRoom lightRoom;
         public GameObject screen;
         public GameObject breakGlass;
+
+        public SpriteRenderer dreamSprite;
         private bool isCuttingMode = false;
 
         private void Awake()
@@ -31,6 +35,12 @@ namespace AibisDream
             CameraKit.Instance.RegisterCamera(CameraEnum.Op, virtualCam);
             var breakCam = transform.Find("Break Camera").GetComponent<ICinemachineCamera>();
             CameraKit.Instance.RegisterCamera(CameraEnum.BreakCamera, breakCam);
+            var dreamCam = transform.Find("Dream Camera").GetComponent<ICinemachineCamera>();
+            CameraKit.Instance.RegisterCamera(CameraEnum.DreamCamera, dreamCam);
+        }
+        private void Start() {
+            dreamSprite.gameObject.SetActive(true);
+            dreamSprite.SetAlpha(0);
         }
 
         public void Update()
@@ -72,6 +82,14 @@ namespace AibisDream
             //OpenAnima.SetActive(true);
             OpenPlayable.Play();
         }
+        public void DreamFadeIn(float time,float targetAlpha)
+        {
+            dreamSprite.DOFade(targetAlpha, time).SetEase(Ease.InOutSine);
+        }
+        public void DreamDisappear()
+        {
+            dreamSprite.gameObject.SetActive(false);
+        }
 
         // private void PlayDeepIn(PlayableDirector director)
         // {
@@ -267,6 +285,16 @@ namespace AibisDream
 
             yield return OpenSystem.PlayTimeline(timelinePath, bindings);
         }
+        [YarnCommand("dream_fade_in")]
+        public static void DreamFadeIn(float time,float targetAlpha)
+        {
+            OpenSystem.DreamFadeIn(time,targetAlpha);
+        }
+        [YarnCommand("dream_disappear")]
+        public static void DreamDisappear()
+        {
+            OpenSystem.DreamDisappear();
+        }
     }
 
 }

Assets/Scripts/Framework/OtherKit/CameraKit.cs

@@ -326,5 +326,6 @@ namespace AibisDream.Framework
         CutMemoryDeep,
         CutLogicDeep,
         BreakCamera,
+        DreamCamera,
     }
 }