Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-09-21 a38ae4f8be0106cc7209e977965ebce90bcc4ded

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 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;



@@ -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;

            }


 Utility/EnumHelper.cs

@@ -309,6 +309,7 @@
    PersonalBoss = 25,

    ElderGodArea = 26,

    FairyGrabBoss = 27,

    KillMonster=28,

}



public enum ActivityPrepareType