Merge branch '佩佩功能流程分支' into develop

2024-09-01 21:06:36 +08:00
parent 53c066dc22 feb715d868
commit bc78f9d0a5
1 changed files with 6 additions and 3 deletions
@@ -55,6 +55,10 @@ public class Crowbar : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragH
   [YarnCommand("CrowBarIn")]
    public void MoveIn()
    {
+        DOTween.Kill(transform);
+        DOTween.Kill(box);
+        transform.position=crowbarOutPosition;
+        box.position=crowbarOutPosition;
        transform.DOMove(crowbarInPosition.position, 1f);
        box.DOMove(crowbarInPosition.position, 1f);
        Initialize();
@@ -247,9 +251,8 @@ public CrowBarSocket FindNearestSocket()
        //isInserted = false;
        progress = 0f;
        crowbarVisual.rotation = Quaternion.Euler(0f, 0f, 180f);
-        crowbarCanvas.sortingLayerName = "Tool";
-        crowbarCanvas.sortingOrder = 6;
-        MoveOut();
+
+        //MoveOut();
    }
    private void ResetCrowbar()
    {