From 47a07ebb1776885a46cd411f7c8aed2f46bcef1f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 08 七月 2019 16:53:37 +0800
Subject: [PATCH] 4434 【BUG】【主干】跨服pk，倒计时未结束人物可以移动
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 9 ++++++---
System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs | 5 +++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 8cd8e29..5547f17 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/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;
diff --git a/System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs b/System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs
index c5eba36..6866a42 100644
--- a/System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs
+++ b/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)
{
--
Gitblit v1.8.0