Merge branch 'master' into JadeDynastyBoss

client_linchunjie

2019-01-19 e279a824f325ca10e076418be9107a4c8d01e5f7

Merge branch 'master' into JadeDynastyBoss

 System/FairyAu/FairyLeagueResPointBehaviour.cs

@@ -195,7 +195,7 @@
            var _hero = PlayerDatas.Instance.hero;

            if (_hero != null)

            {

                _hero.Behaviour.StopHandupAI();

                _hero.Behaviour.StopHandupAI(true);

                SnxxzGame.Instance.StartCoroutine(Co_HeroMoveToPos(new Vector3(_buffPos.x, 0, _buffPos.y),

                    _help.fairyWarBuffs[_index].NPCID));

            }