3335 缥缈仙域优化

client_linchunjie

2019-05-22 db890adf9fd23714ab436be57cff5b5e8543a600

3335 缥缈仙域优化

 Fight/Stage/Dungeon/ClientDungeonStageUtility.cs

@@ -187,10 +187,10 @@
    {

        switch (mapId)

        {

            case 2000:

            case 3240:

            case 3250:

            case 31190:

            case HazyDemonKingModel.CLIENTDATAMAP:

            case HazyGrassModel.REIKI_CLIENTDATAMAP:

            case HazyGrassModel.FAIRY_CLIENTDATAMAP:

            case HazyRegionModel.PRECIOUS_CLIENTDATAMAP:

                return true;

        }

        return false;


 Fight/Stage/Dungeon/DungeonStage.cs

@@ -243,7 +243,7 @@
            case DemonJarModel.DEMONJAR_MAPID:

            case 31140:

            case JadeDynastyBossModel.JADEDYNASTY_MAP:

            case HazyDemonKingModel.Client_MapID:

            case HazyDemonKingModel.CLIENTDATAMAP:

            case HazyDemonKingModel.DEMONKINGMAPID1:

            case HazyDemonKingModel.DEMONKINGMAPID2:

                WindowCenter.Instance.Open<DungeonPickUpItemCoolDownWin>();

@@ -263,8 +263,8 @@
            case RidingPetBossModel.RIDINGPETBOSS_MAP:

                WindowCenter.Instance.Open<RidingPetBossHintWin>();

                break;

            case HazyGrassModel.Client_ReikiGrassMapID:

            case HazyGrassModel.Client_FairyGrassMapID:

            case HazyGrassModel.REIKI_CLIENTDATAMAP:

            case HazyGrassModel.FAIRY_CLIENTDATAMAP:

            case HazyGrassModel.FairyGrassMapId:

            case HazyGrassModel.ReikiGrassMapId:

                WindowCenter.Instance.Close<DungeonEndCoolDownWin>();


 Fight/Stage/StageLoadProcessor.cs

@@ -405,11 +405,11 @@
                case 31190:

                    stage = stageGameObject.AddComponent<ClientHazyPreciousDungeonStage>();

                    break;

                case HazyDemonKingModel.Client_MapID:

                case HazyDemonKingModel.CLIENTDATAMAP:

                    stage = stageGameObject.AddComponent<ClientHazyDemonKingStage>();

                    break;

                case HazyGrassModel.Client_FairyGrassMapID:

                case HazyGrassModel.Client_ReikiGrassMapID:

                case HazyGrassModel.FAIRY_CLIENTDATAMAP:

                case HazyGrassModel.REIKI_CLIENTDATAMAP:

                    stage = stageGameObject.AddComponent<ClientHazyGrassStage>();

                    break;

                case 4000:


 Lua/Gen/SnxxzUIHazyDemonKingModelWrap.cs

@@ -53,7 +53,7 @@
            Utils.BeginClassRegister(type, L, __CreateInstance, 4, 0, 0);
            
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "Client_MapID", Snxxz.UI.HazyDemonKingModel.Client_MapID);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "Client_MapID", Snxxz.UI.HazyDemonKingModel.CLIENTDATAMAP);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "DEMONKINGMAPID1", Snxxz.UI.HazyDemonKingModel.DEMONKINGMAPID1);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "DEMONKINGMAPID2", Snxxz.UI.HazyDemonKingModel.DEMONKINGMAPID2);
            

 Lua/Gen/SnxxzUIHazyGrassModelWrap.cs

@@ -50,8 +50,8 @@
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "ReikiGrassMapId", Snxxz.UI.HazyGrassModel.ReikiGrassMapId);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "FairyGrassMapId", Snxxz.UI.HazyGrassModel.FairyGrassMapId);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "Client_ReikiGrassMapID", Snxxz.UI.HazyGrassModel.Client_ReikiGrassMapID);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "Client_FairyGrassMapID", Snxxz.UI.HazyGrassModel.Client_FairyGrassMapID);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "Client_ReikiGrassMapID", Snxxz.UI.HazyGrassModel.REIKI_CLIENTDATAMAP);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "Client_FairyGrassMapID", Snxxz.UI.HazyGrassModel.FAIRY_CLIENTDATAMAP);
            
            
            

 System/Dungeon/DungeonModel.cs

@@ -1116,7 +1116,7 @@
                            break;

                        case 22030:

                        case 32030:

                        case HazyDemonKingModel.Client_MapID:

                        case HazyDemonKingModel.CLIENTDATAMAP:

                            WindowCenter.Instance.Open<HazyDemonKingVictoryWin>();

                            break;

                        default:


 System/HazyRegion/ClientHazyGrassStage.cs

@@ -146,7 +146,7 @@
            }

        }



        if (ClientDungeonStageUtility.clientMapId == HazyGrassModel.Client_FairyGrassMapID)

        if (ClientDungeonStageUtility.clientMapId == HazyGrassModel.FAIRY_CLIENTDATAMAP)

        {

            PersonalEnemy.Create((uint)s_EnemyNpcId, E_ActorGroup.Enemy, PlayerBornPosition2);

        }


 System/HazyRegion/HazyDemonKingModel.cs

@@ -15,7 +15,7 @@


        public int invincibleBuffId { get; private set; }



        public const int Client_MapID = 2000;

        public const int CLIENTDATAMAP = 2000;



        public const int DEMONKINGMAPID1 = 22030;

        public const int DEMONKINGMAPID2 = 32030;

@@ -198,7 +198,7 @@
                return false;

            }



            if (mapId == Client_MapID)

            if (mapId == CLIENTDATAMAP)

            {

                return true;

            }

@@ -250,7 +250,7 @@


        public uint GetPlayerAtkTarget(uint sid)

        {

            if (ClientDungeonStageUtility.clientMapId == Client_MapID)

            if (ClientDungeonStageUtility.clientMapId == CLIENTDATAMAP)

            {

                return ClientHazyDemonKingStage.GetClientBossSid();

            }

@@ -275,7 +275,7 @@
        public bool IsExistBelongTo(uint playerId)

        {

            if (playerId == PlayerDatas.Instance.PlayerId

                && ClientDungeonStageUtility.clientMapId == Client_MapID)

                && ClientDungeonStageUtility.clientMapId == CLIENTDATAMAP)

            {

                return true;

            }

@@ -322,7 +322,7 @@
        public void RequestEnterClientDungeon()

        {

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

            ClientDungeonStageUtility.GotoNormalClientDungeon(Client_MapID, config.dungeonId, config.lineId);

            ClientDungeonStageUtility.GotoNormalClientDungeon(CLIENTDATAMAP, config.dungeonId, config.lineId);

        }

    }




 System/HazyRegion/HazyDemonKingVictoryWin.cs

@@ -183,7 +183,7 @@


        private void ExitDungeon()

        {

            if (PlayerDatas.Instance.baseData.MapID == HazyDemonKingModel.Client_MapID)

            if (PlayerDatas.Instance.baseData.MapID == HazyDemonKingModel.CLIENTDATAMAP)

            {

                ClientDungeonStageUtility.ExitNormalClientDungeon();

            }


 System/HazyRegion/HazyGrassModel.cs

@@ -12,8 +12,8 @@


        public const int ReikiGrassMapId = 32040;

        public const int FairyGrassMapId = 32050;

        public const int Client_ReikiGrassMapID = 3240;

        public const int Client_FairyGrassMapID = 3250;

        public const int REIKI_CLIENTDATAMAP = 3240;

        public const int FAIRY_CLIENTDATAMAP = 3250;



        public bool IsInDungeon { get; private set; }



@@ -84,8 +84,8 @@
                return false;

            }



            if (mapId == Client_ReikiGrassMapID

                || mapId == Client_FairyGrassMapID)

            if (mapId == REIKI_CLIENTDATAMAP

                || mapId == FAIRY_CLIENTDATAMAP)

            {

                return true;

            }

@@ -176,9 +176,9 @@
            switch ((HazyRegionIncidentType)config.incidentType)

            {

                case HazyRegionIncidentType.FairyGrass:

                    return Client_FairyGrassMapID;

                    return FAIRY_CLIENTDATAMAP;

                case HazyRegionIncidentType.ReikiGrass:

                    return Client_ReikiGrassMapID;

                    return REIKI_CLIENTDATAMAP;

            }

            return 0;

        }

@@ -218,15 +218,15 @@


        public void DeleteLocalSaveKey()

        {

            LocalSave.DeleteKey(GetLocalSaveKey(Client_FairyGrassMapID));

            LocalSave.DeleteKey(GetLocalSaveKey(Client_ReikiGrassMapID));

            LocalSave.DeleteKey(GetLocalSaveKey(FAIRY_CLIENTDATAMAP));

            LocalSave.DeleteKey(GetLocalSaveKey(REIKI_CLIENTDATAMAP));

        }



        public bool CanCollectClientNpc(int npcId)

        {

            if (ClientDungeonStageUtility.isClientDungeon

                && (ClientDungeonStageUtility.clientMapId == Client_ReikiGrassMapID

                || ClientDungeonStageUtility.clientMapId == Client_FairyGrassMapID))

                && (ClientDungeonStageUtility.clientMapId == REIKI_CLIENTDATAMAP

                || ClientDungeonStageUtility.clientMapId == FAIRY_CLIENTDATAMAP))

            {

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

                if (config != null)


 System/HazyRegion/HazyRegionIncidentBehaviour.cs

@@ -145,7 +145,7 @@
            m_Icon.SetSprite(config.PortraitID);

            m_Icon.SetNativeSize();

            m_Icon.material = m_SmoothMask.imageMaterials[0];

            m_ContainerCrossServer.gameObject.SetActive(!model.InFakeHazyRegion && config.dungeonType == 2);

            m_ContainerCrossServer.gameObject.SetActive(config.dungeonType == 2);

            m_ContainerMustSign.gameObject.SetActive(false);

        }



@@ -187,17 +187,17 @@
        {

            if (incidentType == HazyRegionIncidentType.DemonKing)

            {

                if (model.InFakeHazyRegion)

                var config = HazyRegionConfig.Get(incidentId);

                if (config.dungeonType == 0)

                {

                    var fighting = ClientDungeonStageUtility.isClientDungeon &&

                        ClientDungeonStageUtility.clientMapId == HazyDemonKingModel.Client_MapID;

                        ClientDungeonStageUtility.clientMapId == HazyDemonKingModel.CLIENTDATAMAP;

                    m_PlayerCount.gameObject.SetActive(true);

                    m_RebornTime.gameObject.SetActive(false);

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

                }

                else

                {

                    var config = HazyRegionConfig.Get(incidentId);

                    m_PlayerCount.gameObject.SetActive(bossAlive);

                    m_RebornTime.gameObject.SetActive(!bossAlive);

                    m_Icon.material = bossAlive ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

@@ -317,8 +317,9 @@


        private void OnPlayerCountRefresh()

        {

            var config = HazyRegionConfig.Get(incidentId);

            if (incidentType == HazyRegionIncidentType.DemonKing

                && !model.InFakeHazyRegion && bossAlive)

                && config.dungeonType != 0 && bossAlive)

            {

                DisplayPlayerCount();

            }


 System/HazyRegion/HazyRegionModel.cs

@@ -27,6 +27,8 @@
            IncidentState.Complete,

        };



        public const int PRECIOUS_CLIENTDATAMAP = 31190;



        public int limitPoint { get; private set; }

        public int point { get; private set; }



@@ -363,9 +365,9 @@
            {

                return false;

            }

            if (mapId == HazyDemonKingModel.Client_MapID

                || mapId == HazyGrassModel.Client_FairyGrassMapID

                || mapId == HazyGrassModel.Client_ReikiGrassMapID)

            if (mapId == HazyDemonKingModel.CLIENTDATAMAP

                || mapId == HazyGrassModel.FAIRY_CLIENTDATAMAP

                || mapId == HazyGrassModel.REIKI_CLIENTDATAMAP)

            {

                return true;

            }