Merge branch 'feature/春晖911' into 'develop'

Feature/春晖911

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

Assets/Prototype/佩佩/佩佩视觉模块.unity

@@ -24343,6 +24343,14 @@ PrefabInstance:
       propertyPath: rotationCorrection.z
       value: -180
       objectReference: {fileID: 0}
+    - target: {fileID: 4414950781642350908, guid: 1afc7e4d2be0126438b5fe65aaccc901, type: 3}
+      propertyPath: transformCorrection.x
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4414950781642350908, guid: 1afc7e4d2be0126438b5fe65aaccc901, type: 3}
+      propertyPath: transformCorrection.y
+      value: -0.15
+      objectReference: {fileID: 0}
     - target: {fileID: 4991240399770923164, guid: 1afc7e4d2be0126438b5fe65aaccc901, type: 3}
       propertyPath: m_LocalScale.x
       value: 0.093240894

Assets/Scripts/Dialog System/DialogController.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 using Yarn.Unity;
+using DG.Tweening;
 
 namespace AibisDream
 {
@@ -251,6 +252,33 @@ namespace AibisDream
         {
             return MainUIController.Instance.HideObj();
         }
+        [YarnCommand("move_to_fix")]
+        public static IEnumerator Move_to_fix()
+        {
+            bool isCompleted = false;
+            Sequence s = DOTween.Sequence();
+            s.Append(Camera.main.transform.DOMove(new UnityEngine.Vector3(6.8f, 0, -10), 1.5f).SetEase(Ease.OutCubic))
+            .OnComplete(() =>
+            {
+                // 动画完成后的反馈操作
+                Debug.Log("Move_to_fix sequence completed.");
+                isCompleted = true;
+            });
+
+            // 等待动画完成
+            yield return new WaitUntil(() => isCompleted);
+
+            // 动画完成后的其他操作
+            Debug.Log("Continuing after Move_to_fix sequence.");
+        }
+        [YarnCommand("move_out_fix")]
+        public static void Move_out_fix()
+        {
+            Camera.main.transform.position=new UnityEngine.Vector3(6.8f, 0, -10);
+            Sequence s = DOTween.Sequence();
+            //s.AppendInterval(0.5f);
+            s.Append(Camera.main.transform.DOMove(new UnityEngine.Vector3(0, 0, -10), 1.5f).SetEase(Ease.OutCubic));
+        }
         
         #endregion
     }

Assets/Scripts/FixSystem/Line/CustomCursor.cs

@@ -7,6 +7,8 @@ public class CustomCursor : MonoBehaviour
     public Texture2D cursorTexture;
     public Vector3 rotationCorrection;  // 旋转修正，你可以在 Inspector 中设置
 
+    public Vector2 transformCorrection;
+
     private void Start()
     {
         // 设置旋转修正
@@ -17,7 +19,7 @@ public class CustomCursor : MonoBehaviour
     {
         // 设置自定义光标的位置为鼠标的位置
         Vector2 cursorPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
-        transform.position = cursorPos;
+        transform.position = cursorPos+transformCorrection;
     }
 
     private void OnEnable()