From 1b5827f6250cdde26a88a6a096505a8dee606b35 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 五月 2019 11:21:38 +0800
Subject: [PATCH] Merge branch 'master' into ClientPreciousDungeon

---
 System/MainInterfacePanel/TaskFeedbackModel.cs |  129 +++++++++++++++++++++++++++++++++---------
 1 files changed, 100 insertions(+), 29 deletions(-)

diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 7d63a9b..0aa7d22 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -7,6 +7,8 @@
     {
         Dictionary<int, TaskFeedback> m_TaskFeedbacks = new Dictionary<int, TaskFeedback>();
 
+        public readonly List<int> taskFeedbackFuncs = new List<int>();
+
         ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
         PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
         TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
@@ -77,6 +79,25 @@
                             }
                         }
                         break;
+                    case TaskFeedbackType.ReikiPoint:
+                        {
+                            if (!string.IsNullOrEmpty(config.reikiRoot))
+                            {
+                                var json = LitJson.JsonMapper.ToObject(config.reikiRoot);
+                                feedback.reikiRoots = new Dictionary<int, List<int[]>>();
+                                foreach (var jobKey in json.Keys)
+                                {
+                                    var job = int.Parse(jobKey);
+                                    var intArray = LitJson.JsonMapper.ToObject<int[][]>(json[jobKey].ToJson());
+                                    feedback.reikiRoots.Add(job, new List<int[]>());
+                                    for (int i = 0; i < intArray.Length; i++)
+                                    {
+                                        feedback.reikiRoots[job].Add(intArray[i]);
+                                    }
+                                }
+                            }
+                        }
+                        break;
                 }
 
                 m_TaskFeedbacks.Add(config.taskId, feedback);
@@ -90,6 +111,11 @@
 
         public void ExecuteTaskFeedback(int taskId)
         {
+            if (NewBieCenter.Instance.inGuiding || FunctionalGuideCenter.Instance.ExistAnyUnderwayGuide())
+            {
+                return;
+            }
+
             TaskFeedback feedback;
             if (TryGetTaskFeedback(taskId, out feedback))
             {
@@ -102,26 +128,34 @@
                     case TaskFeedbackType.Guide:
                     case TaskFeedbackType.Equip:
                     case TaskFeedbackType.ItemCount:
+                    case TaskFeedbackType.SkyTowerFightPoint:
                         {
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                if (config.succGuide != null
-                                    && config.succGuide.Length > 0)
+                                var guide = config.succGuide != null
+                                    && config.succGuide.Length > 0 ? config.succGuide[0] : 0;
+                                if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
                                 {
-                                    ExecuteGuide(config.succGuide[0]);
+                                    WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+                                }
+                                else
+                                {
+                                    ExecuteGuide(guide);
                                 }
                             }
                             else
                             {
-                                if (!string.IsNullOrEmpty(config.remind))
+                                if (config.remind != null && config.remind.Length > 0)
                                 {
-                                    SysNotifyMgr.Instance.ShowTip(config.remind);
+                                    var index = Mathf.Min(condition, config.remind.Length - 1);
+                                    SysNotifyMgr.Instance.ShowTip(config.remind[index]);
                                 }
-                                if (config.failGuide != null
-                                    && config.failGuide.Length > 0)
+                                if (config.failFuncs != null && config.failFuncs.Length > 0)
                                 {
-                                    ExecuteGuide(config.failGuide[0]);
+                                    taskFeedbackFuncs.Clear();
+                                    taskFeedbackFuncs.AddRange(config.failFuncs);
+                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
                                 }
                             }
                         }
@@ -131,23 +165,30 @@
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                if (config.succGuide != null
-                                    && config.succGuide.Length > 0)
+                                var guide = config.succGuide != null
+                                    && config.succGuide.Length > 0 ? config.succGuide[0] : 0;
+                                if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
                                 {
-                                    ExecuteGuide(config.succGuide[0]);
+                                    WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+                                }
+                                else
+                                {
+                                    ExecuteGuide(guide);
                                 }
                             }
                             else
                             {
-                                if (!string.IsNullOrEmpty(config.remind))
+                                if (config.remind != null && config.remind.Length > 0)
                                 {
-                                    SysNotifyMgr.Instance.ShowTip(config.remind);
+                                    var taskIndex = feedback.IndexOfSideTasks(condition);
+                                    var index = Mathf.Min(taskIndex, config.remind.Length - 1);
+                                    SysNotifyMgr.Instance.ShowTip(config.remind[index]);
                                 }
-                                var index = feedback.IndexOfSideTasks(condition);
-                                if (config.failGuide != null
-                                    && index >= 0 && index < config.failGuide.Length)
+                                if (config.failFuncs != null && config.failFuncs.Length > 0)
                                 {
-                                    ExecuteGuide(config.failGuide[index]);
+                                    taskFeedbackFuncs.Clear();
+                                    taskFeedbackFuncs.AddRange(config.failFuncs);
+                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
                                 }
                             }
                         }
@@ -157,26 +198,30 @@
                             int condition = 0;
                             if (IsSatisfyCondition(feedback, out condition))
                             {
-                                if (config.succGuide != null
-                                    && config.succGuide.Length > 0)
+                                var guide = config.succGuide != null
+                                    && config.succGuide.Length > 0 ? config.succGuide[0] : 0;
+                                if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
                                 {
-                                    ExecuteGuide(config.succGuide[0]);
+                                    WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+                                }
+                                else
+                                {
+                                    ExecuteGuide(guide);
                                 }
                             }
                             else
                             {
-                                if (!string.IsNullOrEmpty(config.remind))
+                                if (config.remind != null && config.remind.Length > 0)
                                 {
-                                    SysNotifyMgr.Instance.ShowTip(config.remind);
+                                    var taskIndex = feedback.IndexOfSideTasks(condition);
+                                    var index = Mathf.Min(taskIndex, config.remind.Length - 1);
+                                    SysNotifyMgr.Instance.ShowTip(config.remind[index]);
                                 }
-                                if (!IsSatisfySideTask(feedback.sideTasks, out condition))
+                                if (config.failFuncs != null && config.failFuncs.Length > 0)
                                 {
-                                    var index = feedback.IndexOfSideTasks(condition);
-                                    if (config.failGuide != null
-                                        && index >= 0 && index < config.failGuide.Length)
-                                    {
-                                        ExecuteGuide(config.failGuide[index]);
-                                    }
+                                    taskFeedbackFuncs.Clear();
+                                    taskFeedbackFuncs.AddRange(config.failFuncs);
+                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
                                 }
                             }
                         }
@@ -219,6 +264,21 @@
                 case TaskFeedbackType.SideTask:
                     return IsSatisfySideTask(feedback.sideTasks, out condition);
                 case TaskFeedbackType.ReikiPoint:
+                    {
+                        if (feedback.reikiRoots != null)
+                        {
+                            var job = PlayerDatas.Instance.baseData.Job;
+                            var reikiRoots = feedback.reikiRoots[job];
+                            foreach (var reikiRoot in reikiRoots)
+                            {
+                                if (reikiRootModel.GetReikiRootPoint(reikiRoot[0]) < reikiRoot[1])
+                                {
+                                    condition = 1;
+                                    return false;
+                                }
+                            }
+                        }
+                    }
                     return reikiRootModel.GetReikiRootTotalPoint() >= config.condition;
                 case TaskFeedbackType.Equip:
                     {
@@ -251,6 +311,15 @@
                         }
                         return true;
                     }
+                case TaskFeedbackType.SkyTowerFightPoint:
+                    {
+                        var skyTowerConfig = SkyTowerConfig.Get(config.condition);
+                        if (skyTowerConfig != null)
+                        {
+                            return PlayerDatas.Instance.baseData.FightPoint >= skyTowerConfig.fightPower;
+                        }
+                    }
+                    break;
             }
             return false;
         }
@@ -281,6 +350,7 @@
         public List<int[]> sideTasks;
         public int[] equipCondition;
         public List<Item> items;
+        public Dictionary<int, List<int[]>> reikiRoots;
 
         public int IndexOfSideTasks(int taskId)
         {
@@ -309,6 +379,7 @@
         Guide = 6,
         FightPowerSideTask = 7,
         ItemCount = 8,
+        SkyTowerFightPoint = 9,
     }
 }
 

--
Gitblit v1.8.0