Merge branch 'develop' into feature/DEMO-FP优化

Assets/AddressableAssetsData/AssetGroups/Core.asset

@@ -28,6 +28,11 @@ MonoBehaviour:
     m_SerializedLabels:
     - SceneSO
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 9e771f24d61d40d42b7e2b4637e8090c
+    m_Address: "Timeline/\u5934\u75DB"
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
   m_SchemaSet:

Assets/AddressableAssetsData/AssetGroups/Scene_HuoshanFix.asset

@@ -87,6 +87,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e69af1ed498c57f4799f936aa28e4ed4
+    m_Address: "Assets/Animation/HuoshanFix/\u706B\u5C71\u5934\u75DB1.playable"
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
   m_SchemaSet:

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

@@ -24,12 +24,12 @@ MonoBehaviour:
     m_Key: line:0df9d06
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880042
+      - rid: 2772513495864836489
   - m_Id: 1504911036417
     m_Key: line:024f4c4
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880043
+      - rid: 2772513495864836490
   - m_Id: 32454826385203200
     m_Key: line:6e7bf2ab
     m_Metadata:
@@ -144,337 +144,337 @@ MonoBehaviour:
     m_Key: line:0406329
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880044
+      - rid: 2772513495864836491
   - m_Id: 125129954629246980
     m_Key: line:0107fcb
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880045
+      - rid: 2772513495864836492
   - m_Id: 125129954629246981
     m_Key: line:08ed91b
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880046
+      - rid: 2772513495864836493
   - m_Id: 125129954629246982
     m_Key: line:0e00d2f
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880047
+      - rid: 2772513495864836494
   - m_Id: 125129954629246983
     m_Key: line:017d06e
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880048
+      - rid: 2772513495864836495
   - m_Id: 125129954629246984
     m_Key: line:0281fe2
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880049
+      - rid: 2772513495864836496
   - m_Id: 125129954629246985
     m_Key: line:006752f
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880050
+      - rid: 2772513495864836497
   - m_Id: 125129954629246986
     m_Key: line:02b5559
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880051
+      - rid: 2772513495864836498
   - m_Id: 125129954629246987
     m_Key: line:0687a21
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880052
+      - rid: 2772513495864836499
   - m_Id: 125129954629246988
     m_Key: line:096e8b6
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880053
+      - rid: 2772513495864836500
   - m_Id: 125129954629246989
     m_Key: line:0b159c2
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880054
+      - rid: 2772513495864836501
   - m_Id: 125129954629246990
     m_Key: line:061676f
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880055
+      - rid: 2772513495864836502
   - m_Id: 125129954629246991
     m_Key: line:0d9a915
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880056
+      - rid: 2772513495864836503
   - m_Id: 125129954629246992
     m_Key: line:0a9bd95
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880057
+      - rid: 2772513495864836504
   - m_Id: 125129954629246993
     m_Key: line:0b8e398
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880058
+      - rid: 2772513495864836505
   - m_Id: 125129954629246994
     m_Key: line:02dacb4
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880059
+      - rid: 2772513495864836506
   - m_Id: 125129954629246995
     m_Key: line:0d73e06
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880060
+      - rid: 2772513495864836507
   - m_Id: 125129954629246996
     m_Key: line:08954c9
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880061
+      - rid: 2772513495864836508
   - m_Id: 125129954629246997
     m_Key: line:0837351
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880062
+      - rid: 2772513495864836509
   - m_Id: 125129954629246998
     m_Key: line:0a2c141
     m_Metadata:
       m_Items:
-      - rid: 2772513482449880063
+      - rid: 2772513495864836510
   - m_Id: 125129954629246999
     m_Key: line:0bd7844
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836096
+      - rid: 2772513495864836511
   - m_Id: 125129954629247000
     m_Key: line:026e3e9
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836097
+      - rid: 2772513495864836512
   - m_Id: 125129954629247001
     m_Key: line:05e01ed
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836098
+      - rid: 2772513495864836513
   - m_Id: 125129954629247002
     m_Key: line:08ddeb0
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836099
+      - rid: 2772513495864836514
   - m_Id: 125129954629247003
     m_Key: line:00ef791
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836100
+      - rid: 2772513495864836515
   - m_Id: 125129954629247004
     m_Key: line:000607d
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836101
+      - rid: 2772513495864836516
   - m_Id: 125129954629247005
     m_Key: line:047ffa8
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836102
+      - rid: 2772513495864836517
   - m_Id: 125129954629247006
     m_Key: line:0cfce1d
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836103
+      - rid: 2772513495864836518
   - m_Id: 125129954629247007
     m_Key: line:0c6773b
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836104
+      - rid: 2772513495864836519
   - m_Id: 125129954629247008
     m_Key: line:0261cd8
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836105
+      - rid: 2772513495864836520
   - m_Id: 125129954629247009
     m_Key: line:0a150b4
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836106
+      - rid: 2772513495864836521
   - m_Id: 125129954629247010
     m_Key: line:0a4baf6
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836107
+      - rid: 2772513495864836522
   - m_Id: 125129954629247011
     m_Key: line:01bf733
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836108
+      - rid: 2772513495864836523
   - m_Id: 125129954629247012
     m_Key: line:020f059
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836109
+      - rid: 2772513495864836524
   - m_Id: 125129954629247013
     m_Key: line:0fba1ea
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836110
+      - rid: 2772513495864836525
   - m_Id: 125129954629247014
     m_Key: line:0e60f3d
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836111
+      - rid: 2772513495864836526
   - m_Id: 125129954629247015
     m_Key: line:08aba07
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836112
+      - rid: 2772513495864836527
   - m_Id: 125129954629247016
     m_Key: line:0896ac5
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836113
+      - rid: 2772513495864836528
   - m_Id: 125129954629247017
     m_Key: line:0572e6d
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836114
+      - rid: 2772513495864836529
   - m_Id: 125129954629247018
     m_Key: line:001d71d
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836115
+      - rid: 2772513495864836530
   - m_Id: 125129954629247019
     m_Key: line:0a9bcdb
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836116
+      - rid: 2772513495864836531
   - m_Id: 125129954629247020
     m_Key: line:0b34eb7
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836117
+      - rid: 2772513495864836532
   - m_Id: 125129954629247021
     m_Key: line:001cdc1
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836118
+      - rid: 2772513495864836533
   - m_Id: 125129954629247022
     m_Key: line:0486ddc
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836119
+      - rid: 2772513495864836534
   - m_Id: 125129954629247023
     m_Key: line:085c4f7
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836120
+      - rid: 2772513495864836535
   - m_Id: 125129954629247024
     m_Key: line:087644c
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836121
+      - rid: 2772513495864836536
   - m_Id: 125129954629247025
     m_Key: line:0a12bb6
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836122
+      - rid: 2772513495864836537
   - m_Id: 125129954629247026
     m_Key: line:048e4bd
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836123
+      - rid: 2772513495864836538
   - m_Id: 125129954629247027
     m_Key: line:0862715
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836124
+      - rid: 2772513495864836539
   - m_Id: 125129954629247028
     m_Key: line:0f0e110
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836125
+      - rid: 2772513495864836540
   - m_Id: 125129954629247029
     m_Key: line:0fa66e1
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836126
+      - rid: 2772513495864836541
   - m_Id: 125129954629247030
     m_Key: line:0f5ab30
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836127
+      - rid: 2772513495864836542
   - m_Id: 125129954629247031
     m_Key: line:0472b8f
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836128
+      - rid: 2772513495864836543
   - m_Id: 125129954629247032
     m_Key: line:099894a
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836129
+      - rid: 2772513495864836544
   - m_Id: 125129954629247033
     m_Key: line:03b7110
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836130
+      - rid: 2772513495864836545
   - m_Id: 125129954629247034
     m_Key: line:0197f3f
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836131
+      - rid: 2772513495864836546
   - m_Id: 125129954629247035
     m_Key: line:0b27dde
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836132
+      - rid: 2772513495864836547
   - m_Id: 125132217724690432
     m_Key: line:07b8398
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836133
+      - rid: 2772513495864836548
   - m_Id: 125132217724690433
     m_Key: line:07c51d5
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836134
+      - rid: 2772513495864836549
   - m_Id: 125132217724690434
     m_Key: line:0fb16ed
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836135
+      - rid: 2772513495864836550
   - m_Id: 125132217724690435
     m_Key: line:02e7cfc
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836136
+      - rid: 2772513495864836551
   - m_Id: 125132217724690436
     m_Key: line:05e5cd3
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836137
+      - rid: 2772513495864836552
   - m_Id: 125132217724690437
     m_Key: line:08d15bc
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836138
+      - rid: 2772513495864836553
   - m_Id: 125132217724690438
     m_Key: line:0a63ca7
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836139
+      - rid: 2772513495864836554
   - m_Id: 125132217724690439
     m_Key: line:07e66e5
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836140
+      - rid: 2772513495864836555
   - m_Id: 125133319971004416
     m_Key: line:0d9c926
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836141
+      - rid: 2772513495864836556
   - m_Id: 125133319971004417
     m_Key: line:0f1b4ef
     m_Metadata:
       m_Items:
-      - rid: 2772513495864836142
+      - rid: 2772513495864836557
   m_Metadata:
     m_Items: []
   m_KeyGenerator:
@@ -506,348 +506,348 @@ MonoBehaviour:
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880042
+    - rid: 2772513495864836489
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880043
+    - rid: 2772513495864836490
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880044
+    - rid: 2772513495864836491
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880045
+    - rid: 2772513495864836492
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880046
+    - rid: 2772513495864836493
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880047
+    - rid: 2772513495864836494
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880048
+    - rid: 2772513495864836495
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880049
+    - rid: 2772513495864836496
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880050
+    - rid: 2772513495864836497
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880051
+    - rid: 2772513495864836498
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880052
+    - rid: 2772513495864836499
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880053
+    - rid: 2772513495864836500
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880054
+    - rid: 2772513495864836501
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880055
+    - rid: 2772513495864836502
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880056
+    - rid: 2772513495864836503
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880057
+    - rid: 2772513495864836504
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880058
+    - rid: 2772513495864836505
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880059
+    - rid: 2772513495864836506
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880060
+    - rid: 2772513495864836507
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880061
+    - rid: 2772513495864836508
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880062
+    - rid: 2772513495864836509
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513482449880063
+    - rid: 2772513495864836510
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836096
+    - rid: 2772513495864836511
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags:
         - lastline
-    - rid: 2772513495864836097
+    - rid: 2772513495864836512
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836098
+    - rid: 2772513495864836513
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836099
+    - rid: 2772513495864836514
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836100
+    - rid: 2772513495864836515
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836101
+    - rid: 2772513495864836516
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836102
+    - rid: 2772513495864836517
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836103
+    - rid: 2772513495864836518
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836104
+    - rid: 2772513495864836519
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836105
+    - rid: 2772513495864836520
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836106
+    - rid: 2772513495864836521
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836107
+    - rid: 2772513495864836522
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836108
+    - rid: 2772513495864836523
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836109
+    - rid: 2772513495864836524
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836110
+    - rid: 2772513495864836525
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836111
+    - rid: 2772513495864836526
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836112
+    - rid: 2772513495864836527
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836113
+    - rid: 2772513495864836528
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836114
+    - rid: 2772513495864836529
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836115
+    - rid: 2772513495864836530
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836116
+    - rid: 2772513495864836531
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836117
+    - rid: 2772513495864836532
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836118
+    - rid: 2772513495864836533
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836119
+    - rid: 2772513495864836534
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836120
+    - rid: 2772513495864836535
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836121
+    - rid: 2772513495864836536
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836122
+    - rid: 2772513495864836537
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836123
+    - rid: 2772513495864836538
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836124
+    - rid: 2772513495864836539
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836125
+    - rid: 2772513495864836540
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836126
+    - rid: 2772513495864836541
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836127
+    - rid: 2772513495864836542
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836128
+    - rid: 2772513495864836543
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836129
+    - rid: 2772513495864836544
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836130
+    - rid: 2772513495864836545
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836131
+    - rid: 2772513495864836546
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836132
+    - rid: 2772513495864836547
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836133
+    - rid: 2772513495864836548
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836134
+    - rid: 2772513495864836549
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836135
+    - rid: 2772513495864836550
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836136
+    - rid: 2772513495864836551
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836137
+    - rid: 2772513495864836552
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836138
+    - rid: 2772513495864836553
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836139
+    - rid: 2772513495864836554
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836140
+    - rid: 2772513495864836555
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836141
+    - rid: 2772513495864836556
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start
         tags: []
-    - rid: 2772513495864836142
+    - rid: 2772513495864836557
       type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
       data:
         nodeName: Start

Assets/Render/Renderer2Dtest.asset

@@ -477,15 +477,17 @@ MonoBehaviour:
     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
+  - 0.0057915063
+  - 0.0252664
+  - 0.071706556
+  - 0.12713514
+  - 0.1735753
+  - 0.1930502
+  - 0.1735753
+  - 0.12713514
+  - 0.071706556
+  - 0.0252664
+  - 0.0057915063
 --- !u!114 &-6086986437317696584
 MonoBehaviour:
   m_ObjectHideFlags: 3

Assets/Resources/Yarn/FP_Huoshan1/EventNode.yarn

@@ -57,6 +57,14 @@ position: 650,600
 <<jump 检查视觉>>
 ===
 
+title: LEyePlugIn
+tags: 桥接 插线
+colorID: 7
+position: 650,600
+---
+<<jump 检查视觉>>
+===
+
 
 
 title: 销售模块转动完成

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

@@ -317,7 +317,7 @@ me: …… #line:0813d06
 me: 我们去治疗室吧。 #line:0d7c713 
 //TODO: <<switch_character_state 默认蓝眼流泪无神微笑>>
 <<set $isPeipeiBE=false>>
-<<switch_fix_system_to BodyModule>>
+// <<switch_fix_system_to BodyModule>>
 <<SetHeat 0>>
 
 //这里可能存在一些初始化问题，我之后修复，或者先存另一个场景
@@ -373,8 +373,8 @@ position: -736,56
     me: …… #line:073dd50 
     me: 好吧。 #line:05298ed 
     me: 但你会回来的，对吧？ #line:022213f 
-    <<character_pos "无动作">>
-    <<character_face_new "不开心">>
+    // <<character_pos "无动作">>
+    // <<character_face_new "不开心">>
     <<jump 色彩抹除后续>>
 ===
 
@@ -427,7 +427,8 @@ me: 我会的。 #line:00fb884
 me: 我们去维修室吧。 #line:08e87d7 
 <<hide_dialog>>
 <<set $isPeipeiBE=true>>
-<<switch_fix_system_to BodyModule>>
-<<character_face_new "不开心">>
+// <<fade_in 1>>
+// <<switch_fix_system_to BodyModule>>
+// <<character_face_new "不开心">>
 <<jump 结束术前谈话2>>
 ===

Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn

@@ -3,9 +3,10 @@ tags:
 colorID: 3
 position: 246,-866
 ---
-<<switch_fix_system_to BodyModule>>
+<<fade_in 1>>
+<<switch_fix_system_to "BodyModule" "Head">>
 <<declare $isUFInstall=false>>
-<<fade_out 0.1>>
+<<fade_out 1>>
 <<if $isPeipeiBE==true>>
     Task: 执行手术-色彩记忆初始化 #line:0701927 
     me: 去记忆模块执行色彩初始化吧。 #line:0677ec5 

Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn

@@ -96,7 +96,7 @@ peipei: 谢谢你让我醒来。 #line:0fbc4f6
 
 <<hide_dialog>>
 <<wait 1>>
-<<hide_character>>
+// <<hide_character>>
 
 me: 醒来…或者说睡去。<br>总之，又一个病历结束了。但愿…… #line:029b103 
 
@@ -314,13 +314,14 @@ peipei: 这是我们的职责。 #line:080c8a0
     <<fade_out_actor "诊室外医生" 1>>
     <<wait 1>>
     <<fade_in 1>>
+    <<NextYarn>>
 
-<<wait 1>>
-<<load_scene Scene/SubWay 1>>  
-<<init_environment "Night">>
-<<fade_out 1>>
-CenterText: 未完待续...<br>感谢游玩 爱与机器人维修技术 <br>本次demo的体验流程已结束。 #line:00f29a9 
-<<wait 1>>
+// <<wait 1>>
+// <<load_scene Scene/SubWay 1>>  
+// <<init_environment "Night">>
+// <<fade_out 1>>
+// CenterText: 未完待续...<br>感谢游玩 爱与机器人维修技术 <br>本次demo的体验流程已结束。 #line:00f29a9 
+// <<wait 1>>
 ===
 
 

Assets/Scenes/Persistence.unity

@@ -4329,7 +4329,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 65495
+    m_Bits: 4294967295
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

Assets/Scenes/酒吧场景.unity

@@ -1470,7 +1470,7 @@ Transform:
   m_GameObject: {fileID: 1919232194}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.14, y: -4.86, z: 0}
+  m_LocalPosition: {x: -0.14, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2551,7 +2551,7 @@ Transform:
   m_GameObject: {fileID: 8655342980278347530}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.07, y: -4.86, z: 0}
+  m_LocalPosition: {x: 1.07, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []