Merge branch 'master' into 技能升级修改

client_linchunjie

2019-04-28 befbbfa399d03b62bc10959597c42fe9f1c52edb

 System/Message/RichMoveEvent.cs

@@ -45,6 +45,11 @@
            case RichTextEventEnum.MOVENPC:

                {

                    int id = int.Parse(href.mSplits["movenpc"]);

                    var movetype = 1;

                    if (href.mSplits.ContainsKey("movetype"))

                    {

                        movetype = int.Parse(href.mSplits["movetype"]);

                    }

                    var error = 0;

                    if (!TestMoveNpc(id, out error))

                    {

@@ -55,7 +60,7 @@
                    if (hero != null)

                    {

                        PlayerDatas.Instance.hero.Behaviour.StopHandupAI();

                        SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(id));

                        SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(id, movetype));

                    }

                }

                break;

@@ -202,7 +207,7 @@
        SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(new Vector3(m_Posx / 2, 0, m_Posy / 2)));

    }



    private IEnumerator WaitForSkillFinished(int id)

    private IEnumerator WaitForSkillFinished(int id, int movetype)

    {

        GA_Hero _hero = PlayerDatas.Instance.hero;



@@ -227,7 +232,7 @@
            yield break;

        }



        MapTransferUtility.Instance.MoveToNPC(id);

        MapTransferUtility.Instance.MoveToNPC(id, 0, movetype == 1);

    }



    private IEnumerator WaitForSkillFinished(Vector3 pos)