From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Strengthening/EquipSuitTips.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/System/Strengthening/EquipSuitTips.cs b/System/Strengthening/EquipSuitTips.cs
index bd26ff6..b0dcbfa 100644
--- a/System/Strengthening/EquipSuitTips.cs
+++ b/System/Strengthening/EquipSuitTips.cs
@@ -138,19 +138,22 @@
}
else
{
- E_SuitType = SuitType.LowSuit;
- bool isSwitch = true;
- foreach(var red in SuitModel.suitCellRedPointDict.Values)
+ if(!WindowJumpMgr.Instance.IsJumpState)
{
- if(red.state == RedPointState.Simple)
+ E_SuitType = SuitType.LowSuit;
+ bool isSwitch = true;
+ foreach (var red in SuitModel.suitCellRedPointDict.Values)
{
- isSwitch = false;
- break;
+ if (red.state == RedPointState.Simple)
+ {
+ isSwitch = false;
+ break;
+ }
}
- }
- if (SuitModel.typeBtnRedPoint.state == RedPointState.Simple && isSwitch)
- {
- E_SuitType = SuitType.HighSuit;
+ if (SuitModel.typeBtnRedPoint.state == RedPointState.Simple && isSwitch)
+ {
+ E_SuitType = SuitType.HighSuit;
+ }
}
}
equipPartlist = SuitModel.GetEquipOrderlist(E_SuitType);
--
Gitblit v1.8.0