From 5428b5d8f0e0e06aa4bd31f1de88f868e252765a Mon Sep 17 00:00:00 2001
From: yangbear <yangbear@vfs.local>
Date: Sat, 11 Jul 2026 05:52:25 +0800
Subject: [PATCH] Swap order: Shose -> Ping(Phase1) -> ChanraoTuibu ->
 Ping(Phase2). Final voice is on ChanraoTuibu complete

---
 Assets/Scripts/Core/UndoManager.cs  |  8 +-------
 Assets/Scripts/UI/PageController.cs | 16 ++++++++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Assets/Scripts/Core/UndoManager.cs b/Assets/Scripts/Core/UndoManager.cs
index 81fc4e6..1d2bd62 100644
--- a/Assets/Scripts/Core/UndoManager.cs
+++ b/Assets/Scripts/Core/UndoManager.cs
@@ -85,17 +85,11 @@ public static class ActionHistory
             var h = item.Handler as ShoseClickHandler;
             if (h != null) h.ResetState();
         }
-        else if (item.Type == ActionType.ChanraoTuibu)
-        {
-            var h = item.Handler as ChanraoTuibuHandler;
-            if (h != null) h.ResetState();
-        }
         else if (item.Type == ActionType.Woman)
         {
             var sm = Object.FindObjectOfType<StepManager>();
             if (sm != null) sm.DecrementWomanStep();
             
-            // 隐藏下一个小球并恢复当前小球
             var h = item.Handler as TouchPositionHandler;
             if (h != null)
             {
@@ -108,4 +102,4 @@ public static class ActionHistory
         
         return true;
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/PageController.cs b/Assets/Scripts/UI/PageController.cs
index fa65f79..5ca2b51 100644
--- a/Assets/Scripts/UI/PageController.cs
+++ b/Assets/Scripts/UI/PageController.cs
@@ -444,16 +444,16 @@ public class PageController : MonoBehaviour
             var h = shose.GetComponent<ShoseClickHandler>();
             if (h == null) h = shose.AddComponent<ShoseClickHandler>();
             h.targetPoint = GameObject.Find("ShosePoint")?.transform;
-            if (h.nextObject == null)
+            
+            // 强制将鞋子点击后的下一步指向 ping.004
+            var ping004 = GameObject.Find("ping.004");
+            if (ping004 == null)
             {
-                var ping004 = GameObject.Find("ping.004");
-                if (ping004 == null)
-                {
-                    var mi = GameObject.Find("manInjury");
-                    if (mi != null) ping004 = mi.transform.Find("ping.004")?.gameObject;
-                }
-                h.nextObject = ping004;
+                var mi = GameObject.Find("manInjury");
+                if (mi != null) ping004 = mi.transform.Find("ping.004")?.gameObject;
             }
+            h.nextObject = ping004;
+            
             // 确保一开始鞋子模型可见，但不闪烁且不可点击
             h.enabled = false;
             shose.SetActive(true);