snxxz_scripts.git

parent: 9474c59d | 补丁 | 提交 | ignore whitespace

client_Wu Xijin

2019-01-05 6590678afe145b3548e31da1149366effcc4c514

5725 【前端】【1.5】跨服BOSS开发

9个文件已修改

	Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/Actor/AI/HeroAI_D5_Hlyy.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_Hero.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/Stage/Dungeon/DungeonStage.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/CrossServerBoss/CrossServerBossModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/CrossServerOneVsOne/CrossServerRewardModel.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonFightWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/TargetBriefInfoWin.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs

@@ -467,7 +467,7 @@
#endif



        // 跨服竞技场不检测反击逻辑

        if(CrossServerRewardModel.IsCrossServerOneVsOne())

        if(CrossServerOneVsOneModel.IsCrossServerOneVsOne())

        {

            return;

        }


 Fight/Actor/AI/HeroAI_D5_Hlyy.cs

@@ -39,7 +39,7 @@


        string _chkKey = (PlayerDatas.Instance.baseData.MapID * 100 + PlayerDatas.Instance.baseData.dungeonLineId).ToString();



        if (CrossServerRewardModel.IsCrossServerOneVsOne())

        if (Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne())

        {

            _chkKey = (PlayerDatas.Instance.baseData.MapID * 100).ToString();

        }

@@ -108,7 +108,7 @@
                // 未到达路点则寻路至路点

                if (_chkDistSqrt > .25f)

                {

                    _hero.MoveToPosition(m_PointList[m_Index], 0, CrossServerRewardModel.IsCrossServerOneVsOne());

                    _hero.MoveToPosition(m_PointList[m_Index], 0, Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne());

                }

                // 到达路点就去往下一个路点

                else


 Fight/GameActor/GA_Hero.cs

@@ -328,7 +328,7 @@
#if UNITY_EDITOR

            && RuntimeLogUtility.s_forceAutoFight

#endif

            && !CrossServerRewardModel.IsCrossServerOneVsOne())

            && !CrossServerOneVsOneModel.IsCrossServerOneVsOne())

        {

            if (!aiHandler.IsAuto() && !BossShowModel.Instance.BossShowing)

            {


 Fight/Stage/Dungeon/DungeonStage.cs

@@ -101,7 +101,7 @@
            WindowCenter.Instance.Open<AntiAddictionWin>();

        }



        if (CrossServerRewardModel.IsCrossServerOneVsOne())

        if (CrossServerOneVsOneModel.IsCrossServerOneVsOne())

        {

            _hero.SkillMgr.ResetAllCD();

        }


 System/CrossServerBoss/CrossServerBossModel.cs

@@ -9,7 +9,7 @@
    [XLua.LuaCallCSharp]
    public class CrossServerBossModel : Model
    {
        public const int DATA_MAPID = 0;
        public const int DATA_MAPID =32020;
        public const int REDPOINT = 77002;

        List<int> sortedBossIds = new List<int>();

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -98,6 +98,13 @@


        }



        public static bool IsCrossServerOneVsOne()//是否再跨服副本中

        {

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

            var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            return PlayerDatas.Instance.baseData.ExAttr5 == 1 && dataMapId== CrossServerDataMapId;

        }



        private void InitData()

        {

            CrossServerOneVsOnePKSeason.Instance.InitData();


 System/CrossServerOneVsOne/CrossServerRewardModel.cs

@@ -283,11 +283,6 @@
        GameNetSystem.Instance.SendInfo(c103);

    }



    public static bool IsCrossServerOneVsOne()//是否再跨服副本中

    {

        return PlayerDatas.Instance.baseData.ExAttr5 == 1;

    }



    public void ViewCrossPKBillboard(int ZoneID, int SeasonID)//(赛区，赛季) 查看跨服竞技场赛季排行榜 

    {

        ZoneRankingStruct zoneRanking = new ZoneRankingStruct();


 System/Dungeon/DungeonFightWin.cs

@@ -75,7 +75,7 @@
            m_Liquid.gameObject.SetActive(false);

            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            m_ExitDungeon.gameObject.SetActive(dataMapId != DemonJarModel.DEMONJAR_MAPID

                && !CrossServerRewardModel.IsCrossServerOneVsOne());

                && !CrossServerOneVsOneModel.IsCrossServerOneVsOne());

            m_ContainerAncient.gameObject.SetActive(dataMapId == 31160);

            m_BossInfosContainer.gameObject.SetActive(dataMapId == ElderGodAreaModel.ELDERGODAREA_MAPID || dataMapId == BossHomeModel.BOSSHOME_MAPID);

            m_GatherSoulDungeonBehaviour.gameObject.SetActive(dataMapId == GatherSoulDungeonModel.DUNGEON_MAPID);


 System/Dungeon/TargetBriefInfoWin.cs

@@ -27,7 +27,7 @@


    static void OnShowBossLifeBar(uint _instanceId, int _npcId, bool _show)

    {

        if (CrossServerRewardModel.IsCrossServerOneVsOne() && _show)

        if (CrossServerOneVsOneModel.IsCrossServerOneVsOne() && _show)

        {

            return;

        }

@@ -70,7 +70,7 @@


    static void OnRefreshBossLifeBar(uint _instanceId, int _npcId, ulong _hp, ulong _maxHp)

    {

        if (CrossServerRewardModel.IsCrossServerOneVsOne())

        if (CrossServerOneVsOneModel.IsCrossServerOneVsOne())

        {

            return;

        }

@@ -115,7 +115,7 @@


    static void OnShowPlayerLifeBar(uint _instanceId, bool _show)

    {

        if (CrossServerRewardModel.IsCrossServerOneVsOne() && _show)

        if (CrossServerOneVsOneModel.IsCrossServerOneVsOne() && _show)

        {

            return;

        }

@@ -135,7 +135,7 @@


    static void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp)

    {

        if (CrossServerRewardModel.IsCrossServerOneVsOne())

        if (CrossServerOneVsOneModel.IsCrossServerOneVsOne())

        {

            return;

        }

			@@ -467,7 +467,7 @@
			#endif

			// 跨服竞技场不检测反击逻辑
			if(CrossServerRewardModel.IsCrossServerOneVsOne())
			if(CrossServerOneVsOneModel.IsCrossServerOneVsOne())
			{
			return;
			}

			@@ -39,7 +39,7 @@

			string _chkKey = (PlayerDatas.Instance.baseData.MapID * 100 + PlayerDatas.Instance.baseData.dungeonLineId).ToString();

			if (CrossServerRewardModel.IsCrossServerOneVsOne())
			if (Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne())
			{
			_chkKey = (PlayerDatas.Instance.baseData.MapID * 100).ToString();
			}
			@@ -108,7 +108,7 @@
			// 未到达路点则寻路至路点
			if (_chkDistSqrt > .25f)
			{
			_hero.MoveToPosition(m_PointList[m_Index], 0, CrossServerRewardModel.IsCrossServerOneVsOne());
			_hero.MoveToPosition(m_PointList[m_Index], 0, Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne());
			}
			// 到达路点就去往下一个路点
			else

			@@ -328,7 +328,7 @@
			#if UNITY_EDITOR
			&& RuntimeLogUtility.s_forceAutoFight
			#endif
			&& !CrossServerRewardModel.IsCrossServerOneVsOne())
			&& !CrossServerOneVsOneModel.IsCrossServerOneVsOne())
			{
			if (!aiHandler.IsAuto() && !BossShowModel.Instance.BossShowing)
			{

			@@ -101,7 +101,7 @@
			WindowCenter.Instance.Open<AntiAddictionWin>();
			}

			if (CrossServerRewardModel.IsCrossServerOneVsOne())
			if (CrossServerOneVsOneModel.IsCrossServerOneVsOne())
			{
			_hero.SkillMgr.ResetAllCD();
			}

			@@ -9,7 +9,7 @@
			[XLua.LuaCallCSharp]
			public class CrossServerBossModel : Model
			{
			public const int DATA_MAPID = 0;
			public const int DATA_MAPID =32020;
			public const int REDPOINT = 77002;

			List<int> sortedBossIds = new List<int>();

			@@ -98,6 +98,13 @@

			}

			public static bool IsCrossServerOneVsOne()//是否再跨服副本中
			{
			var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();
			var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
			return PlayerDatas.Instance.baseData.ExAttr5 == 1 && dataMapId== CrossServerDataMapId;
			}

			private void InitData()
			{
			CrossServerOneVsOnePKSeason.Instance.InitData();

			@@ -283,11 +283,6 @@
			GameNetSystem.Instance.SendInfo(c103);
			}

			public static bool IsCrossServerOneVsOne()//是否再跨服副本中
			{
			return PlayerDatas.Instance.baseData.ExAttr5 == 1;
			}

			public void ViewCrossPKBillboard(int ZoneID, int SeasonID)//(赛区，赛季) 查看跨服竞技场赛季排行榜
			{
			ZoneRankingStruct zoneRanking = new ZoneRankingStruct();

			@@ -75,7 +75,7 @@
			m_Liquid.gameObject.SetActive(false);
			var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
			m_ExitDungeon.gameObject.SetActive(dataMapId != DemonJarModel.DEMONJAR_MAPID
			&& !CrossServerRewardModel.IsCrossServerOneVsOne());
			&& !CrossServerOneVsOneModel.IsCrossServerOneVsOne());
			m_ContainerAncient.gameObject.SetActive(dataMapId == 31160);
			m_BossInfosContainer.gameObject.SetActive(dataMapId == ElderGodAreaModel.ELDERGODAREA_MAPID \|\| dataMapId == BossHomeModel.BOSSHOME_MAPID);
			m_GatherSoulDungeonBehaviour.gameObject.SetActive(dataMapId == GatherSoulDungeonModel.DUNGEON_MAPID);

			@@ -27,7 +27,7 @@

			static void OnShowBossLifeBar(uint _instanceId, int _npcId, bool _show)
			{
			if (CrossServerRewardModel.IsCrossServerOneVsOne() && _show)
			if (CrossServerOneVsOneModel.IsCrossServerOneVsOne() && _show)
			{
			return;
			}
			@@ -70,7 +70,7 @@

			static void OnRefreshBossLifeBar(uint _instanceId, int _npcId, ulong _hp, ulong _maxHp)
			{
			if (CrossServerRewardModel.IsCrossServerOneVsOne())
			if (CrossServerOneVsOneModel.IsCrossServerOneVsOne())
			{
			return;
			}
			@@ -115,7 +115,7 @@

			static void OnShowPlayerLifeBar(uint _instanceId, bool _show)
			{
			if (CrossServerRewardModel.IsCrossServerOneVsOne() && _show)
			if (CrossServerOneVsOneModel.IsCrossServerOneVsOne() && _show)
			{
			return;
			}
			@@ -135,7 +135,7 @@

			static void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp)
			{
			if (CrossServerRewardModel.IsCrossServerOneVsOne())
			if (CrossServerOneVsOneModel.IsCrossServerOneVsOne())
			{
			return;
			}