From 901402b1f05a8c3ced3b3d808bb12ebd85a53032 Mon Sep 17 00:00:00 2001
From: client_wuxijin <364452445@qq.com>
Date: 星期五, 10 八月 2018 17:48:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerTaskDatas.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index e593b83..badbe13 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -461,7 +461,10 @@
void TaskClassification(int _taskID, int MissionState)//浠诲姟鍒嗙被(涓荤嚎浠诲姟,鏀嚎浠诲姟)
{
-
+ if (!allMissionDict.ContainsKey(_taskID))
+ {
+ return;
+ }
TaskTypenum type = (TaskTypenum)allMissionDict[_taskID].Type;
switch (type)
{
@@ -805,7 +808,7 @@
dic.Add(info.DictKey, (int)info.DictValue);
}
}
-
+
}
public void RequestGetTaskAward(string _answer)
@@ -878,13 +881,16 @@
if (allMissionDict.ContainsKey(_taskID))
{
allMissionDict.Remove(_taskID);
- _DicTaskInformation.Remove(_taskID);
+ if (_DicTaskInformation.ContainsKey(_taskID))
+ {
+ _DicTaskInformation.Remove(_taskID);
+ }
}
TaskTypeDeletion(_taskID);
if (Event_TaskToDelete != null)
+ {
Event_TaskToDelete(_taskID);
-
-
+ }
}
bool _bool = false;
string _conversationA = null;
@@ -1367,7 +1373,7 @@
public enum TaskStatus//浠诲姟鐘舵��
{
- None=-5,//娌℃湁
+ None = -5,//娌℃湁
Normal = 0,//姝ｅ父浠诲姟锛堢豢锛�
TreasureCardLevel = 1,//娉曞疂鍗＄骇锛堢孩锛�
CardLevel = 2,//绛夌骇鍗＄骇锛堢孩锛�
@@ -1455,8 +1461,8 @@
{
return;
}
- if ((taskID == BOUNTYTASK && MissionState == 1 && !BountyMotionBool && TaskAllocation.Instance.ForRingAllNumber()!=10)
- || (taskID == FAIRYAUTASK && MissionState == 1 && !FairyAuBool && TaskAllocation.Instance.FairyAuAllNumber()==70))
+ if ((taskID == BOUNTYTASK && MissionState == 1 && !BountyMotionBool && TaskAllocation.Instance.ForRingAllNumber() != 10)
+ || (taskID == FAIRYAUTASK && MissionState == 1 && !FairyAuBool && TaskAllocation.Instance.FairyAuAllNumber() == 70))
{
var mapModel = ModelCenter.Instance.GetModel<MapModel>();
var point = mapModel.GetRecommendHangPoint();
--
Gitblit v1.8.0