From 5e6a8851aebafa74c3ed687b3cda44fd3282d25f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 五月 2019 19:39:48 +0800
Subject: [PATCH] Merge branch 'master' into ClientPreciousDungeon
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 90 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 0aa7d22..d356ad3 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -12,6 +12,7 @@
ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
+ TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
public override void Init()
{
@@ -100,6 +101,20 @@
break;
}
+ if (!string.IsNullOrEmpty(config.failFuncs))
+ {
+ var funcArray = LitJson.JsonMapper.ToObject<int[][]>(config.failFuncs);
+ if (funcArray != null)
+ {
+ List<int[]> failFuncs = new List<int[]>(funcArray.Length);
+ for (int i = 0; i < funcArray.Length; i++)
+ {
+ failFuncs.Add(funcArray[i]);
+ }
+ feedback.failFuns = failFuncs;
+ }
+ }
+
m_TaskFeedbacks.Add(config.taskId, feedback);
}
}
@@ -124,24 +139,28 @@
switch (feedback.type)
{
case TaskFeedbackType.FightPower:
+ case TaskFeedbackType.Copper:
case TaskFeedbackType.ReikiPoint:
case TaskFeedbackType.Guide:
case TaskFeedbackType.Equip:
case TaskFeedbackType.ItemCount:
case TaskFeedbackType.SkyTowerFightPoint:
+ case TaskFeedbackType.DemonTreasure:
{
int condition = 0;
if (IsSatisfyCondition(feedback, out condition))
{
- var guide = config.succGuide != null
- && config.succGuide.Length > 0 ? config.succGuide[0] : 0;
- if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
+ var guide = config.succGuide;
+ 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
@@ -151,10 +170,11 @@
var index = Mathf.Min(condition, config.remind.Length - 1);
SysNotifyMgr.Instance.ShowTip(config.remind[index]);
}
- if (config.failFuncs != null && config.failFuncs.Length > 0)
+ if (feedback.failFuns != null)
{
+ var index = Mathf.Min(condition, feedback.failFuns.Count - 1);
taskFeedbackFuncs.Clear();
- taskFeedbackFuncs.AddRange(config.failFuncs);
+ taskFeedbackFuncs.AddRange(feedback.failFuns[index]);
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
}
@@ -165,15 +185,17 @@
int condition = 0;
if (IsSatisfyCondition(feedback, out condition))
{
- var guide = config.succGuide != null
- && config.succGuide.Length > 0 ? config.succGuide[0] : 0;
- if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
+ var guide = config.succGuide;
+ 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
@@ -184,10 +206,11 @@
var index = Mathf.Min(taskIndex, config.remind.Length - 1);
SysNotifyMgr.Instance.ShowTip(config.remind[index]);
}
- if (config.failFuncs != null && config.failFuncs.Length > 0)
+ if (feedback.failFuns != null)
{
+ var index = Mathf.Min(condition, feedback.failFuns.Count - 1);
taskFeedbackFuncs.Clear();
- taskFeedbackFuncs.AddRange(config.failFuncs);
+ taskFeedbackFuncs.AddRange(feedback.failFuns[index]);
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
}
@@ -198,15 +221,17 @@
int condition = 0;
if (IsSatisfyCondition(feedback, out condition))
{
- var guide = config.succGuide != null
- && config.succGuide.Length > 0 ? config.succGuide[0] : 0;
- if (config.jump != 0 && (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)))
+ var guide = config.succGuide;
+ 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
@@ -217,10 +242,11 @@
var index = Mathf.Min(taskIndex, config.remind.Length - 1);
SysNotifyMgr.Instance.ShowTip(config.remind[index]);
}
- if (config.failFuncs != null && config.failFuncs.Length > 0)
+ if (feedback.failFuns != null)
{
+ var index = Mathf.Min(condition, feedback.failFuns.Count - 1);
taskFeedbackFuncs.Clear();
- taskFeedbackFuncs.AddRange(config.failFuncs);
+ taskFeedbackFuncs.AddRange(feedback.failFuns[index]);
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
}
@@ -265,6 +291,10 @@
return IsSatisfySideTask(feedback.sideTasks, out condition);
case TaskFeedbackType.ReikiPoint:
{
+ if (reikiRootModel.GetReikiRootTotalPointWithFree() < config.condition)
+ {
+ return false;
+ }
if (feedback.reikiRoots != null)
{
var job = PlayerDatas.Instance.baseData.Job;
@@ -279,7 +309,7 @@
}
}
}
- return reikiRootModel.GetReikiRootTotalPoint() >= config.condition;
+ return true;
case TaskFeedbackType.Equip:
{
var items = packModel.GetItems(PackType.Item, new SinglePack.FilterParams()
@@ -320,6 +350,20 @@
}
}
break;
+ case TaskFeedbackType.DemonTreasure:
+ {
+ TreasureDungeon treasureDungeon;
+ if (treasureModel.TryGetTreasureDungeon(config.condition, out treasureDungeon))
+ {
+ var dungeonInfo = treasureDungeon.Get(treasureDungeon.currentLevel + 1);
+ if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))
+ {
+ return UIHelper.GetPropertyValue(PropertyType.DEF) >= dungeonInfo.defense;
+ }
+ return true;
+ }
+ }
+ break;
}
return false;
}
@@ -351,6 +395,7 @@
public int[] equipCondition;
public List<Item> items;
public Dictionary<int, List<int[]>> reikiRoots;
+ public List<int[]> failFuns;
public int IndexOfSideTasks(int taskId)
{
@@ -380,6 +425,7 @@
FightPowerSideTask = 7,
ItemCount = 8,
SkyTowerFightPoint = 9,
+ DemonTreasure = 10,
}
}
--
Gitblit v1.8.0