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

client_Zxw

2018-11-13 d2dd33cc0ca421e276d50abc46688f5db83aa42b

 System/Achievement/AchievementModel.cs

@@ -179,7 +179,7 @@
                switch (config.Type)

                {

                    case 3:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();

                        WindowCenter.Instance.Close<TreasureBaseWin>();

                        WindowCenter.Instance.Open<MainInterfaceWin>();



                        var hasTask = taskmodel.GetQuestState(config.Condition[0]) != -1;

@@ -234,7 +234,7 @@
                                else

                                {

                                    taskmodel.DailyBountyMove();

                                    WindowCenter.Instance.Close<TreasureLevelUpWin>();

                                    WindowCenter.Instance.Close<TreasureBaseWin>();

                                    WindowCenter.Instance.Open<MainInterfaceWin>();

                                }

                            }

@@ -243,7 +243,7 @@
                    case 1:

                        if (PlayerDatas.Instance.baseData.LV < GeneralDefine.achievementEarlierStageLevel)

                        {

                            WindowCenter.Instance.Close<TreasureLevelUpWin>();

                            WindowCenter.Instance.Close<TreasureBaseWin>();

                            WindowCenter.Instance.Open<MainInterfaceWin>();

                            taskmodel.AutomaticTripToTask(taskmodel.currentMission);

                        }

@@ -257,7 +257,7 @@
                        break;

                    case 4:

                    case 86:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();

                        WindowCenter.Instance.Close<TreasureBaseWin>();

                        var mapModel = ModelCenter.Instance.GetModel<MapModel>();

                        var pointId = mapModel.GetRecommendHangPoint();

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

@@ -265,12 +265,12 @@
                        WindowCenter.Instance.Open<LocalMapWin>();

                        break;

                    case 36:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();

                        WindowCenter.Instance.Close<TreasureBaseWin>();

                        WindowCenter.Instance.Open<MainInterfaceWin>();

                        MapTransferUtility.Instance.MoveToNPC(config.Condition[0]);

                        break;

                    case 37:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();

                        WindowCenter.Instance.Close<TreasureBaseWin>();

                        WindowCenter.Instance.Open<MainInterfaceWin>();

                        MapTransferUtility.Instance.MoveToLocalMapPosition(config.Condition2.Vector3Parse());

                        break;

@@ -292,7 +292,7 @@
                        {

                            if (PlayerDatas.Instance.baseData.LV < GeneralDefine.achievementEarlierStageLevel)

                            {

                                WindowCenter.Instance.Close<TreasureLevelUpWin>();

                                WindowCenter.Instance.Close<TreasureBaseWin>();

                                WindowCenter.Instance.Open<MainInterfaceWin>();

                                taskmodel.AutomaticTripToTask(taskmodel.currentMission);

                            }

@@ -333,7 +333,7 @@
                        else

                        {

                            AchievementGoto.guideAchievementId = _achievementId;

                            WindowCenter.Instance.Close<TreasureLevelUpWin>();

                            WindowCenter.Instance.Close<TreasureBaseWin>();



                            playerPack.SetLookIndex(guid82);

                            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -358,7 +358,7 @@
                        {

                            AchievementGoto.guideAchievementId = _achievementId;

                            playerPack.SetLookIndex(guid83);

                            WindowCenter.Instance.Close<TreasureLevelUpWin>();

                            WindowCenter.Instance.Close<TreasureBaseWin>();

                            WindowCenter.Instance.Close<MainInterfaceWin>();

                            WindowCenter.Instance.Open<KnapSackWin>();

                        }

@@ -379,7 +379,7 @@
                        }

                        else

                        {

                            WindowCenter.Instance.Close<TreasureLevelUpWin>();

                            WindowCenter.Instance.Close<TreasureBaseWin>();



                            playerPack.SetLookIndex(guid84);

                            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -402,7 +402,7 @@
                        }

                        else

                        {

                            WindowCenter.Instance.Close<TreasureLevelUpWin>();

                            WindowCenter.Instance.Close<TreasureBaseWin>();



                            playerPack.SetLookIndex(guid85);

                            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -417,7 +417,7 @@
                        }

                        else

                        {

                            WindowCenter.Instance.Close<TreasureLevelUpWin>();

                            WindowCenter.Instance.Close<TreasureBaseWin>();



                            playerPack.SetLookIndex(guid90);

                            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -425,7 +425,7 @@
                        }

                        break;

                    case 109:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();

                        WindowCenter.Instance.Close<TreasureBaseWin>();



                        var skillId = SkillConfig.FindSkillByJob(config.Condition, PlayerDatas.Instance.baseData.Job);

                        if (skillId != 0)

@@ -483,7 +483,7 @@
                                }

                                treasureModel.currentCategory = TreasureCategory.Human;

                                treasureModel.selectedTreasure = treasureId;

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

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

                                {

                                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.TreasureCollectSoul);

                                }

@@ -491,7 +491,7 @@
                        }

                        break;

                    default:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();

                        WindowCenter.Instance.Close<TreasureBaseWin>();



                        WindowCenter.Instance.Open<MainInterfaceWin>();

                        break;