From a67f0498e0adebb0b8de3a055223da6666819fe6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 15:26:01 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs
index c69cdbc..6253ea2 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs
@@ -74,8 +74,8 @@
if (beginTime > DateTime.Now)
{
- var surplusTime =Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);
- m_CoolDown.text = surplusTime.ToString();
+ var surplusTime = Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);
+ m_CoolDown.text = Language.Get("CrossServer120", surplusTime);
if (!m_CoolDownContainer.gameObject.activeInHierarchy)
{
m_CoolDownContainer.gameObject.SetActive(true);
--
Gitblit v1.8.0