From e05ecbdfd692fe613606501d2ad2bcc0c3b7b209 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 31 十月 2018 16:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs | 3 ++-
Fight/PrepareHandler.cs | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs
index 27c483d..f850067 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs
@@ -34,7 +34,8 @@
if (_hero == null
|| _hero.MovingState == E_MovingState.Ride
- || _hero.IsPolyMorph)
+ || _hero.IsPolyMorph
+ || _hero.IsCollect())
{
return;
}
diff --git a/Fight/PrepareHandler.cs b/Fight/PrepareHandler.cs
index 6a3ab7b..fc18605 100644
--- a/Fight/PrepareHandler.cs
+++ b/Fight/PrepareHandler.cs
@@ -103,7 +103,10 @@
_player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
if (_player != null)
{
- _player.Collect();
+ if (_player.MovingState != E_MovingState.Ride)
+ {
+ _player.Collect();
+ }
}
break;
@@ -162,10 +165,7 @@
_player = GAMgr.Instance.GetBySID(h0813.PlayerID) as GActorPlayerBase;
if (_player != null)
{
- if (_player.IsCollect())
- {
- _player.IdleImmediate();
- }
+ _player.IdleImmediate();
}
break;
case E_PrepareType.pstCatchPet:
--
Gitblit v1.8.0