From 62667e194448b52fcc3c3b710852d9b178ceb3e9 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 10 十二月 2018 21:23:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FlyingShoesTask.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 44c24e9..f75cf5c 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -41,7 +41,7 @@
private List<int> DemonMissionTypeList = new List<int>();//榄旀棌
private List<string> DemonMissionTypeListKey = new List<string>();//榄旀棌
-
+ private List<int> TransportTask = new List<int>();//鍦≒K鐘舵�佷笅鎴栨墦Boss鐘舵�佷笅渚濇棫鍙互浼犻�佺殑浠诲姟id
PlayerTaskDatas m_TaskModel;
PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
PlayerPackModel _playerPack;
@@ -153,11 +153,18 @@
{
case -5:
case 0:
- bool Bool= StateDetermination();
- if (Bool)
+ if (TransportTask.Contains(Task_ID))
{
- return;
+
}
+ else
+ {
+ bool Bool = StateDetermination();
+ if (Bool)
+ {
+ return;
+ }
+ }
if (mainModel.TaskId_Skill.Contains(Task_ID))
{
mainModel.TaskSkillID = Task_ID;
@@ -581,6 +588,13 @@
DemonMissionTypeList.Add(DemonMissionType[i]);
DemonMissionTypeListKey.Add(DemonMissionType1[i]);
}
+ var TransportTaskConfig= Config.Instance.Get<FuncConfigConfig>("TransportTask").Numerical1;
+ int[] TransportTaskList = ConfigParse.GetMultipleStr<int>(TransportTaskConfig);
+ TransportTask.Clear();
+ for (int i = 0; i < TransportTaskList.Length; i++)
+ {
+ TransportTask.Add(TransportTaskList[i]);
+ }
}
}
--
Gitblit v1.8.0