From ee4d9fa9faf2642bcbde4578d8c6ae1b73d2b35c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 五月 2019 14:08:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/TaskFeedbackModel.cs |   80 ++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 5baf950..33ba378 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -152,18 +152,7 @@
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                var guide = config.succGuide;
-                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
-                                {
-                                    ExecuteGuide(guide);
-                                }
-                                else
-                                {
-                                    if (config.jump != 0)
-                                    {
-                                        WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
-                                    }
-                                }
+                                ExecuteSuccFeedback(taskId);
                             }
                             else
                             {
@@ -187,18 +176,7 @@
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                var guide = config.succGuide;
-                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
-                                {
-                                    ExecuteGuide(guide);
-                                }
-                                else
-                                {
-                                    if (config.jump != 0)
-                                    {
-                                        WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
-                                    }
-                                }
+                                ExecuteSuccFeedback(taskId);
                             }
                             else
                             {
@@ -231,18 +209,7 @@
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                var guide = config.succGuide;
-                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
-                                {
-                                    ExecuteGuide(guide);
-                                }
-                                else
-                                {
-                                    if (config.jump != 0)
-                                    {
-                                        WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
-                                    }
-                                }
+                                ExecuteSuccFeedback(taskId);
                             }
                             else
                             {
@@ -254,7 +221,8 @@
                                 }
                                 if (feedback.failFuns != null)
                                 {
-                                    var index = Mathf.Min(condition, feedback.failFuns.Count - 1);
+                                    var taskIndex = feedback.IndexOfSideTasks(condition);
+                                    var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1);
                                     taskFeedbackFuncs.Clear();
                                     taskFeedbackFuncs.AddRange(feedback.failFuns[index]);
                                     WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
@@ -267,30 +235,21 @@
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                var guide = config.succGuide;
-                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
-                                {
-                                    ExecuteGuide(guide);
-                                }
-                                else
-                                {
-                                    if (config.jump != 0)
-                                    {
-                                        WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
-                                    }
-                                }
+                                ExecuteSuccFeedback(taskId);
                             }
                             else
                             {
                                 if (config.remind != null && config.remind.Length > 0)
                                 {
-                                    var taskIndex = feedback.IndexOfSideTasks(condition);
-                                    var index = Mathf.Min(taskIndex, config.remind.Length - 1);
+                                    var index = Mathf.Min(condition, config.remind.Length - 1);
                                     SysNotifyMgr.Instance.ShowTip(config.remind[index]);
                                 }
                                 if (feedback.failFuns != null)
                                 {
-                                    var index = Mathf.Min(condition, feedback.failFuns.Count - 1);
+                                    var sideTaskId = 0;
+                                    IsSatisfySideTask(feedback.sideTasks, out sideTaskId);
+                                    var taskIndex = feedback.IndexOfSideTasks(sideTaskId);
+                                    var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1);
                                     taskFeedbackFuncs.Clear();
                                     taskFeedbackFuncs.AddRange(feedback.failFuns[index]);
                                     WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
@@ -302,6 +261,23 @@
             }
         }
 
+        public void ExecuteSuccFeedback(int id)
+        {
+            var config = TaskFeedbackConfig.Get(id);
+            var guide = config.succGuide;
+            if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
+            {
+                ExecuteGuide(guide);
+            }
+            else
+            {
+                if (config.jump != 0)
+                {
+                    WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+                }
+            }
+        }
+
         public void ExecuteGuide(int id)
         {
             if (id == 0)

--
Gitblit v1.8.0