From 4df4662a3647705ed51a882b853bc8e2f1b3dd26 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 五月 2019 22:04:35 +0800
Subject: [PATCH] 3335 任务反馈修改
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index d356ad3..5baf950 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)
@@ -165,6 +167,50 @@
}
else
{
+ if (config.remind != null && config.remind.Length > 0)
+ {
+ 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);
+ taskFeedbackFuncs.Clear();
+ taskFeedbackFuncs.AddRange(feedback.failFuns[index]);
+ WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
+ }
+ }
+ }
+ break;
+ case TaskFeedbackType.AlchemyItem:
+ {
+ 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);
+ }
+ }
+ }
+ else
+ {
+ Int2 position;
+ if (alchemyModel.IsStoveAlcheming((AlchemyType)config.condition, out position))
+ {
+ if (config.jump != 0)
+ {
+ WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+ return;
+ }
+ }
if (config.remind != null && config.remind.Length > 0)
{
var index = Mathf.Min(condition, config.remind.Length - 1);
@@ -327,6 +373,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 +473,7 @@
ItemCount = 8,
SkyTowerFightPoint = 9,
DemonTreasure = 10,
+ AlchemyItem = 11,
}
}
--
Gitblit v1.8.0