From 85d6bea98caca7d78674ba9bd0aeab297f3fbb79 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 25 五月 2019 14:05:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 48 ++++++++++--------------------------------------
1 files changed, 10 insertions(+), 38 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 3c09b4b..fd2fe84 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -66,7 +66,6 @@
}
break;
case TaskFeedbackType.ItemCount:
- case TaskFeedbackType.AlchemyItem:
{
var array = LitJson.JsonMapper.ToObject<int[][]>(config.items);
if (array != null)
@@ -150,33 +149,6 @@
case TaskFeedbackType.ItemCount:
case TaskFeedbackType.SkyTowerFightPoint:
case TaskFeedbackType.DemonTreasure:
- {
- int condition = 0;
- if (IsSatisfyCondition(feedback, out condition))
- {
- ExecuteSuccFeedback(taskId);
- }
- 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);
- List<int> succFuncs;
- if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
- {
- taskFeedbackFuncs.Clear();
- taskFeedbackFuncs.AddRange(succFuncs);
- WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
- }
- }
- }
- }
- break;
case TaskFeedbackType.AlchemyItem:
{
int condition = 0;
@@ -186,15 +158,6 @@
}
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);
@@ -367,7 +330,6 @@
return true;
case TaskFeedbackType.FightPowerSideTask:
return PlayerDatas.Instance.baseData.FightPoint >= config.condition;
- case TaskFeedbackType.AlchemyItem:
case TaskFeedbackType.ItemCount:
{
if (feedback.items != null)
@@ -381,6 +343,12 @@
}
}
return true;
+ }
+ case TaskFeedbackType.AlchemyItem:
+ {
+ Item material;
+ return alchemyModel.GetStoveState(config.condition) != 0
+ || alchemyModel.IsAlchemyEnoughMaterial(config.condition, out material);
}
case TaskFeedbackType.SkyTowerFightPoint:
{
@@ -482,6 +450,10 @@
return false;
case 5:
return equipStrengthModel.ExistAnySatisfyStrengh();
+ case 6:
+ Item material;
+ return alchemyModel.GetStoveState(config.condition) != 0
+ || alchemyModel.IsAlchemyEnoughMaterial(config.condition, out material);
default:
return true;
}
--
Gitblit v1.8.0