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

xingchen Qiu

2019-04-10 b9d3eab54318ee83a95980bd1e5f5a9feb52b9ae

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

 Core/GameEngine/Model/Config/JobSetupConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:           Fish

//    [  Date ]:           Thursday, February 14, 2019

//    [  Date ]:           Wednesday, April 10, 2019

//--------------------------------------------------------



using System.Collections.Generic;

@@ -36,6 +36,7 @@
    public readonly int[] HpSkillList;

    public readonly int[] GainSkillList;

    public readonly int MoveLimitDist;

    public readonly int[] RollBreakSkillList;



    public JobSetupConfig()

    {

@@ -127,6 +128,13 @@
            }



            int.TryParse(tables[22],out MoveLimitDist); 



            string[] RollBreakSkillListStringArray = tables[23].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            RollBreakSkillList = new int[RollBreakSkillListStringArray.Length];

            for (int i = 0; i < RollBreakSkillListStringArray.Length; i++)

            {

                int.TryParse(RollBreakSkillListStringArray[i], out RollBreakSkillList[i]);

            }

        }

        catch (Exception ex)

        {


 Core/GameEngine/Model/Config/JobSetupConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 44af7bf1f77c36a4fbdbd0a1eec24768
timeCreated: 1550120895
timeCreated: 1554882392
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/GameActor/GA_Hero.cs

@@ -936,29 +936,26 @@
            }

        }



        if (!PreFightMission.Instance.IsFinished())

        {

            if (skillID == 190)

            {

                if (State != E_ActorState.Roll)

                {

                    if (SkillMgr.CurCastSkill != null)

                    {

                        SkillMgr.CurCastSkill.SkillCompelete = true;

                    }

                    int _id = SkillMgr.CurCastSkill.id;



                    foreach (var _skillID in JobSetup.RollBreakSkillList)

                    {

                        if (_id == _skillID)

                        {

                            SkillMgr.CurCastSkill.SkillCompelete = true;

                    Behaviour.StartKillUntilDieAI(skillID);

                    aiHandler.currentType = E_HeroAIType.None;

                    Behaviour.DoAttack(_skill);

                            return;

                        }

                    }



                    return;

                }

            }

            else

            {

                if (!PreFightMission.Instance.IsHeroCanCastSkill)

                {

                    return;

                }

            }

        }