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

client_Wu Xijin

2019-04-09 233ae29bac7c90f9c2ed798a3457c7b3c1fd549e

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

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs

@@ -305,7 +305,7 @@
                        if (_sTarget.CurHP == 0 && !(_cTarget is GActorPlayerBase))

                        {

                            _cTarget.ActorInfo.ResetHp((int)_sTarget.CurHP, (short)_sTarget.CurHPEx);

                            _cTarget.Die(vNetData.ObjID);

                            _cTarget.Die(vNetData.ObjID, 0, _sTarget.AttackType);

                        }

                        else

                        {

@@ -726,7 +726,7 @@
                if (_sTarget.CurHP == 0 && !(_cTarget is GActorPlayerBase))

                {

                    _cTarget.ActorInfo.ResetHp((int)_sTarget.CurHP, (short)_sTarget.CurHPEx);

                    _cTarget.Die(vNetData.ObjID);

                    _cTarget.Die(vNetData.ObjID, 0, _sTarget.AttackType);

                }

                else

                {


 Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs

@@ -210,7 +210,7 @@
                if (_sTarget.CurHP == 0)

                {

                    _cTarget.ActorInfo.ResetHp((int)_sTarget.CurHP);

                    _cTarget.Die(vNetData.ObjID);

                    _cTarget.Die(vNetData.ObjID, 0, _sTarget.AttackType);

                }

                else

                {


 Fight/Actor/Skill/AttackHandler.cs

@@ -132,7 +132,7 @@


            if (CheckPull(attacker, target, soConfig.bodyControlId))

            {

                target.StartBeatBack(attacker.ServerInstID, soConfig.bodyControlId, MathUtility.ForwardXZ(target.Pos, attacker.Pos));

                target.StartBeatBack(attacker.ServerInstID, soConfig.bodyControlId, MathUtility.ForwardXZ(target.Pos, attacker.Pos), (HurtAttackType)attackType);

            }

        }



@@ -247,7 +247,7 @@


        if (canDie && target.ActorInfo.RealHp == 0)

        {

            target.Die(attacker.ServerInstID, soConfig.deadFlyId);

            target.Die(attacker.ServerInstID, soConfig.deadFlyId, (byte)attackType);

        }



        if (target.ActorInfo.serverDie

@@ -701,11 +701,19 @@
        {

            attackType = (byte)HurtAttackType.ZhuXianAtk;

        }

        else if (_isLucky)

        else if (_isLucky

#if UNITY_EDITOR

        || RuntimeLogUtility.s_ForceLuckHit

#endif

        )

        {

            attackType = (byte)HurtAttackType.LuckyHit;

        }

        else if (_isCrit)

        else if (_isCrit

#if UNITY_EDITOR

        || RuntimeLogUtility.s_ForceSupperHit

#endif

        )

        {

            attackType = (byte)HurtAttackType.SuperHit;

        }


 Fight/Actor/State/SMB/Dead_4.cs

@@ -4,6 +4,7 @@
{

    public uint killServerInstID;

    public Vector3 killerPos;

    public byte killHurtType;



    public int deadFlyId;

    private float m_EnterGroundHeight;

@@ -68,6 +69,12 @@
            {

                m_Factor = m_SoDeadFly.curve.keys[m_SoDeadFly.curve.length - 1].time;

                m_Factor = m_Factor / m_SoDeadFly.hDuration;



                if (GeneralDefine.AtkTypeIncreasePushDis.ContainsKey(killHurtType))

                {

                    m_Factor *= GeneralDefine.AtkTypeIncreasePushDis[killHurtType];

                }



                m_FlyStartTime = Time.time;

                m_Step = 0;

            }


 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -378,7 +378,7 @@


                if (_target.ActorInfo.serverDie)

                {

                    _target.Die(owner.ServerInstID);

                    _target.Die(owner.ServerInstID, 0, _hurtObj.AttackType);

                }

                else

                {

@@ -404,7 +404,7 @@


                if (_target.ActorInfo.serverDie)

                {

                    _target.Die(owner.ServerInstID);

                    _target.Die(owner.ServerInstID, 0, m_CacheSkill.hurtClientList[i].AttackType);

                }

            }



@@ -419,7 +419,7 @@


                if (_target.ActorInfo.serverDie)

                {

                    _target.Die(owner.ServerInstID);

                    _target.Die(owner.ServerInstID, 0, m_CacheSkill.hurtClntFightNpcList[i].AttackType);

                }

            }

        }


 Fight/GameActor/GActor.cs

@@ -31,6 +31,7 @@
        get { return m_KillServerInstID; }

        set { m_KillServerInstID = value; }

    }

    public byte killHurtType;

    public int belongEventID;

    private Vector3 m_BornPos;

    public virtual Vector3 BornPos


 Fight/GameActor/GActorFight.cs

@@ -180,10 +180,11 @@


    public abstract void RefreshLifeBar(ulong value);



    public void Die(uint killerServerInstID, int configID = 0)

    public void Die(uint killerServerInstID, int configID = 0, byte hurtType = (byte)HurtAttackType.Normal)

    {

        KillerServerInstID = killerServerInstID;

        DeadFlyID = configID;

        killHurtType = hurtType;



        Die();

    }

@@ -200,8 +201,9 @@
    private bool m_PushOrPull;

    private uint m_AttackerSID;

    private float m_LimitDistance;

    private float m_AddPer;



    public void StartBeatBack(uint attacker, int configID, Vector3 direction)

    public void StartBeatBack(uint attacker, int configID, Vector3 direction, HurtAttackType atkType = HurtAttackType.Normal)

    {

        SoBodyControl _config = ScriptableObjectLoader.LoadSoBodyControl(configID);



@@ -223,7 +225,16 @@
        m_BeatCurve = _config.curve;

        m_BeatTime = _config.duration;



        m_Factor = m_BeatCurve.keys[m_BeatCurve.length - 1].time;

        if (GeneralDefine.AtkTypeIncreasePushDis.ContainsKey((int)atkType))

        {

            m_AddPer = GeneralDefine.AtkTypeIncreasePushDis[(int)atkType];

        }

        else

        {

            m_AddPer = 1f;

        }



        m_Factor = m_BeatCurve.keys[m_BeatCurve.length - 1].time * m_AddPer;

        m_Factor = m_Factor / m_BeatTime;



        if (ActorType == GameObjType.gotNPC)


 Fight/GameActor/GActorNpcFight.cs

@@ -430,6 +430,7 @@
        {

            _dead.killServerInstID = KillerServerInstID;

            _dead.killerPos = KillerPos;

            _dead.killHurtType = killHurtType;

        }



        if (this is GA_NpcClientFightBoss


 System/GeneralConfig/GeneralDefine.cs

@@ -191,6 +191,7 @@


    public static int mainWinTopCloseTime { get; private set; }

    public static List<int> equipDecomposeScreen = new List<int>();

    public static Dictionary<int, float> AtkTypeIncreasePushDis = new Dictionary<int, float>();



    public static void Init()

    {

@@ -760,6 +761,14 @@
            mainWinTopCloseTime = GetInt("AutomaticSwitch");



            equipDecomposeScreen.AddRange(GetIntArray("EquipDecomposeScreen", 2));



            func = FuncConfigConfig.Get("AtkTypeIncreasePushDis");

            var _ks = func.Numerical1.Split('|');

            var _vs = func.Numerical2.Split('|');

            for (i = 0; i < _ks.Length; ++i)

            {

                AtkTypeIncreasePushDis[int.Parse(_ks[i])] = int.Parse(_vs[i]) * Constants.F_DELTA;

            }

        }

        catch (Exception ex)

        {


 Utility/RuntimeLogUtility.cs

@@ -19,6 +19,8 @@
    public static bool s_SkillEffectLog = false;

    public static bool s_ShowMapLine = false;

    public static bool s_ShowZZAtkValue = false;

    public static bool s_ForceSupperHit = false;

    public static bool s_ForceLuckHit = false;

    public static bool s_forceAutoFight

    {

        get

@@ -209,7 +211,8 @@


        if (GUILayout.Button("测试寻路"))

        {

            Debug.Log(PathFinder.WalkAble(_start3, _end3));

            // Debug.Log(PathFinder.WalkAble(_start3, _end3));

            MapTransferUtility.Instance.MoveToNPC(10904012);

        }



        EditorGUILayout.LabelField("Log存储路径", RuntimeLogUtility.s_LogPath);

@@ -235,16 +238,16 @@
        RuntimeLogUtility.s_ShowZZAtkValue = EditorGUILayout.Toggle("显示助战伤害", RuntimeLogUtility.s_ShowZZAtkValue);

        RuntimeLogUtility.TEST_CLIENT_PVP = EditorGUILayout.Toggle("模拟客户端PVP状态", RuntimeLogUtility.TEST_CLIENT_PVP);

        RuntimeLogUtility.TEST_CLIENT_PVP_AI = EditorGUILayout.Toggle("模拟客户端PVP的AI状态", RuntimeLogUtility.TEST_CLIENT_PVP_AI);



        RuntimeLogUtility.s_ForceSupperHit = EditorGUILayout.Toggle("强制暴击", RuntimeLogUtility.s_ForceSupperHit);

        RuntimeLogUtility.s_ForceLuckHit = EditorGUILayout.Toggle("强制会心一击", RuntimeLogUtility.s_ForceLuckHit);



        if (GUILayout.Button("创建PVP敌方"))

        {

            // var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(10101003, E_ActorGroup.Enemy);

            // _npc.BornPos = _npc.Pos = PlayerDatas.Instance.hero.Pos;

            // _npc.ActorInfo.ResetHp(9999999, -1, 9999999);



            var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightBoss>(10103001, E_ActorGroup.Enemy);

            var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(10101002, E_ActorGroup.Enemy);

            _npc.BornPos = _npc.Pos = PlayerDatas.Instance.hero.Pos;

            _npc.ActorInfo.ResetHp(5, -1, 5);



            // var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightBoss>(10103001, E_ActorGroup.Enemy);



            // GActorPlayerBase.PlayerInfo _playerInfo = new GActorPlayerBase.PlayerInfo();

            // _playerInfo.maxHp = (uint)PlayerDatas.Instance.extersion.MaxMP;

@@ -278,11 +281,13 @@
            // };



            // GAMgr.Instance.ReqClntPlayer<GA_PVPClientPlayer>(_playerInfo, E_ActorGroup.Player);

            // AdventureStage.Instance.Enter();

        }



        if (GUILayout.Button("重置PVP敌方"))

        {

            GA_PVPClientPlayer.Reset();

            // GA_PVPClientPlayer.Reset();

            // AdventureStage.Instance.Exit();

        }



        _navChkPos = EditorGUILayout.Vector3Field("检测点", _navChkPos);