From 963dfb31ceb285791d4019675bdec8a9d41ae453 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 05 七月 2019 21:02:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskModel.cs | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/TaskModel.cs b/System/MainInterfacePanel/TaskModel.cs
index 05c7fde..989ff86 100644
--- a/System/MainInterfacePanel/TaskModel.cs
+++ b/System/MainInterfacePanel/TaskModel.cs
@@ -147,6 +147,8 @@
List<int[]> priorityTaskChains = new List<int[]>();
+ List<int> allowAutoTaskMapIds = new List<int>();
+
private float mainTaskAutoWaitTime = 0f;
public readonly TaskWait taskWait = new TaskWait();
@@ -167,6 +169,12 @@
TaskAutoLv = int.Parse(Task_Auto.Numerical1);
TaskAutoTime = int.Parse(Task_Auto.Numerical2);
mainTaskAutoWaitTime = int.Parse(Task_Auto.Numerical3) / 1000f;
+ var mapIds = ConfigParse.GetMultipleStr<int>(Task_Auto.Numerical4);
+ if (mapIds != null && mapIds.Length > 0)
+ {
+ allowAutoTaskMapIds.AddRange(mapIds);
+ }
+
FairyAuTaskCount_Day = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical1.Split('|')[1].Split('_')[1]);
FairyAuTaskCount_Round = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical2.Split('|')[1].Split('_')[1]);
@@ -1302,6 +1310,20 @@
{
try
{
+ if (!allowAutoTaskMapIds.Contains(PlayerDatas.Instance.baseData.MapID))
+ {
+ return;
+ }
+
+ var _hero = PlayerDatas.Instance.hero;
+ if (_hero != null)
+ {
+ if (MapArea.IsInMapArea(_hero.CurMapArea, MapArea.E_Type.Boss))
+ {
+ return;
+ }
+ }
+
if (MainTaskDic.ContainsKey(_taskID))//涓荤嚎浠诲姟
{
if (MainTaskDic[_taskID].MissionState == 0 || MainTaskDic[_taskID].MissionState == 3)
--
Gitblit v1.8.0