From 3c5c40549391030c66d35959aa14ae891a6d76d5 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 15 五月 2019 16:25:39 +0800
Subject: [PATCH] 3335 任务反馈配置修改
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 2e62b74..a6f69f2 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -38,14 +38,10 @@
switch (feedback.type)
{
- case TaskFeedbackType.FightPower:
- case TaskFeedbackType.ReikiPoint:
- case TaskFeedbackType.Copper:
- feedback.condition = int.Parse(config.condition);
- break;
case TaskFeedbackType.SideTask:
+ case TaskFeedbackType.FightPowerSideTask:
{
- var array = LitJson.JsonMapper.ToObject<int[][]>(config.condition);
+ var array = LitJson.JsonMapper.ToObject<int[][]>(config.sideTasks);
if (array != null)
{
List<int[]> sideTasks = new List<int[]>(array.Length);
@@ -59,29 +55,13 @@
break;
case TaskFeedbackType.Equip:
{
- var array = ConfigParse.GetMultipleStr<int>(config.condition);
+ var array = LitJson.JsonMapper.ToObject<int[]>(config.equips);
feedback.equipCondition = array;
- }
- break;
- case TaskFeedbackType.FightPowerSideTask:
- {
- var stringArray = config.condition.Split('|');
- feedback.condition = int.Parse(stringArray[0]);
- var array = LitJson.JsonMapper.ToObject<int[][]>(stringArray[1]);
- if (array != null)
- {
- List<int[]> sideTasks = new List<int[]>(array.Length);
- for (int i = 0; i < array.Length; i++)
- {
- sideTasks.Add(array[i]);
- }
- feedback.sideTasks = sideTasks;
- }
}
break;
case TaskFeedbackType.ItemCount:
{
- var array = LitJson.JsonMapper.ToObject<int[][]>(config.condition);
+ var array = LitJson.JsonMapper.ToObject<int[][]>(config.items);
if (array != null)
{
List<Item> items = new List<Item>();
@@ -220,15 +200,16 @@
public bool IsSatisfyCondition(TaskFeedback feedback, out int condition)
{
- condition = feedback.condition;
+ var config = TaskFeedbackConfig.Get(feedback.taskId);
+ condition = 0;
switch (feedback.type)
{
case TaskFeedbackType.FightPower:
- return PlayerDatas.Instance.baseData.FightPoint >= feedback.condition;
+ return PlayerDatas.Instance.baseData.FightPoint >= config.condition;
case TaskFeedbackType.SideTask:
return IsSatisfySideTask(feedback.sideTasks, out condition);
case TaskFeedbackType.ReikiPoint:
- return reikiRootModel.GetReikiRootTotalPoint() >= feedback.condition;
+ return reikiRootModel.GetReikiRootTotalPoint() >= config.condition;
case TaskFeedbackType.Equip:
{
var items = packModel.GetItems(PackType.Item, new SinglePack.FilterParams()
@@ -241,11 +222,11 @@
return items != null && items.Count > 0;
}
case TaskFeedbackType.Copper:
- return PlayerDatas.Instance.baseData.allCopper >= (ulong)feedback.condition;
+ return PlayerDatas.Instance.baseData.allCopper >= (ulong)config.condition;
case TaskFeedbackType.Guide:
return true;
case TaskFeedbackType.FightPowerSideTask:
- return PlayerDatas.Instance.baseData.FightPoint >= feedback.condition;
+ return PlayerDatas.Instance.baseData.FightPoint >= config.condition;
case TaskFeedbackType.ItemCount:
{
if (feedback.items != null)
@@ -287,7 +268,6 @@
{
public int taskId;
public TaskFeedbackType type;
- public int condition;
public List<int[]> sideTasks;
public int[] equipCondition;
public List<Item> items;
--
Gitblit v1.8.0