2672 【1.5】混乱妖域出现评级显示卡住

client_linchunjie

2019-01-16 b743162c31a322dd0b70be57031a255fded86ab9

2672 【1.5】混乱妖域出现评级显示卡住

 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerLeaveCoolDownWin.cs

@@ -88,9 +88,9 @@
        {

            base.LateUpdate();



            if (beginTime > DateTime.Now)

            if (beginTime > TimeUtility.ServerNow)

            {

                var surplusTime =Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);

                var surplusTime =Mathf.Clamp((int)(beginTime - TimeUtility.ServerNow).TotalSeconds,0,int.MaxValue);

                if (coolTime != surplusTime)

                {

                    coolTime = surplusTime;


 System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs

@@ -74,9 +74,9 @@
        {
            base.LateUpdate();

            if (beginTime > DateTime.Now && !isEndWait)
            if (beginTime > TimeUtility.ServerNow && !isEndWait)
            {
                var surplusTime = Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);
                var surplusTime = Mathf.Clamp((int)(beginTime - TimeUtility.ServerNow).TotalSeconds,0,int.MaxValue);
                m_CoolDown.text = Language.Get("CrossServer120", surplusTime);
                if (!m_CoolDownContainer.gameObject.activeInHierarchy)
                {

 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -121,7 +121,7 @@
            {

                timer = 1f;

                var endTime = model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

                var seconds = (endTime - DateTime.Now).TotalSeconds;

                var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;

                m_DropOutBtnText.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

                if (seconds <= 0)

                {


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -147,18 +147,18 @@
            {

                return;

            }

            if (dungeonModel.mission.roundNum == 1 && DateTime.Now >= dungeonEndTime)

            if (dungeonModel.mission.roundNum == 1 && TimeUtility.ServerNow >= dungeonEndTime)

            {

                m_CountdownText.text = "60";

                return;

            }

            if (DateTime.Now >= dungeonEndTime)

            if (TimeUtility.ServerNow >= dungeonEndTime)

            {

                m_CountdownText.text = "0";

            }

            else

            {

                var surplus = dungeonEndTime - DateTime.Now;

                var surplus = dungeonEndTime - TimeUtility.ServerNow;

                m_CountdownText.text = (Mathf.CeilToInt((float)surplus.TotalSeconds)).ToString();

            }




 System/Dungeon/DungeonBeginCoolDownWin.cs

@@ -72,9 +72,9 @@
        {
            base.LateUpdate();

            if (beginTime > DateTime.Now)
            if (beginTime > TimeUtility.ServerNow)
            {
                var surplusTime =Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);
                var surplusTime =Mathf.Clamp((int)(beginTime - TimeUtility.ServerNow).TotalSeconds,0,int.MaxValue);
                m_CoolDown.text = surplusTime.ToString();
                if (!m_CoolDownContainer.gameObject.activeInHierarchy)
                {

 System/Dungeon/DungeonDefeatedWin.cs

@@ -83,7 +83,7 @@
            {

                timer = 1f;

                var endTime = model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

                var seconds = (endTime - DateTime.Now).TotalSeconds;

                var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;

                m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

            }

        }

@@ -99,7 +99,7 @@
            yield return new WaitForSeconds(_delay);



            var endTime = model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

            var seconds = (endTime - DateTime.Now).TotalSeconds;

            var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;

            timer = 0f;

            m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

            m_ExitTimer.gameObject.SetActive(true);


 System/Dungeon/DungeonEndCoolDownWin.cs

@@ -37,7 +37,7 @@
            endTime = model.GetCoolDownEndTime(DungeonCoolDownType.TowerTake);

            model.dungeonCoolDownEvent += OnEndTimeEvent;



            var surplusTime = (int)((endTime - DateTime.Now).TotalSeconds);

            var surplusTime = (int)((endTime - TimeUtility.ServerNow).TotalSeconds);

            m_CoolDownContainer.gameObject.SetActive(surplusTime > 0);

            if (surplusTime > 0)

            {

@@ -68,16 +68,16 @@
            }



            var pickUpEndTime = model.GetCoolDownEndTime(DungeonCoolDownType.PickUpTime);

            if (pickUpEndTime > DateTime.Now)

            if (pickUpEndTime > TimeUtility.ServerNow)

            {

                endTime = DateTime.Now;

                endTime = TimeUtility.ServerNow;

            }

            else

            {

                endTime = model.GetCoolDownEndTime(DungeonCoolDownType.TowerTake);

            }



            var surplusTime = (int)((endTime - DateTime.Now).TotalSeconds);

            var surplusTime = (int)((endTime - TimeUtility.ServerNow).TotalSeconds);

            if (surplusTime < 0)

            {

                surplusTime = 0;

@@ -90,13 +90,13 @@
        {

            base.LateUpdate();



            if (endTime > DateTime.Now)

            if (endTime > TimeUtility.ServerNow)

            {

                timer += Time.deltaTime;

                if (timer > 1)

                {

                    timer = 0f;

                    var surplusTime = (int)((endTime - DateTime.Now).TotalSeconds);

                    var surplusTime = (int)((endTime - TimeUtility.ServerNow).TotalSeconds);

                    if (surplusTime < 0)

                    {

                        surplusTime = 0;


 System/Dungeon/DungeonFightWin.cs

@@ -66,7 +66,7 @@
        {

            timer = 1f;

            excutedAutoExit = false;

            existSurplusTime = (float)(model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap) - DateTime.Now).TotalSeconds;

            existSurplusTime = (float)(model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap) - TimeUtility.ServerNow).TotalSeconds;



            ShowItemCollect();

            ShowResPoint();

@@ -204,7 +204,7 @@
            }



            excutedAutoExit = false;

            existSurplusTime = (float)(model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap) - DateTime.Now).TotalSeconds;

            existSurplusTime = (float)(model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap) - TimeUtility.ServerNow).TotalSeconds;

        }



        private void ExitDungeon()


 System/Dungeon/DungeonGradeWin.cs

@@ -69,7 +69,7 @@
            dungeonEndTime = model.GetCoolDownEndTime(DungeonCoolDownType.TowerTake);

            endTime = model.GetCoolDownEndTime(DungeonCoolDownType.FlagTake);

            var exitTime = model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

            exitDungeonStage = exitTime > DateTime.Now;

            exitDungeonStage = exitTime > TimeUtility.ServerNow;

            if (exitDungeonStage)

            {

                DungeonCoolDownEvent(DungeonCoolDownType.LeaveMap);

@@ -249,7 +249,7 @@
            {

                if (model.mission.grade > 1)

                {

                    var surplus = endTime - DateTime.Now;

                    var surplus = endTime - TimeUtility.ServerNow;

                    surplus = surplus < TimeSpan.Zero ? TimeSpan.Zero : surplus;

                    if (surplus.Equals(TimeSpan.Zero))

                    {

@@ -274,7 +274,7 @@
                }

                else

                {

                    var surplus = dungeonEndTime - DateTime.Now;

                    var surplus = dungeonEndTime - TimeUtility.ServerNow;

                    surplus = surplus < TimeSpan.Zero ? TimeSpan.Zero : surplus;

                    surplusTime.text = Language.Get("DungeonGrade_4", TimeUtility.SecondsToHMSCHSRetain((int)surplus.TotalSeconds, false, false));

                    if (surplus.Equals(TimeSpan.Zero))


 System/Dungeon/DungeonModel.cs

@@ -683,7 +683,7 @@


        public void UpdateCoolDown(DungeonCoolDownType _type, uint _millisecond)

        {

            dungeonCoolDowns[_type] = DateTime.Now + new TimeSpan(_millisecond * TimeSpan.TicksPerMillisecond);

            dungeonCoolDowns[_type] = TimeUtility.ServerNow + new TimeSpan(_millisecond * TimeSpan.TicksPerMillisecond);

            if (dungeonCoolDownEvent != null)

            {

                dungeonCoolDownEvent(_type);

@@ -763,7 +763,7 @@


        public DateTime GetCoolDownEndTime(DungeonCoolDownType _type)

        {

            var endTime = DateTime.Now;

            var endTime = TimeUtility.OriginalTime;

            dungeonCoolDowns.TryGetValue(_type, out endTime);



            return endTime;


 System/Dungeon/DungeonNuwaVictoryWin.cs

@@ -53,13 +53,13 @@
                endNextTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

            }



            if (endNextTime > DateTime.Now)

            if (endNextTime > TimeUtility.ServerNow)

            {

                timerNext -= Time.deltaTime;

                if (timerNext < 0f)

                {

                    timerNext += 0.5f;

                    var seconds = (endNextTime - DateTime.Now).TotalSeconds;

                    var seconds = (endNextTime - TimeUtility.ServerNow).TotalSeconds;

                    if (dungeonModel.dungeonResult.grade >= 5 && dungeonModel.dungeonResult.lineID < 7)

                    {

                        m_BtnNextText.text = Language.Get("DungeonVictoryWin_Btn_Next_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));


 System/Dungeon/DungeonPickUpItemCoolDownWin.cs

@@ -72,10 +72,10 @@


        private void DisplaySurplusTime()

        {

            var surplusTime = (int)(endTime - DateTime.Now).TotalSeconds;

            var surplusTime = (int)(endTime - TimeUtility.ServerNow).TotalSeconds;

            m_OverHint.text = surplusTime.ToString();



            if (DateTime.Now >= endTime)

            if (TimeUtility.ServerNow >= endTime)

            {

                m_Content.gameObject.SetActive(false);

            }


 System/Dungeon/DungeonStageTimeWin.cs

@@ -64,8 +64,8 @@
        protected override void LateUpdate()

        {

            base.LateUpdate();

            if (endTime>DateTime.Now) {

                var surplusTime = Mathf.Clamp((int)(endTime - DateTime.Now).TotalSeconds, 0, int.MaxValue);            
            if (endTime>TimeUtility.ServerNow) {

                var surplusTime = Mathf.Clamp((int)(endTime - TimeUtility.ServerNow).TotalSeconds, 0, int.MaxValue);            
                surplursTimeTxt.text = string.Format(Language.Get("NextAttackTime_Z"), surplusTime);

                if (!m_ContainerStageTime.gameObject.activeInHierarchy) {

                    m_ContainerStageTime.gameObject.SetActive(true);


 System/Dungeon/DungeonVictoryWin.cs

@@ -144,7 +144,7 @@
            {

                timer += 0.5f;

                var endTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

                var seconds = (endTime - DateTime.Now).TotalSeconds;

                var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;

                DrawExitTimer((int)seconds);

            }

        }

@@ -506,7 +506,7 @@
                m_Exit.gameObject.SetActive(true);

            }

            var endTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

            var seconds = (endTime - DateTime.Now).TotalSeconds;

            var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;

            timer = (float)seconds - (int)seconds;



            DrawExitTimer((int)seconds);


 System/FairyAu/FairyModel.cs

@@ -764,7 +764,7 @@
                if (InFairyLeagueDungeon)

                {

                    fairyLeagueBeginTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.WaitStart);

                    if (DateTime.Now < fairyLeagueBeginTime)

                    if (TimeUtility.ServerNow < fairyLeagueBeginTime)

                    {

                        fairyLeagueDugeonCoolDown = true;

                    }

@@ -777,7 +777,7 @@
            if (InFairyLeagueDungeon)

            {

                fairyLeagueBeginTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.WaitStart);

                if (DateTime.Now < fairyLeagueBeginTime)

                if (TimeUtility.ServerNow < fairyLeagueBeginTime)

                {

                    fairyLeagueDugeonCoolDown = true;

                }

@@ -796,7 +796,7 @@


        private void SecondEvent()

        {

            if (fairyLeagueDugeonCoolDown && DateTime.Now >= fairyLeagueBeginTime)

            if (fairyLeagueDugeonCoolDown && TimeUtility.ServerNow >= fairyLeagueBeginTime)

            {

                fairyLeagueDugeonCoolDown = false;

                if (InFairyLeagueDungeon)


 System/FindPrecious/DemonJarVictoryWin.cs

@@ -74,13 +74,13 @@
            base.LateUpdate();



            var endTime = model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

            if (endTime > DateTime.Now)

            if (endTime > TimeUtility.ServerNow)

            {

                timer -= Time.deltaTime;

                if (timer < 0f)

                {

                    timer = 1f;

                    var seconds = (endTime - DateTime.Now).TotalSeconds;

                    var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;

                    m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

                }



@@ -104,7 +104,7 @@
            yield return new WaitForSeconds(_delay);



            var endTime = model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

            var seconds = (endTime - DateTime.Now).TotalSeconds;

            var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;

            timer = 0f;

            m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

            m_ExitTimer.gameObject.SetActive(true);


 System/FindPrecious/ElderGodAngerWin.cs

@@ -148,7 +148,7 @@
        private void UpdateExpelCoolDown()
        {
            var endTime = model.GetCoolDownEndTime(DungeonCoolDownType.ElderGodAreaDeadTime);
            var seconds = (endTime - DateTime.Now).TotalSeconds;
            var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;
            m_ElderGodBBContent.text = Language.Get("ElderGodBB5", Mathf.Clamp((int)seconds, 0, int.MaxValue));
        }


 System/FindPrecious/ElderGodAreaExitWin.cs

@@ -56,13 +56,13 @@
            base.LateUpdate();

            var endTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);
            if (endTime > DateTime.Now)
            if (endTime > TimeUtility.ServerNow)
            {
                timer -= Time.deltaTime;
                if (timer < 0f)
                {
                    timer += 0.5f;
                    var seconds = (endTime - DateTime.Now).TotalSeconds;
                    var seconds = (endTime - TimeUtility.ServerNow).TotalSeconds;
                    m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

                    if (seconds <= 0 && !excutedAutoExit)

 System/GatheringSoul/GatherSoulDungeonStageTimeWin.cs

@@ -70,9 +70,9 @@
        protected override void LateUpdate()

        {

            base.LateUpdate();

            if (endTime > DateTime.Now)

            if (endTime > TimeUtility.ServerNow)

            {

                var seconds = Mathf.Clamp((int)(endTime - DateTime.Now).TotalSeconds, 0, int.MaxValue);

                var seconds = Mathf.Clamp((int)(endTime - TimeUtility.ServerNow).TotalSeconds, 0, int.MaxValue);

                m_Time.text = seconds.ToString();

                if (!m_Container.gameObject.activeInHierarchy)

                {


 System/HeavenBattle/BattlePrepareCoolDownWin.cs

@@ -71,9 +71,9 @@


        private void UpdateCoolTime()

        {

            if (beginTime > DateTime.Now)

            if (beginTime > TimeUtility.ServerNow)

            {

                var surplusTime = Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds, 0, int.MaxValue);

                var surplusTime = Mathf.Clamp((int)(beginTime - TimeUtility.ServerNow).TotalSeconds, 0, int.MaxValue);

                if (coolTime != surplusTime)

                {

                    coolTime = surplusTime;