Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-08-27 fb294bdf89b7977ea041c54d42dbcd3763fd9b7c

 System/Dungeon/DungeonVictoryWin.cs

@@ -56,7 +56,10 @@


        protected override void AddListeners()

        {

            m_Exit.AddListener(ExitDungeon);

            if (m_Exit != null)

            {

                m_Exit.AddListener(ExitDungeon);

            }

        }



        protected override void OnPreOpen()

@@ -116,7 +119,7 @@
        {

            base.LateUpdate();



            if (!m_ExitTimer.gameObject.activeInHierarchy)

            if (m_ExitTimer != null && !m_ExitTimer.gameObject.activeInHierarchy)

            {

                m_ExitTimer.gameObject.SetActive(true);

            }

@@ -138,7 +141,10 @@


        protected virtual void DrawExitTimer(int seconds)

        {

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

            if (m_ExitTimer != null)

            {

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

            }

        }



        protected virtual void DrawItemRewards()

@@ -421,7 +427,10 @@


        protected virtual void RequireDungeonExit()

        {

            m_Exit.gameObject.SetActive(true);

            if (m_Exit != null)

            {

                m_Exit.gameObject.SetActive(true);

            }

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

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

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