Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-10-31 e05ecbdfd692fe613606501d2ad2bcc0c3b7b209

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 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;
            }

 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: