From 3fba6e328d355a9bf0689076e8f8e9b0c69ad3f8 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 27 十二月 2018 19:46:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerTaskDatas.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 315b3b0..30506ea 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -131,7 +131,6 @@
//----鍏充簬鍓嶆湡鏃犳搷浣滆嚜鍔ㄦ墽琛屼富绾�
public int TaskAutoLv = 0;
public int TaskAutoTime = 0;
-
PlayerPackModel _playerPack;
PlayerPackModel playerPack
{
@@ -154,7 +153,7 @@
BossDelayTimeint = float.Parse(BossDelayTime);
var Task_Auto = Config.Instance.Get<FuncConfigConfig>("TaskAuto");
TaskAutoLv = int.Parse(Task_Auto.Numerical1);
- TaskAutoTime= int.Parse(Task_Auto.Numerical2);
+ TaskAutoTime = int.Parse(Task_Auto.Numerical2);
}
public override void UnInit()
@@ -192,11 +191,11 @@
{
GlobalTimeEvent.Instance.secondEvent -= secondEvent;
GlobalTimeEvent.Instance.secondEvent += secondEvent;
- TaskAllocation.Instance.TaskTime= TimeUtility.ServerNow;
- AutomaticityBool = true;
+ TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
+ AutomaticityBool = true;
}
-
+
private void onStageLoadFinish()//鍦板浘鍒囨崲鏃惰皟鐢�
{
@@ -215,7 +214,7 @@
{
try
{
- if (AutomaticityBool && MissionState!=3 && MissionID!=2000 && MissionID!=3000)
+ if (AutomaticityBool && MissionState != 3 && MissionID != 2000 && MissionID != 3000)
{
TaskupToDate = MissionID;
}
@@ -245,7 +244,7 @@
}
TaskChanges(MissionID, MissionState, DiscriptionIndex);//浠诲姟鐨勭姸鎬佷慨鏀�
- if (missionState == 0 && (MissionState == 1 || MissionState==2))
+ if (missionState == 0 && (MissionState == 1 || MissionState == 2))
{
if (Event_TaskToAdd != null)//浠诲姟娣诲姞锛堢敤浜庡瓨鍌ㄤ簬韬笂鐨勬湭鎺ュ彇浠诲姟鐨勭壒娈婂鐞嗭級
{
@@ -259,7 +258,7 @@
Event_TaskRefreshes(MissionID);
}
}
-
+
}
else
{
@@ -385,7 +384,7 @@
if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
{
RequestGetTaskAward("OK");
- }
+ }
}
}
}
@@ -849,6 +848,7 @@
public void RequestGetTaskAward(string _answer)
{
+
var sendInfo = new C0802_tagCNPCAnswer();
sendInfo.Answer = _answer;
sendInfo.AnswerLen = (byte)_answer.Length;
@@ -880,13 +880,13 @@
{
if (MainTaskDic.ContainsKey(_MissionId) && MainCardLevelChange != null && _DictValue == 0)
{
-
+
if (IsGetOnBool)
{
GetNowTaskID = _MissionId;
}
MainCardLevelChange(_MissionId);
-
+
}
}
}
@@ -895,14 +895,14 @@
if (_DicTaskInformation[_MissionId].ContainsKey(_DictKey))
{
_DicTaskInformation[_MissionId][_DictKey] = _DictValue.ToString();
- if (_DictKey == "kaji" && (_DictValue == 0|| _DictValue == 1))//kaji:0涓轰富绾垮崱绾у彉鏇达紝kaji:1涓洪瓟鏃忓崱绾у彉鏇�
+ if (_DictKey == "kaji" && (_DictValue == 0 || _DictValue == 1))//kaji:0涓轰富绾垮崱绾у彉鏇达紝kaji:1涓洪瓟鏃忓崱绾у彉鏇�
{
if (CardLevelChange != null)
{
CardLevelChange(_MissionId);
}
if (MainTaskDic.ContainsKey(_MissionId))
- {
+ {
if (IsGetOnBool)
{
GetNowTaskID = _MissionId;
@@ -1526,22 +1526,22 @@
public int TaskupToDate = 0;//鑾峰彇鏈�鏂颁换鍔D
public int GetOnTaskId = 0;
public bool IsGetOnBool = false;
- private int NeedTime = 10;
+ private int NeedTime = 10;
private DateTime dateTimeA;
- public void GetTaskGetOnNow(int TaskID, string DictKey)//璁板綍涓嬩俊鎭瓧鍏哥殑ID
+ public void GetTaskGetOnNow(int TaskID, string DictKey)//璁板綍涓嬩俊鎭瓧鍏哥殑ID
{
string key1Str = "on_kill_" + TaskID;
string key2Str = "get_byid_" + TaskID;
- if (TaskID > 1 && (key1Str== DictKey || key2Str== DictKey))
+ if (TaskID > 1 && (key1Str == DictKey || key2Str == DictKey))
{
GetOnTaskId = TaskID;
- dateTimeA =DateTime.Now;
+ dateTimeA = DateTime.Now;
}
}
private void secondEvent()
{
- TimeSpan timeS =DateTime.Now- dateTimeA;
+ TimeSpan timeS = DateTime.Now - dateTimeA;
int timeSend = timeS.Seconds;
if (timeSend >= NeedTime)
{
@@ -1573,7 +1573,7 @@
return IsBool;
}
public void TaskMove(int _taskID)
- {
+ {
if (allMissionDict.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
{
string _strTest = allMissionDict[_taskID].InforList;
--
Gitblit v1.8.0