From fb0345c8f9815f1b9f655d6363da3a9cedd3944f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 10 九月 2018 11:25:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Team/TeamData.cs | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/System/Team/TeamData.cs b/System/Team/TeamData.cs
index 68178c0..c56ea31 100644
--- a/System/Team/TeamData.cs
+++ b/System/Team/TeamData.cs
@@ -71,7 +71,7 @@
m_Mission = value;
if (autoPrepare.auto && autoPrepare.cancelWhenTargetChange)
{
- autoPrepare.Reset();
+ autoPrepare.CancelAutoPrepare();
}
}
}
@@ -197,7 +197,7 @@
if (!oldInTeam && inTeam)
{
- autoPrepare.Reset();
+ autoPrepare.CancelAutoPrepare();
}
var newCaptainer = memberCount > 0 ? members[0].id : 0;
@@ -205,7 +205,7 @@
{
if (autoPrepare.auto && autoPrepare.cancelWhenCaptainerChange)
{
- autoPrepare.Reset();
+ autoPrepare.CancelAutoPrepare();
}
}
}
@@ -487,18 +487,17 @@
return false;
}
- public bool IsAllOk(int _expectCount)
+ public bool IsAllOk()
{
- var okCount = 0;
foreach (var key in playerStates.Keys)
{
- if (playerStates[key] == TeammatePrepareState.Prepared)
+ if (playerStates[key] != TeammatePrepareState.Prepared)
{
- okCount++;
+ return false;
}
}
- return okCount >= _expectCount;
+ return true;
}
}
@@ -521,7 +520,7 @@
bool m_Auto = false;
public bool auto {
get { return m_Auto; }
- set {
+ private set {
if (m_Auto != value)
{
m_Auto = value;
@@ -533,16 +532,37 @@
}
}
- public bool cancelWhenTargetChange = true;
- public bool cancelWhenCaptainerChange = false;
+ public int mapId { get; private set; }
+ public int mapEx { get; private set; }
+
+ bool m_CancelWhenTargetChange = true;
+ public bool cancelWhenTargetChange {
+ get { return m_CancelWhenTargetChange; }
+ }
+
+ bool m_CancelWhenCaptainerChange = false;
+ public bool cancelWhenCaptainerChange {
+ get { return m_CancelWhenCaptainerChange; }
+ }
public event Action autoPrepareChangeEvent;
- public void Reset()
+ public void CancelAutoPrepare()
{
- auto = false;
- cancelWhenCaptainerChange = false;
- cancelWhenTargetChange = true;
+ this.mapId = 0;
+ this.mapEx = 0;
+ this.m_CancelWhenCaptainerChange = false;
+ this.m_CancelWhenTargetChange = true;
+ this.auto = false;
+ }
+
+ public void SetAutoPreapare(int mapId, int mapEx, bool cancelWhenTargetChange, bool cancelWhenCaptainerChange)
+ {
+ this.mapId = mapId;
+ this.mapEx = mapEx;
+ this.m_CancelWhenTargetChange = cancelWhenTargetChange;
+ this.m_CancelWhenCaptainerChange = cancelWhenCaptainerChange;
+ this.auto = true;
}
}
--
Gitblit v1.8.0