From 3639456c42c14a9b123490188c57000ba77ea6e3 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 20 五月 2019 10:01:26 +0800
Subject: [PATCH] Merge branch 'master' into ClientPreciousDungeon

---
 System/MainInterfacePanel/TaskFeedbackModel.cs |   94 +++++++++++++++++++++++++++++-----------------
 1 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index d356ad3..33ba378 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -13,6 +13,7 @@
         PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
         TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
         TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
+        AlchemyModel alchemyModel { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
 
         public override void Init()
         {
@@ -63,6 +64,7 @@
                         }
                         break;
                     case TaskFeedbackType.ItemCount:
+                    case TaskFeedbackType.AlchemyItem:
                         {
                             var array = LitJson.JsonMapper.ToObject<int[][]>(config.items);
                             if (array != null)
@@ -150,21 +152,43 @@
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                var guide = config.succGuide;
-                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
+                                ExecuteSuccFeedback(taskId);
+                            }
+                            else
+                            {
+                                if (config.remind != null && config.remind.Length > 0)
                                 {
-                                    ExecuteGuide(guide);
+                                    var index = Mathf.Min(condition, config.remind.Length - 1);
+                                    SysNotifyMgr.Instance.ShowTip(config.remind[index]);
                                 }
-                                else
+                                if (feedback.failFuns != null)
+                                {
+                                    var index = Mathf.Min(condition, feedback.failFuns.Count - 1);
+                                    taskFeedbackFuncs.Clear();
+                                    taskFeedbackFuncs.AddRange(feedback.failFuns[index]);
+                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
+                                }
+                            }
+                        }
+                        break;
+                    case TaskFeedbackType.AlchemyItem:
+                        {
+                            int condition = 0;
+                            if (IsSatisfyCondition(feedback, out condition))
+                            {
+                                ExecuteSuccFeedback(taskId);
+                            }
+                            else
+                            {
+                                Int2 position;
+                                if (alchemyModel.IsStoveAlcheming((AlchemyType)config.condition, out position))
                                 {
                                     if (config.jump != 0)
                                     {
                                         WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+                                        return;
                                     }
                                 }
-                            }
-                            else
-                            {
                                 if (config.remind != null && config.remind.Length > 0)
                                 {
                                     var index = Mathf.Min(condition, config.remind.Length - 1);
@@ -185,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
                             {
@@ -208,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>();
@@ -221,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>();
@@ -252,6 +257,23 @@
                             }
                         }
                         break;
+                }
+            }
+        }
+
+        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);
                 }
             }
         }
@@ -327,6 +349,7 @@
                     return true;
                 case TaskFeedbackType.FightPowerSideTask:
                     return PlayerDatas.Instance.baseData.FightPoint >= config.condition;
+                case TaskFeedbackType.AlchemyItem:
                 case TaskFeedbackType.ItemCount:
                     {
                         if (feedback.items != null)
@@ -426,6 +449,7 @@
         ItemCount = 8,
         SkyTowerFightPoint = 9,
         DemonTreasure = 10,
+        AlchemyItem = 11,
     }
 }
 

--
Gitblit v1.8.0