From 17c684a98dd8811fd22ced8da1590e08d3bc4831 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 10:32:26 +0800
Subject: [PATCH] Merge branch 'master' into ViewOtherPlayer
---
System/Message/RichMoveEvent.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/System/Message/RichMoveEvent.cs b/System/Message/RichMoveEvent.cs
index 110e202..8777464 100644
--- a/System/Message/RichMoveEvent.cs
+++ b/System/Message/RichMoveEvent.cs
@@ -45,6 +45,11 @@
case RichTextEventEnum.MOVENPC:
{
int id = int.Parse(href.mSplits["movenpc"]);
+ var movetype = 1;
+ if (href.mSplits.ContainsKey("movetype"))
+ {
+ movetype = int.Parse(href.mSplits["movetype"]);
+ }
var error = 0;
if (!TestMoveNpc(id, out error))
{
@@ -55,7 +60,7 @@
if (hero != null)
{
PlayerDatas.Instance.hero.Behaviour.StopHandupAI();
- SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(id));
+ SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(id, movetype));
}
}
break;
@@ -202,7 +207,7 @@
SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(new Vector3(m_Posx / 2, 0, m_Posy / 2)));
}
- private IEnumerator WaitForSkillFinished(int id)
+ private IEnumerator WaitForSkillFinished(int id, int movetype)
{
GA_Hero _hero = PlayerDatas.Instance.hero;
@@ -227,7 +232,7 @@
yield break;
}
- MapTransferUtility.Instance.MoveToNPC(id);
+ MapTransferUtility.Instance.MoveToNPC(id, 0, movetype == 1);
}
private IEnumerator WaitForSkillFinished(Vector3 pos)
--
Gitblit v1.8.0