From 31463848256bb0ea493bbd0d5d4f506e849fdaf9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 21:21:46 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs
index 8c5e09d..881fe89 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs
@@ -27,7 +27,7 @@
return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>());
}
}
-
+ bool isEndWait = false;
#region Built-in
protected override void BindController()
{
@@ -39,6 +39,7 @@
protected override void OnPreOpen()
{
+ isEndWait = false;
beginTime = model.GetCoolDownEndTime(DungeonCoolDownType.WaitPlayer);
model.dungeonCoolDownEvent += OnBeginTimeEvent;
}
@@ -61,11 +62,8 @@
private void OnBeginTimeEvent(DungeonCoolDownType _type)
{
if (_type != DungeonCoolDownType.WaitPlayer)
- {
- if (m_CoolDownContainer.gameObject.activeInHierarchy)
- {
- m_CoolDownContainer.gameObject.SetActive(false);
- }
+ {
+ isEndWait = true;
return;
}
@@ -76,7 +74,7 @@
{
base.LateUpdate();
- if (beginTime > DateTime.Now)
+ if (beginTime > DateTime.Now && !isEndWait)
{
var surplusTime = Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);
m_CoolDown.text = Language.Get("CrossServer120", surplusTime);
--
Gitblit v1.8.0