From 14484f527b3e8d09371c77e59c9dc9dc2964584c Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 14 八月 2018 20:31:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/HappyXB/HappyXBWin.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/System/HappyXB/HappyXBWin.cs b/System/HappyXB/HappyXBWin.cs
index 23fb717..7fea8ae 100644
--- a/System/HappyXB/HappyXBWin.cs
+++ b/System/HappyXB/HappyXBWin.cs
@@ -38,21 +38,24 @@
protected override void OnActived()
{
base.OnActived();
- if(xBModel.bestXBRed.state == RedPointState.Simple)
+ if(!WindowJumpMgr.Instance.IsJumpState && functionOrder == 0)
{
- functionOrder = bestXBTitle.order;
- }
- else if(xBModel.runeXBRed.state == RedPointState.Simple)
- {
- functionOrder = runeXBTitle.order;
- }
- else if(xBModel.xbStoreRed.state == RedPointState.Simple)
- {
- functionOrder = xbStoreTitle.order;
- }
- else if(xBModel.xbWarehouseRed.state == RedPointState.Simple)
- {
- functionOrder = xbWarehouseTitle.order;
+ if (xBModel.bestXBRed.state == RedPointState.Simple)
+ {
+ functionOrder = bestXBTitle.order;
+ }
+ else if (xBModel.runeXBRed.state == RedPointState.Simple)
+ {
+ functionOrder = runeXBTitle.order;
+ }
+ else if (xBModel.xbStoreRed.state == RedPointState.Simple)
+ {
+ functionOrder = xbStoreTitle.order;
+ }
+ else if (xBModel.xbWarehouseRed.state == RedPointState.Simple)
+ {
+ functionOrder = xbWarehouseTitle.order;
+ }
}
titleGroup.TriggerByOrder(functionOrder);
}
--
Gitblit v1.8.0