Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 System/Dungeon/DungeonModel.cs

@@ -557,6 +557,7 @@
            inspireRemindEffective = false;

            inspireNoRemind = false;

            ModelCenter.Instance.GetModel<GatherSoulDungeonModel>().ResetDungeonMessage();

            ModelCenter.Instance.GetModel<FairyFeastModel>().ResetHelpMessage();

        }



        public void UpdateRecords(HA320_tagMCPlayerFBInfoData.tagMCFBInfo[] _serverInfos)

@@ -813,6 +814,7 @@
                    {

                        PlayerDatas.Instance.hero.ShowArrow(false);

                    }

                    ModelCenter.Instance.GetModel<FairyFeastModel>().OnReceiveHelpMessage(_mission);

                    if (GetDungeonHintId(mapId, lineId) != 0)

                    {

                        if (!WindowCenter.Instance.IsOpen<DungeonMissionHintWin>())