Merge branch '6.12.03优化和修复' into 'develop'

修复记忆胶片问题

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

Assets/Language/Dialog/FP_Peipei1/FP_Peipei1_zh-Hans.asset

@@ -76,7 +76,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55080018513933
-    m_Localized: "me: \u90A3\u4E0D\u662F\u4E2A\u4E0D\u597D\u5BF9\u4ED8\u7684\u5BB6\u4F19\u5462\u3002"
+    m_Localized: "me: \u90A3\u4E0D\u662F\u4E2A\u597D\u5BF9\u4ED8\u7684\u5BB6\u4F19\u5462\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 55080018513934
@@ -224,7 +224,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708229
-    m_Localized: "me: \u5C06\u68C0\u67E5\u7EBF\u63D2\u5165\u6BCF\u4E2A\u6A21\u5757\u7684\u7EFF\u8272\u63D2\u53E3\uFF0C\u4EE5\u8FD0\u884C\u68C0\u67E5\uFF1B<br>\u627E\u5230\u4F69\u4F69\u7684UF\u6A21\u5757\u3002"
+    m_Localized: "me:\u68C0\u67E5\u4F69\u4F69\u7684UF\u6A21\u5757<br>\u5C06\u68C0\u67E5\u7EBF\u63D2\u5165\u6A21\u5757\u7684\u7EFF\u8272\u63D2\u53E3\uFF0C\u4EE5\u8FD0\u884C\u68C0\u67E5\uFF1B<br>\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708230
@@ -1125,7 +1125,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708454
-    m_Localized: "peipei: \u5618\uFF0C\u522B\u8BF4\u8BDD\u3002"
+    m_Localized: "ppm: \u5618\uFF0C\u522B\u8BF4\u8BDD\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708455
@@ -1133,7 +1133,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708456
-    m_Localized: "peipei: \u90FD\u8BA9\u4F60\u522B\u8BF4\u8BDD\u3002"
+    m_Localized: "ppm: \u90FD\u8BA9\u4F60\u522B\u8BF4\u8BDD\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708457
@@ -1145,7 +1145,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708459
-    m_Localized: "peipei: \u8981\u662F\u5DE5\u4F5C\u4E5F\u80FD\u753B\u753B\u2026\u8981\u662F\u80FD\u6C38\u8FDC\u753B\u753B\u5C31\u597D\u4E86\u3002"
+    m_Localized: "ppm: \u8981\u662F\u5DE5\u4F5C\u4E5F\u80FD\u753B\u753B\u2026\u8981\u662F\u80FD\u6C38\u8FDC\u753B\u753B\u5C31\u597D\u4E86\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708460
@@ -1153,11 +1153,11 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708461
-    m_Localized: "peipei: \u4E0D\u4F1A\u7684\u3002\u81F3\u5C11\u753B\u753B\u8FD9\u4EF6\u4E8B\u60C5\u8BA9\u6211\u611F\u89C9\u5230\u5F88\u7EAF\u7CB9\u7684\u5FEB\u4E50\u2026\u2026"
+    m_Localized: "ppm: \u4E0D\u4F1A\u7684\u3002\u81F3\u5C11\u753B\u753B\u8FD9\u4EF6\u4E8B\u60C5\u8BA9\u6211\u611F\u89C9\u5230\u5F88\u7EAF\u7CB9\u7684\u5FEB\u4E50\u2026\u2026"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708462
-    m_Localized: "peipei: \u90A3\u79CD\u671D\u4E5D\u665A\u4E94\uFF0C\u4E00\u773C\u770B\u5230\u5934\u7684\u751F\u6D3B\uFF0C\u6211\u60F3\u6211\u53CD\u800C\u4F1A\u53D7\u4E0D\u4E86\u7684\u3002"
+    m_Localized: "ppm: \u90A3\u79CD\u671D\u4E5D\u665A\u4E94\uFF0C\u4E00\u773C\u770B\u5230\u5934\u7684\u751F\u6D3B\uFF0C\u6211\u60F3\u6211\u53CD\u800C\u4F1A\u53D7\u4E0D\u4E86\u7684\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708463
@@ -1169,11 +1169,11 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708465
-    m_Localized: "peipei: \u6211\u80AF\u5B9A\u662F\u5BF9\u7684\u3002"
+    m_Localized: "ppm: \u6211\u80AF\u5B9A\u662F\u5BF9\u7684\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708466
-    m_Localized: "peipei: \u5982\u679C\u516C\u53F8\u8FD9\u4E48\u8BA8\u538C\u7684\u8BDD\uFF0C\u6211\u5C31\u4E0D\u5728\u90A3\u91CC\u5E72\u5C31\u597D\u4E86\u554A\uFF01"
+    m_Localized: "ppm: \u5982\u679C\u516C\u53F8\u8FD9\u4E48\u8BA8\u538C\u7684\u8BDD\uFF0C\u6211\u5C31\u4E0D\u5728\u90A3\u91CC\u5E72\u5C31\u597D\u4E86\u554A\uFF01"
     m_Metadata:
       m_Items: []
   - m_Id: 55080022708467

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/Stage6_螺旋.yarn

@@ -15,8 +15,8 @@ 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>>

Assets/Scripts/Clue/ClueSlotBase.cs

@@ -122,7 +122,7 @@ public class ClueSlotBase : MonoBehaviour, IDropHandler
     private void StartFilmAnimation()
     {
         // 使用 DOTween 实现胶片的循环移动
-        filmImage.rectTransform.DOLocalMoveX(-1256f, 1f)
+        filmImage.rectTransform.DOLocalMoveX(-494f, 1f)
             .SetLoops(-1, LoopType.Restart)
             .SetEase(Ease.Linear);
         RoateImage.rectTransform.DORotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360)