From b82d1347f6b6e44b9824f0b4d456a9245d07af5a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 12 十一月 2018 21:07:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonEnterInfo.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/System/Dungeon/DungeonEnterInfo.cs b/System/Dungeon/DungeonEnterInfo.cs
index f58247a..65a1ff9 100644
--- a/System/Dungeon/DungeonEnterInfo.cs
+++ b/System/Dungeon/DungeonEnterInfo.cs
@@ -25,9 +25,9 @@
}
}
- DungeonEnterCD dungeonEnter;
+ DungeonEnterCoolDown dungeonEnter;
- public event Action OnCdComplete;
+ public event Action OnCoolDowndComplete;
private void Awake()
{
@@ -39,11 +39,11 @@
private void OnClearBtn()
{
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), UIHelper.ReplaceNewLine(Language.Get("FairyLand_Func11", dungeonEnter.clearCdCost)), (bool isOk) =>
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), UIHelper.ReplaceNewLine(Language.Get("FairyLand_Func11", dungeonEnter.clearCoolDownCost)), (bool isOk) =>
{
if (isOk)
{
- if (PlayerDatas.Instance.baseData.GoldPaper + PlayerDatas.Instance.baseData.Gold >= dungeonEnter.clearCdCost)
+ if (PlayerDatas.Instance.baseData.GoldPaper + PlayerDatas.Instance.baseData.Gold >= dungeonEnter.clearCoolDownCost)
{
model.RequestClearEnterCD(dungeonEnter.mapId);
}
@@ -64,14 +64,14 @@
{
var dungeonId = model.GetDungeonId(model.currentDungeon);
var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
- dungeonEnter = model.GetEnterCD(dungeonConfig.DataMapID);
+ dungeonEnter = model.GetEnterCoolDown(dungeonConfig.DataMapID);
- model.updateDungeonEnterCD += UpdateDungeonEnterCD;
+ model.dungeonEnterCoolDownUpdate += UpdateDungeonEnterCD;
}
private void UpdateDungeonEnterCD()
{
- if (dungeonEnter.dungeonSurplusTime == 0)
+ if (dungeonEnter != null && dungeonEnter.suplursSeconds == 0)
{
gameObject.SetActive(false);
}
@@ -79,19 +79,20 @@
private void OnDisable()
{
- model.updateDungeonEnterCD -= UpdateDungeonEnterCD;
+ model.dungeonEnterCoolDownUpdate -= UpdateDungeonEnterCD;
}
private void LateUpdate()
{
- TimeSpan t = dungeonEnter.overdueTime - DateTime.Now;
- surplusTimeText.text = StringUtility.Contact(Language.Get("FairyLand_Func12"), t.Minutes.ToString("D2"), ":", Mathf.Max(0, t.Seconds).ToString("D2"));
- if (t.Minutes <= 0 && t.Seconds <= 0)
+ TimeSpan timeSpan = dungeonEnter.endCoolDownTime - TimeUtility.ServerNow;
+ surplusTimeText.text = StringUtility.Contact(Language.Get("FairyLand_Func12"), timeSpan.Minutes.ToString("D2"), ":",
+ Mathf.Max(0, timeSpan.Seconds).ToString("D2"));
+ if (timeSpan.Minutes <= 0 && timeSpan.Seconds <= 0)
{
gameObject.SetActive(false);
- if (OnCdComplete != null)
+ if (OnCoolDowndComplete != null)
{
- OnCdComplete();
+ OnCoolDowndComplete();
}
}
}
--
Gitblit v1.8.0