Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/DailyQuest/DailyQuestWin.cs

@@ -32,6 +32,7 @@
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        PlayerTaskDatas taskModel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } }

        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }

        MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }



        public int guidingDailyQuestId = 0;



@@ -84,8 +85,8 @@
            if (guidingDailyQuestId != 0)

            {

                var preferTimeLimit = false;

                var dailyQuests = model.GetDailyQuestlist();

                foreach (var quest in dailyQuests.Keys)

                var dailyQuests = model.GetDailyQuests();

                foreach (var quest in dailyQuests)

                {

                    var dailyQuestState = model.GetQuestState(quest);

                    DailyQuestOpenTime openTime;

@@ -295,6 +296,13 @@
                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

                    WindowCenter.Instance.Open<PetWin>(false, 2);

                    break;

                case DailyQuestType.KillMonster:

                    var point = mapModel.GetRecommendHangPoint();

                    var mapEventConfig = Config.Instance.Get<MapEventPointConfig>(point);

                    mapModel.wannaLookLocalMap = mapEventConfig.MapID;

                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

                    WindowCenter.Instance.Open<LocalMapWin>();

                    break;

                default:

                    break;

            }