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

client_linchunjie

2019-04-25 e1dcfa049cd7f676fb56c91bee6737dce0aed7e4

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

 Fight/Actor/Skill/AttackHandler.cs

@@ -206,10 +206,24 @@
                    }

                    else if (target is GA_NpcClientFightNorm)

                    {

                        if ((target as GA_NpcClientFightNorm).NpcConfig.AIType == 198)

                        var _cnpc = target as GA_NpcClientFightNorm;

                        if (_cnpc.NpcConfig.AIType == 198)

                        {

                            _doReduceHp = false;

                        }

                        else if (_cnpc.lockHp > 0)

                        {

                            var _lockHp = (ulong)(target.ActorInfo.RealMaxHp * _cnpc.lockHp);

                            if ((ulong)hurtValue >= target.ActorInfo.Hp)

                            {

                                target.ActorInfo.ResetHp((int)_lockHp);

                                _doReduceHp = false;

                            }

                            else if (target.ActorInfo.Hp - (ulong)hurtValue < _lockHp)

                            {

                                hurtValue = (int)(target.ActorInfo.Hp - _lockHp);

                            }

                        }

                    }



                    if (_doReduceHp)


 Fight/GameActor/GA_NpcClientCollect.cs

@@ -6,11 +6,6 @@

public class GA_NpcClientCollect : GA_NpcClientFunc
{
    public static UnityAction<uint> OnCollectFinished;
    private static List<uint> m_ArrivedList = new List<uint>();

    private bool m_IsMainWinOpen = false;

    protected override void OnInit(GameNetPackBasic package)
    {
        base.OnInit(package);
@@ -77,12 +72,6 @@
    protected override void OnFixedUpdate()
    {
        base.OnFixedUpdate();

        if (!m_IsMainWinOpen)
        {
            m_IsMainWinOpen = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
            return;
        }

        GA_Hero _hero = PlayerDatas.Instance.hero;


 Fight/GameActor/GA_NpcClientFightBoss.cs

@@ -13,10 +13,8 @@
    /// </summary>
    public static UnityAction<uint, int, ulong, ulong> s_HpRefresh;

    protected override void OnInit(GameNetPackBasic package)
    protected sealed override void InitAI()
    {
        base.OnInit(package);

        if (NpcConfig.NPCID == 30902001)
        {
            m_AIHandler = new AI_Boss_HYQ(this, BornPos);

 Fight/GameActor/GA_NpcClientFightNorm.cs

@@ -135,6 +135,13 @@
        m_ProcessManager = new ProcessManager();
        m_ProcessManager.Load(this);

        InitAI();

        heroAttacked = false;
    }

    protected virtual void InitAI()
    {
        if (NpcConfig.AIType == 1)
        {
            m_AIHandler = new AI_Npc_200(this, BornPos);
@@ -143,8 +150,6 @@
        {
            m_AIHandler = new AI_Npc_198(this, BornPos);
        }

        heroAttacked = false;
    }

    public override void OnClick()

 Fight/GameActor/GActor.cs

@@ -694,8 +694,8 @@
        {

            if (!TryGetValidPos(_clntPos, ref _adjustPos))

            {

                Debug.LogWarningFormat("服务端给定坐标: {0} 映射至客户端坐标: {1} 为客户端无法矫正的障碍点...当前地图: {2}",

                    new Vector2(sPosX, sPosY), new Vector2(_clntPos.x, _clntPos.z), PlayerDatas.Instance.baseData.MapID);

                Debug.LogWarningFormat("对象: {3} : 服务端给定坐标: {0} 映射至客户端坐标: {1} 为客户端无法矫正的障碍点...当前地图: {2}",

                    new Vector2(sPosX, sPosY), new Vector2(_clntPos.x, _clntPos.z), PlayerDatas.Instance.baseData.MapID, ServerInstID);

                return;

            }

        }

@@ -703,8 +703,8 @@
        float _groundHeight = Pos.y;

        if (!CollisionUtility.TryGetGroundHeight(_adjustPos, out _groundHeight))

        {

            Debug.LogErrorFormat("服务端给定坐标: {0} 映射至客户端坐标: {1} 并且矫正后: {2}客户端无法从此点计算出地板高度...",

                new Vector2(sPosX, sPosY), new Vector2(_clntPos.x, _clntPos.y), new Vector2(_adjustPos.x, _adjustPos.z));

            Debug.LogErrorFormat("对象: {3} : 服务端给定坐标: {0} 映射至客户端坐标: {1} 并且矫正后: {2}客户端无法从此点计算出地板高度...",

                new Vector2(sPosX, sPosY), new Vector2(_clntPos.x, _clntPos.y), new Vector2(_adjustPos.x, _adjustPos.z), ServerInstID);

        }



        _adjustPos.y = _groundHeight;