Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/FairyAu/FairyGrabBossHelpBehaviour.cs

@@ -73,6 +73,12 @@
                    model.RemoveHelp();

                    return;

                }

                if (PlayerDatas.Instance.extersion.bossState == 1)

                {

                    SysNotifyMgr.Instance.ShowTip("Boss_Leave");

                    model.RemoveHelp();

                    return;

                }

                if (!model.IsBossAlive(help.npcId))

                {

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyGrabBossNotAlive"), (bool isOk) =>

@@ -85,6 +91,7 @@
                      });

                    return;

                }

                model.RemoveHelp();

                MapTransferUtility.Instance.MoveToNPC(help.npcId);

            }

        }