3335 缥缈仙域优化

client_linchunjie

2019-05-21 15e9c25fafd89cb7722696b30d8f6b33eacebe46

3335 缥缈仙域优化

 Fight/Stage/Dungeon/ClientDungeonStageUtility.cs

@@ -11,6 +11,8 @@
    public static ushort clientMapId { get; private set; }

    public static Dungeon dungeonInfo { get; set; }

    static bool exitClientDungeonFlag = false;

    const string OFFLINEMAPRECORD = "OfflineMapRecord";

    public static event Action<HB214_tagMCCuntomFBPrizeInfo> onReceiveCustomDropItme;
@@ -21,6 +23,7 @@
    {
        DTC0102_tagCDBPlayer.switchAccountEvent += Reset;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
        StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
    }



    public static void SetClientDungeon(bool value, ushort mapId)
@@ -92,6 +95,58 @@
            }

        }

        clientCustomDungeonResult = null;

    }



    public static void GotoNormalClientDungeon(int clientMapId, int mapId, int lineId)

    {

        RequestStartClientDungeon(mapId, lineId, (dungeonInfo, isOk) =>

        {

            var hero = PlayerDatas.Instance.hero;

            if (hero != null)

            {

                hero.StopAll();

            }



            MapTransferUtility.Instance.Clear();



            SetClientDungeon(true, (ushort)mapId);

            StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()

            {

                toMapId = mapId,

                toLineId = 0,

                needEmpty = true,

                needLoadResource = true,

                serverType = ServerType.Main,

                isClientLoadMap = true

            });



            PlayerDatas.Instance.baseData.mainServerMapIdRecord = PlayerDatas.Instance.baseData.MapID;

            PlayerDatas.Instance.baseData.MapID = (ushort)mapId;

            var attackMode = new C030A_tagCChangeAttackMode();

            attackMode.Mode = (byte)E_AttackMode.Peace;

            GameNetSystem.Instance.PushPackage(attackMode, ServerType.Main);

        });

    }



    public static void ExitNormalClientDungeon()

    {

        SetClientDungeon(false, 0);

        PlayerDatas.Instance.extersion.pkState = 0;

        ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();



        exitClientDungeonFlag = true;



        PlayerDatas.Instance.baseData.MapID = PlayerDatas.Instance.baseData.mainServerMapIdRecord;

        StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()

        {

            toMapId = PlayerDatas.Instance.baseData.MapID,

            toLineId = 0,

            needEmpty = true,

            needLoadResource = true,

            serverType = ServerType.Main,

            isClientLoadMap = true,

            refreshPlayerDatas = true

        });

    }

    private static void FiveSecondEvent()

@@ -149,6 +204,16 @@
        }

    }

    private static void OnStageLoadFinish()

    {

        if (exitClientDungeonFlag)

        {

            RequestExitClientDungeon();

        }



        exitClientDungeonFlag = false;

    }



    private static void Reset()
    {
        isClientDungeon = false;

 Fight/Stage/Dungeon/ClientHazyPreciousDungeonStage.cs

@@ -268,7 +268,7 @@
                step = (int)step < (int)Step.Collect ? 1 : 2,

                npcTotal = npcTotal,

            };

            model.UpdateFakeDungeonMission(ClientHazyPreciousDungeon.DATAMAP, missionData);

            model.UpdateFakeDungeonMission(31190, missionData);

        }



        void UnloadAssets()

@@ -311,7 +311,7 @@


        void OnExitDungeon()

        {

            ClientHazyPreciousDungeon.RequestExit();

            ClientDungeonStageUtility.ExitNormalClientDungeon();

        }



        private void BossShowCompletedEvent()


 Fight/Stage/Dungeon/ClientPersonalBossDungeonStage.cs

New file
@@ -0,0 +1,15 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ClientPersonalBossDungeonStage : DungeonStage

{
    public override void Initialize()

    {

        base.Initialize();

    }

    public override void UnInitialize()

    {

        base.UnInitialize();

    }
}

 Fight/Stage/Dungeon/ClientPersonalBossDungeonStage.cs.meta

File was renamed from System/Treasure/ClientTreasureDungeon.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 189ce34976654c34da06b3239c45076d
timeCreated: 1556000158
guid: e0fe6b75e8e6ea3439251f799ba2d591
timeCreated: 1558427783
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/Stage/Dungeon/DungeonStage.cs

@@ -236,7 +236,7 @@
                    WindowCenter.Instance.Open<ElderGodAngerWin>();

                }

                break;

            case ClientTreasureDungeon.Client_DataMap:

            case 4000:

            case TreasureModel.TREASURE_MAPID:

                WindowCenter.Instance.Open<TreasureDungeonMissionHintWin>();

                break;


 Fight/Stage/StageLoadProcessor.cs

@@ -412,7 +412,7 @@
                case HazyGrassModel.Client_ReikiGrassMapID:

                    stage = stageGameObject.AddComponent<ClientHazyGrassStage>();

                    break;

                case ClientTreasureDungeon.Client_DataMap:

                case 4000:

                    stage = stageGameObject.AddComponent<ClientTreasureDungeonStage>();

                    break;

                default:


 Lua/Gen/SnxxzUIHazyDemonKingModelWrap.cs

@@ -38,7 +38,6 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestExitDungeon", _m_RequestExitDungeon);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ReceivePackage", _m_ReceivePackage);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestEnterClientDungeon", _m_RequestEnterClientDungeon);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestExitClientDungeon", _m_RequestExitClientDungeon);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "onPlayerInfoRefresh", _e_onPlayerInfoRefresh);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "onPlayerCountRefresh", _e_onPlayerCountRefresh);
@@ -515,35 +514,6 @@
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_RequestExitClientDungeon(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.HazyDemonKingModel gen_to_be_invoked = (Snxxz.UI.HazyDemonKingModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    
                    gen_to_be_invoked.RequestExitClientDungeon(  );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]

 Lua/Gen/SnxxzUIHazyGrassModelWrap.cs

@@ -36,7 +36,6 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ReceivePackage", _m_ReceivePackage);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RefreshMapNpcCount", _m_RefreshMapNpcCount);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestEnterClientDungeon", _m_RequestEnterClientDungeon);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestExitClientDungeon", _m_RequestExitClientDungeon);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "onMapNpcCountRefresh", _e_onMapNpcCountRefresh);
            
@@ -453,35 +452,6 @@
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_RequestExitClientDungeon(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.HazyGrassModel gen_to_be_invoked = (Snxxz.UI.HazyGrassModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    
                    gen_to_be_invoked.RequestExitClientDungeon(  );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]

 System/Dungeon/DungeonFightWin.cs

@@ -284,11 +284,11 @@
                                var crossServerBossModel = ModelCenter.Instance.GetModel<CrossServerBossModel>();

                                crossServerBossModel.RequestExit();

                                break;

                            case ClientTreasureDungeon.Client_DataMap:

                                ClientTreasureDungeon.RequestExit();

                            case 4000:

                                ClientDungeonStageUtility.ExitNormalClientDungeon();

                                break;

                            case ClientHazyPreciousDungeon.DATAMAP:

                                ClientHazyPreciousDungeon.RequestExit();

                            case 31190:

                                ClientDungeonStageUtility.ExitNormalClientDungeon();

                                break;

                            default:

                                model.ExitCurrentDungeon();

@@ -368,8 +368,8 @@
            {

                switch (ClientDungeonStageUtility.clientMapId)

                {

                    case ClientTreasureDungeon.Client_DataMap:

                        ClientTreasureDungeon.RequestExit();

                    case 4000:

                        ClientDungeonStageUtility.ExitNormalClientDungeon();

                        break;

                }

                return;


 System/Dungeon/DungeonGetTreasureVictoryWin.cs

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

            if (ClientDungeonStageUtility.isClientDungeon)

            {

                ClientTreasureDungeon.RequestExit();

                ClientDungeonStageUtility.ExitNormalClientDungeon();

            }

            else

            {


 System/Dungeon/DungeonModel.cs

@@ -961,7 +961,7 @@
                        WindowCenter.Instance.Open<JadeDynastyDamageRankWin>();

                    }

                    break;

                case ClientHazyPreciousDungeon.DATAMAP:

                case 31190:

                    if (!WindowCenter.Instance.IsOpen<DungeonMissionDetailsWin>())

                    {

                        WindowCenter.Instance.Open<DungeonMissionDetailsWin>();


 System/Dungeon/TreasureDungeonMissionHintWin.cs

@@ -51,7 +51,7 @@
            model.demonDungeonChallengeNext += ChallengeNextEvent;



            if (ClientDungeonStageUtility.isClientDungeon

                && ClientDungeonStageUtility.clientMapId == ClientTreasureDungeon.Client_DataMap)

                && ClientDungeonStageUtility.clientMapId == 4000)

            {

                treasureId = 101;

            }

@@ -159,7 +159,7 @@
            var dungeonId = 0;

            if (ClientDungeonStageUtility.isClientDungeon)

            {

                dungeonId = dungeonModel.GetDungeonId(ClientTreasureDungeon.Client_DataMap, 0);

                dungeonId = dungeonModel.GetDungeonId(4000, 0);

            }

            else

            {


 System/FindPrecious/PersonalBossModel.cs

@@ -176,6 +176,12 @@


        }



        public void RequestGotoDungeon(int _bossId)

        {

            var config = PersonalBossConfig.Get(_bossId);

            ClientDungeonStageUtility.GotoNormalClientDungeon(PERSONALBOSS_MAPID, PERSONALBOSS_MAPID, config.lineId);

        }



        public void OnMapInitOk()

        {

            var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();


 System/HazyRegion/ClientHazyDemonKingStage.cs

@@ -197,7 +197,7 @@
                if (stepTimer >= existTime)

                {

                    step = Step.Exit;

                    model.RequestExitClientDungeon();

                    ClientDungeonStageUtility.ExitNormalClientDungeon();

                }

                break;

        }

@@ -244,7 +244,7 @@
    {

        if (GUILayout.Button("Exit"))

        {

            model.RequestExitClientDungeon();

            ClientDungeonStageUtility.ExitNormalClientDungeon();

        }

    }

#endif


 System/HazyRegion/ClientHazyGrassStage.cs

@@ -229,7 +229,7 @@
    {

        if (GUILayout.Button("Exit"))

        {

            model.RequestExitClientDungeon();

            ClientDungeonStageUtility.ExitNormalClientDungeon();

        }

    }

#endif


 System/HazyRegion/ClientHazyPreciousDungeon.cs

File was deleted

 System/HazyRegion/ClientHazyPreciousDungeon.cs.meta

File was deleted

 System/HazyRegion/HazyDemonKingModel.cs

@@ -13,8 +13,6 @@


        public bool IsInDungeon { get; private set; }



        bool requireExitClientDungeon = false;



        public int invincibleBuffId { get; private set; }



        public const int Client_MapID = 2000;

@@ -63,12 +61,6 @@
            GA_Hero.OnStopBeAttacked -= OnStopBeAttacked;



            m_AttackHeroPlayers.Clear();



            if (requireExitClientDungeon)

            {

                requireExitClientDungeon = false;

                ClientDungeonStageUtility.RequestExitClientDungeon();

            }



            IsInDungeon = false;

            if (IsInDemonKingDungeon(mapId))

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

        {

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

            ClientDungeonStageUtility.RequestStartClientDungeon(config.dungeonId, config.lineId,(dungeonInfo,isOk)=> 
            {

                var hero = PlayerDatas.Instance.hero;

                if (hero != null)

                {

                    hero.StopAll();

                }

                MapTransferUtility.Instance.Clear();

                ClientDungeonStageUtility.SetClientDungeon(true, Client_MapID);

                StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()

                {

                    toMapId = Client_MapID,

                    toLineId = 0,

                    needEmpty = true,

                    needLoadResource = true,

                    serverType = ServerType.Main,

                    isClientLoadMap = true

                });



                PlayerDatas.Instance.baseData.mainServerMapIdRecord = PlayerDatas.Instance.baseData.MapID;

                PlayerDatas.Instance.baseData.MapID = Client_MapID;

                var attackMode = new C030A_tagCChangeAttackMode();

                attackMode.Mode = (byte)E_AttackMode.Contest;

                GameNetSystem.Instance.PushPackage(attackMode, ServerType.Main);

            });

        }



        public void RequestExitClientDungeon()

        {

            requireExitClientDungeon = true;



            ClientDungeonStageUtility.SetClientDungeon(false, 0);

            PlayerDatas.Instance.extersion.pkState = 0;

            ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();



            PlayerDatas.Instance.baseData.MapID = PlayerDatas.Instance.baseData.mainServerMapIdRecord;

            StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()

            {

                toMapId = PlayerDatas.Instance.baseData.MapID,

                toLineId = 0,

                needEmpty = true,

                needLoadResource = true,

                serverType = ServerType.Main,

                isClientLoadMap = true,

                refreshPlayerDatas=true

            });

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

        }

    }




 System/HazyRegion/HazyDemonKingVictoryWin.cs

@@ -185,7 +185,7 @@
        {

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

            {

                ModelCenter.Instance.GetModel<HazyDemonKingModel>().RequestExitClientDungeon();

                ClientDungeonStageUtility.ExitNormalClientDungeon();

            }

            else

            {


 System/HazyRegion/HazyGrassModel.cs

@@ -17,8 +17,6 @@


        public bool IsInDungeon { get; private set; }



        bool requireExitClientDungeon = false;



        public event Action onMapNpcCountRefresh;



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

@@ -71,12 +69,6 @@
            var mapId = PlayerDatas.Instance.baseData.MapID;



            m_MapNpcCount.Clear();



            if (requireExitClientDungeon)

            {

                requireExitClientDungeon = false;

                ClientDungeonStageUtility.RequestExitClientDungeon();

            }



            IsInDungeon = false;

            if (IsInGrassDungeon(mapId))

@@ -291,57 +283,8 @@
        public void RequestEnterClientDungeon()

        {

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





            MapTransferUtility.Instance.Clear();

            ClientDungeonStageUtility.RequestStartClientDungeon(config.dungeonId, config.lineId,(dungeonInfo,isOk)=> 
            {

                var mapId = GetClientMapId(hazyRegionModel.processingIncidentId);



                var hero = PlayerDatas.Instance.hero;

                if (hero != null)

                {

                    hero.StopAll();

                }



                ClientDungeonStageUtility.SetClientDungeon(true, (ushort)mapId);

                StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()

                {

                    toMapId = mapId,

                    toLineId = 0,

                    needEmpty = true,

                    needLoadResource = true,

                    serverType = ServerType.Main,

                    isClientLoadMap = true

                });



                PlayerDatas.Instance.baseData.mainServerMapIdRecord = PlayerDatas.Instance.baseData.MapID;

                PlayerDatas.Instance.baseData.MapID = (ushort)mapId;

                var attackMode = new C030A_tagCChangeAttackMode();

                attackMode.Mode = (byte)E_AttackMode.Peace;

                GameNetSystem.Instance.PushPackage(attackMode, ServerType.Main);

            });



        }



        public void RequestExitClientDungeon()

        {

            requireExitClientDungeon = true;

            ClientDungeonStageUtility.SetClientDungeon(false, 0);

            PlayerDatas.Instance.extersion.pkState = 0;

            ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();



            PlayerDatas.Instance.baseData.MapID = PlayerDatas.Instance.baseData.mainServerMapIdRecord;

            StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()

            {

                toMapId = PlayerDatas.Instance.baseData.MapID,

                toLineId = 0,

                needEmpty = true,

                needLoadResource = true,

                serverType = ServerType.Main,

                isClientLoadMap = true,

                refreshPlayerDatas=true

            });

            var mapId = GetClientMapId(hazyRegionModel.processingIncidentId);

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

        }

    }

}

 System/HazyRegion/HazyRegionModel.cs

@@ -522,7 +522,7 @@
                    break;

                case HazyRegionIncidentType.Precious:

                    BossShowModel.Instance.reqDungeonLineId = 0;

                    ClientHazyPreciousDungeon.RequestEnter();

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

                    break;

            }

        }


 System/Treasure/ClientTreasureDungeon.cs

File was deleted

 System/Treasure/ClientTreasureDungeonStage.cs

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

        if (!IsCompleteDialogue)

        {

            ClientTreasureDungeon.RequestExit();

            ClientDungeonStageUtility.ExitNormalClientDungeon();

        }

    }




 System/Treasure/HumanTreasureWin.cs

@@ -327,7 +327,7 @@
            {

                if (model.selectedTreasure == 101)

                {

                    ClientTreasureDungeon.RequestEnter();

                    ClientDungeonStageUtility.GotoNormalClientDungeon(4000, 0, 0);

                    return;

                }

                if (PlayerDatas.Instance.baseData.LV >= config.ChallengeLevel)