| System/Compose/New/ComposeWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WindowJump/WindowJumpMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/Compose/New/ComposeWin.cs
@@ -48,7 +48,7 @@ #region Built-in protected override void BindController() { WindowCenter.Instance.jumpWindowCloseEvent += CloseJumpWindow; } protected override void AddListeners() @@ -67,9 +67,10 @@ protected override void OnPreOpen() { ComposeModel.ResetModel(); if(WindowJumpMgr.Instance.IsJumpState) if (WindowJumpMgr.Instance.IsJumpState && ComposeModel.secondType == 0) { if(ComposeModel.CurComposeModel != null) if (ComposeModel.CurComposeModel != null) { ComposeModel.SetJumpToModel((ComposeFuncType)ComposeModel.CurComposeModel.firstType, ComposeModel.CurComposeModel.secondType, ComposeModel.CurComposeModel.thirdType); @@ -161,19 +162,8 @@ { if (!WindowJumpMgr.Instance.IsJumpState) { ComposeModel.SetCurComposeModel(null); WindowCenter.Instance.Open<MainInterfaceWin>(); } } private void CloseJumpWindow(Window win) { if(win as ComposeWin) { if (WindowJumpMgr.Instance.jumpPhase <= 1) { ComposeModel.SetCurComposeModel(null); } } } 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) {