diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index ecb2b4a05..1485a0003 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -25343,7 +25343,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: diff --git a/Assets/Scripts/LevelEditor/Commands/Block.cs b/Assets/Scripts/LevelEditor/Commands/Block.cs index 4d7edbb5c..b98aa0edc 100644 --- a/Assets/Scripts/LevelEditor/Commands/Block.cs +++ b/Assets/Scripts/LevelEditor/Commands/Block.cs @@ -64,7 +64,7 @@ namespace HeavenStudio.Editor.Commands { Pos p = new Pos(); p.eventObj = eventObjs[i]; - p.lastPos_ = eventObjs[i].lastPos_; + p.lastPos_ = eventObjs[i].moveStartPos; p.previousPos = eventObjs[i].transform.localPosition; this.pos.Add(p); } diff --git a/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs b/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs index 311fd4da4..ddae03e15 100644 --- a/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs +++ b/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs @@ -14,7 +14,7 @@ namespace HeavenStudio.Editor.Track private float startPosY; private Vector3 lastPos; - public Vector2 lastPos_; + public Vector2 moveStartPos; private RectTransform rectTransform; [Header("Components")] @@ -50,7 +50,7 @@ namespace HeavenStudio.Editor.Track private void Start() { - lastPos_ = transform.localPosition; + moveStartPos = transform.localPosition; rectTransform = GetComponent(); @@ -163,13 +163,16 @@ namespace HeavenStudio.Editor.Track this.wasDuplicated = false; this.moving = false; + transform.localPosition = moveStartPos; + OnComplete(false); + var te = Timeline.instance.CopyEventObject(this); Selections.instance.DragSelect(te); te.wasDuplicated = true; te.transform.localPosition = transform.localPosition; - te.lastPos_ = transform.localPosition; + te.moveStartPos = transform.localPosition; for (int i = 0; i < Timeline.instance.eventObjs.Count; i++) { @@ -180,9 +183,6 @@ namespace HeavenStudio.Editor.Track te.moving = true; } - - lastPos_ = transform.localPosition; - this.transform.position = new Vector3(mousePos.x - startPosX, mousePos.y - startPosY - 0.40f, 0); this.transform.localPosition = new Vector3(Mathf.Max(Mathp.Round2Nearest(this.transform.localPosition.x, Timeline.SnapInterval()), 0), Timeline.instance.SnapToLayer(this.transform.localPosition.y)); @@ -281,7 +281,7 @@ namespace HeavenStudio.Editor.Track { if (selected && Timeline.instance.timelineState.selected) { - lastPos_ = transform.localPosition; + moveStartPos = transform.localPosition; for (int i = 0; i < Timeline.instance.eventObjs.Count; i++) {