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

client_Wu Xijin

2019-04-16 fc714208ff3a320c3bb52bddd5ea3d91f647a206

 System/HazyRegion/HazyRegionIncidentBehaviour.cs

@@ -69,7 +69,7 @@
        void DisplayBase()

        {

            var config = HazyRegionConfig.Get(incidentId);

            m_DepletionPoint.text = string.Format("消耗体力： ", config.point);

            m_DepletionPoint.text = Language.Get("HazyRegionPoint", config.point);

            m_IncidentTitle.text = config.name;

            m_Icon.SetSprite(config.PortraitID);

            m_Icon.SetNativeSize();

@@ -99,13 +99,34 @@


        void DisplayBoss()

        {

            m_ContainerBoss.gameObject.SetActive(incidentType == HazyRegionIncidentType.Boss);

            m_ContainerBoss.gameObject.SetActive(incidentType == HazyRegionIncidentType.DemonKing);

            var config = HazyRegionConfig.Get(incidentId);

            if (incidentType == HazyRegionIncidentType.Boss)

            if (incidentType == HazyRegionIncidentType.DemonKing)

            {

                var npcConfig = NPCConfig.Get(config.npcId);

                m_BossName.text = npcConfig.charName;

            }



            DisplayBossState();

        }



        void DisplayBossState()

        {

            if (incidentType == HazyRegionIncidentType.DemonKing)

            {

                if (model.InFakeHazyRegion)

                {

                    var fighting = ClientDungeonStageUtility.isClientDungeon;

                    m_PlayerCount.gameObject.SetActive(true);

                    m_RebornTime.gameObject.SetActive(false);

                    m_PlayerCount.text = Language.Get("HazyDemonKingPlayerCount", fighting ? 1 : 0);

                }

                else

                {

                    m_PlayerCount.gameObject.SetActive(false);

                    m_RebornTime.gameObject.SetActive(false);

                }

            }

        }



        void DisplayState()