3335 缥缈仙域优化

client_linchunjie

2019-05-21 a4ff0dafb2aa3f92fc6357543ad8c4e21d1be398

3335 缥缈仙域优化

 Fight/Stage/Dungeon/DungeonStage.cs

@@ -266,6 +266,7 @@
                WindowCenter.Instance.Open<RidingPetBossHintWin>();

                break;

            case HazyGrassModel.Client_ReikiGrassMapID:

            case HazyGrassModel.Client_FairyGrassMapID:

            case HazyGrassModel.FairyGrassMapId:

            case HazyGrassModel.ReikiGrassMapId:

                WindowCenter.Instance.Close<DungeonEndCoolDownWin>();


 System/HazyRegion/HazyDemonKingDungeonWin.cs

@@ -14,6 +14,7 @@


    public class HazyDemonKingDungeonWin : Window

    {

        [SerializeField] Transform m_ContainerDungeonInfo;

        [SerializeField] CyclicScroll m_CyclicScroll;

        [SerializeField] HazyDemonKingPlayerBehaviour m_BelongToPlayer;

        [SerializeField] RectTransform m_ContainerPlayerList;

@@ -36,7 +37,21 @@


        uint belongToPlayerId = 0;



        private int dungeonType

        {

            get

            {

                var config = HazyRegionConfig.Get(hazyRegionModel.processingIncidentId);

                if (config != null)

                {

                    return config.dungeonType;

                }

                return 0;

            }

        }



        HazyDemonKingModel model { get { return ModelCenter.Instance.GetModel<HazyDemonKingModel>(); } }

        HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



        #region Built-in

@@ -97,6 +112,8 @@


        void Display()

        {

            m_ContainerDungeonInfo.gameObject.SetActive(dungeonType != 0);



            DisplayBelongTo();

            DisplayPlayers();

            DisplayMyTargetName();

@@ -105,6 +122,11 @@


        void DisplayPlayers()

        {

            if (dungeonType == 0)

            {

                return;

            }



            playerIds.Clear();

            clonePlayerIds.Clear();



@@ -124,6 +146,11 @@


        void DisplayBelongTo()

        {

            if (dungeonType == 0)

            {

                return;

            }



            belongToPlayerId = 0;

            foreach (var sid in model.GetPlayerIds())

            {

@@ -153,20 +180,29 @@


        void DisplayInvincibleBuff()

        {

            var actors = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcFightBoss);

            bool existInvincibleBuff = false;



            Status_Base status_Base = null;

            uint serverInstId = 0;



            if (actors != null && actors.Count > 0)

            if (dungeonType != 0)

            {

                var serverInstId = (actors[0] as GA_NpcFightBoss).ServerInstID;

                existInvincibleBuff = StatusMgr.Instance.IsExist(serverInstId, model.invincibleBuffId);



                if (existInvincibleBuff)

                var actors = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcFightBoss);

                if (actors != null && actors.Count > 0)

                {

                    status_Base = StatusMgr.Instance.Get(serverInstId, model.invincibleBuffId);

                    serverInstId = (actors[0] as GA_NpcFightBoss).ServerInstID;

                    existInvincibleBuff = StatusMgr.Instance.IsExist(serverInstId, model.invincibleBuffId);

                }

            }

            else

            {

                serverInstId = ClientHazyDemonKingStage.GetClientBossSid();

                existInvincibleBuff = StatusMgr.Instance.IsExist(serverInstId, model.invincibleBuffId);

            }





            if (existInvincibleBuff)

            {

                status_Base = StatusMgr.Instance.Get(serverInstId, model.invincibleBuffId);

            }



            m_ContainerInvincibleBuff.gameObject.SetActive(existInvincibleBuff);

@@ -206,6 +242,11 @@


        private void PerSecond()

        {

            if (dungeonType == 0)

            {

                return;

            }



            if (clonePlayerIds.Count > 0)

            {

                clonePlayerIds.Sort(Compare);

@@ -246,6 +287,11 @@


        void DisplayMyTargetName()

        {

            if (dungeonType == 0)

            {

                return;

            }



            m_MyAtkTargetName.text = string.Empty;



            myAtkSid = model.GetPlayerAtkTarget(PlayerDatas.Instance.PlayerId);


 System/HazyRegion/HazyDemonKingVictoryWin.cs

@@ -15,6 +15,7 @@
    public class HazyDemonKingVictoryWin : Window

    {

        [SerializeField] Transform m_ContainerPoivt;

        [SerializeField] Transform m_ContainerBelongTo;

        [SerializeField] Text m_PlayerName;

        [SerializeField] ScrollRect m_RewardsScroll;

        [SerializeField] Text m_ExitTimer;

@@ -27,7 +28,21 @@


        float timer = 0f;



        private int dungeonType

        {

            get

            {

                var config = HazyRegionConfig.Get(hazyRegionModel.processingIncidentId);

                if (config != null)

                {

                    return config.dungeonType;

                }

                return 0;

            }

        }



        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }



        #region Built-in

        protected override void BindController()

@@ -43,6 +58,7 @@
        {

            timer = 0f;

            m_ContainerPoivt.gameObject.SetActive(false);

            m_ContainerBelongTo.gameObject.SetActive(dungeonType != 0);

        }



        protected override void OnActived()


 System/HazyRegion/HazyGrassModel.cs

@@ -255,7 +255,8 @@
        public bool CanCollectClientNpc(int npcId)

        {

            if (ClientDungeonStageUtility.isClientDungeon

                && ClientDungeonStageUtility.clientMapId == Client_ReikiGrassMapID)

                && (ClientDungeonStageUtility.clientMapId == Client_ReikiGrassMapID

                || ClientDungeonStageUtility.clientMapId == Client_FairyGrassMapID))

            {

                var config = HazyRegionConfig.Get(hazyRegionModel.processingIncidentId);

                if (config != null)