From 9e51fdae7927ec02f85ecfe3fc3b14f5e08d872f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 04 七月 2019 17:48:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 88f1a52..bc257be 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -86,6 +86,7 @@
}
}
break;
+ case TaskFeedbackType.SkyTowerFightPoint:
case TaskFeedbackType.ReikiPoint:
{
if (!string.IsNullOrEmpty(config.reikiRoot))
@@ -180,7 +181,8 @@
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
- if (config.onlyOneFunc == 1)
+ if (config.onlyOneFunc != null &&
+ index < config.onlyOneFunc.Length && config.onlyOneFunc[index] == 1)
{
taskFeedbackFuncs.Add(succFuncs[0]);
}
@@ -219,7 +221,8 @@
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
- if (config.onlyOneFunc == 1)
+ if (config.onlyOneFunc != null &&
+ index < config.onlyOneFunc.Length && config.onlyOneFunc[index] == 1)
{
taskFeedbackFuncs.Add(succFuncs[0]);
}
@@ -259,7 +262,8 @@
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
- if (config.onlyOneFunc == 1)
+ if (config.onlyOneFunc != null &&
+ index < config.onlyOneFunc.Length && config.onlyOneFunc[index] == 1)
{
taskFeedbackFuncs.Add(succFuncs[0]);
}
@@ -436,7 +440,28 @@
var skyTowerConfig = SkyTowerConfig.Get(config.condition);
if (skyTowerConfig != null)
{
- return PlayerDatas.Instance.baseData.FightPoint >= skyTowerConfig.fightPower;
+ if (feedback.reikiRoots != null && PlayerDatas.Instance.baseData.FightPoint < skyTowerConfig.fightPower)
+ {
+ 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;
+ }
+ else
+ {
+ condition = 0;
+ }
+ break;
+ }
+ return false;
+ }
+ else
+ {
+ return PlayerDatas.Instance.baseData.FightPoint >= skyTowerConfig.fightPower;
+ }
}
}
break;
--
Gitblit v1.8.0