From 3a4eb38542bf8cc2cdf7f835a559ade8a8457ea3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 29 九月 2018 03:02:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/WindowJump/WindowJumpMgr.cs |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 65d1376..3322f73 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -17,7 +17,7 @@
     private WindowSearchConfig _tagWinSearchModel;
     private FuncOpenLVConfig _tagOpenLvModel;
     private Dictionary<int, List<string>> openWindows = new Dictionary<int, List<string>>();
-    private Dictionary<int, string> jumpWinNameDict = new Dictionary<int, string>();
+    public Dictionary<int, string> jumpWinNameDict = new Dictionary<int, string>();
     PlayerPetDatas m_petModel;
     PlayerPetDatas petmodel
     {
@@ -882,7 +882,23 @@
     private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window
     {
         string curOpenWin = typeof(T).Name;
-        jumpWinNameDict.Add(jumpPhase, curOpenWin);
+        if(jumpWinNameDict.ContainsKey(jumpPhase - 1))
+        {
+            if(jumpWinNameDict[jumpPhase - 1] != curOpenWin)
+            {
+                jumpWinNameDict.Add(jumpPhase, curOpenWin);
+            }
+            else
+            {
+                openWindows[jumpPhase].Clear();
+                jumpPhase -= 1;
+            }
+        }
+        else
+        {
+            jumpWinNameDict.Add(jumpPhase, curOpenWin);
+        }
+       
         jumpType = _tagWinSearchModel.Type;
         switch (_tagWinSearchModel.Type)
         {

--
Gitblit v1.8.0