From e8ef480890fe4a71a12bd37964f9f2d5b5439011 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 17 五月 2019 14:21:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 0aa7d22..a5eec7b 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -135,13 +135,16 @@
{
var guide = config.succGuide != null
&& config.succGuide.Length > 0 ? config.succGuide[0] : 0;
- if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
+ if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
{
- WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+ ExecuteGuide(guide);
}
else
{
- ExecuteGuide(guide);
+ if (config.jump != 0)
+ {
+ WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+ }
}
}
else
@@ -167,13 +170,16 @@
{
var guide = config.succGuide != null
&& config.succGuide.Length > 0 ? config.succGuide[0] : 0;
- if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
+ if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
{
- WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+ ExecuteGuide(guide);
}
else
{
- ExecuteGuide(guide);
+ if (config.jump != 0)
+ {
+ WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+ }
}
}
else
@@ -200,13 +206,16 @@
{
var guide = config.succGuide != null
&& config.succGuide.Length > 0 ? config.succGuide[0] : 0;
- if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
+ if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
{
- WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+ ExecuteGuide(guide);
}
else
{
- ExecuteGuide(guide);
+ if (config.jump != 0)
+ {
+ WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+ }
}
}
else
--
Gitblit v1.8.0