Merge branch 'main' into iOS_release

Forest/Assets/Scripts/Gameplay/LevelState.cs

@@ -153,6 +153,7 @@ namespace Gameplay.Level
         {
             try
             {
+                PutThumbtack();
                 if (_isMoving)
                 {
                     _curThumbtack.Obj.layer = 13;
@@ -171,8 +172,6 @@ namespace Gameplay.Level
                         RecoverPlankStatus();
                     }
                 }
-
-                PutThumbtack();
             }
             catch (Exception e)
             {
@@ -180,13 +179,14 @@ namespace Gameplay.Level
             }
         }
 
+        /// <summary>
+        /// 暂停时提前放置钉子
+        /// </summary>
         private void PutThumbtack()
         {
             if ((LevelManager.Instance.IsPause || LevelManager.Instance.IsOver) && _curThumbtack != null)
             {
-                _curThumbtack.Obj.GetComponent<SpriteRenderer>().color = _defaultColor;
+                _curThumbtack.Obj.transform.position = _target.position;
-                LevelManager.Instance.CurUndoState.PreModifiedKong.LevelThumbtack = _curThumbtack;
-                _curThumbtack = null;
             }
         }