少年修仙传客户端代码仓库
client_Hale
2019-07-08 47a07ebb1776885a46cd411f7c8aed2f46bcef1f
4434 【BUG】【主干】跨服pk,倒计时未结束人物可以移动
2个文件已修改
14 ■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -21,9 +21,11 @@
        public bool isClickCoolTime { get; set; }
        public event Action UpdateMatchStateEvent;
        private bool _isMatching;
        public bool IsMatching {
        public bool IsMatching
        {
            get { return _isMatching; }
            set {
            set
            {
                _isMatching = value;
                if (UpdateMatchStateEvent != null)
                {
@@ -225,6 +227,7 @@
                if (hero != null)
                {
                    hero.Behaviour.StopHandupAI(true);
                    hero.StopPathFind();
                }
            }
@@ -491,7 +494,7 @@
            }
            else
            {
                if (clientMatchClock != null )
                if (clientMatchClock != null)
                {
                    Clock.Stop(clientMatchClock);
                    clientMatchClock = null;
System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs
@@ -160,6 +160,7 @@
            PlayerDatas.Instance.FightRefreshPlayerHp((uint)maxHp);
            PlayerDatas.Instance.hero.IdleImmediate();
            PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
            PlayerDatas.Instance.hero.StopPathFind();
            PlayerDatas.Instance.hero.SkillMgr.ResetAllCD();
            opponentPlayer.Pos = ClientCrossServerOneVsOne.myPlace == 1 ? rightBornPoint : leftBornPoint;
@@ -199,7 +200,9 @@
            GA_PVPClientPlayer.AutoAI(true);
            opponentPlayer.SelectTarget = PlayerDatas.Instance.hero;
            PlayerDatas.Instance.hero.SelectTarget = opponentPlayer;
#if UNITY_EDITOR
            Debug.LogFormat("进入阶段:{0}", pkStageType);
#endif
        }
        public override void End()
@@ -241,12 +244,14 @@
                {
                    figthCompleted = true;
                    PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
                    PlayerDatas.Instance.hero.StopPathFind();
                    GA_PVPClientPlayer.AutoAI(false);
                }
                else if (timer >= duration)
                {
                    figthCompleted = true;
                    PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
                    PlayerDatas.Instance.hero.StopPathFind();
                    GA_PVPClientPlayer.AutoAI(false);
                    if (PlayerDatas.Instance.hero.ActorInfo.RealHp >= opponentPlayer.ActorInfo.RealHp)
                    {