From 0c1843f3e1e30993c3a13822da9f61b4b57d091d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 13 九月 2018 15:21:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Achievement/AchievementGotoPart1.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/System/Achievement/AchievementGotoPart1.cs b/System/Achievement/AchievementGotoPart1.cs
index b5cd718..203c33c 100644
--- a/System/Achievement/AchievementGotoPart1.cs
+++ b/System/Achievement/AchievementGotoPart1.cs
@@ -314,7 +314,8 @@
public static void GotoSpSkillLevelUp(int _achievementId)
{
var config = Config.Instance.Get<SuccessConfig>(_achievementId);
- var skillId = config.Condition[0];
+ var index = PlayerDatas.Instance.baseData.Job - 1;
+ var skillId = index < config.Condition.Length ? config.Condition[index] : config.Condition[0];
var treasureId = 0;
var humanTreasures = treasureModel.GetTreasureCategory(TreasureCategory.Human);
@@ -330,13 +331,27 @@
}
}
+ var skillConfig = Config.Instance.Get<SkillConfig>(skillId);
+ var treasureConfig = Config.Instance.Get<TreasureConfig>(treasureId);
+
if (treasureId != 0)
{
- treasureModel.currentCategory = TreasureCategory.Human;
- treasureModel.selectedTreasure = treasureId;
- treasureModel.selectedPotential = skillId;
+ if (!FuncOpen.Instance.IsFuncOpen(82))
+ {
+ FuncOpen.Instance.ProcessorFuncErrorTip(82);
+ return;
+ }
- guideAchievementId = _achievementId;
+ Treasure treasure;
+ if (treasureModel.TryGetTreasure(treasureId, out treasure))
+ {
+ if (!treasure.IsHighestStage)
+ {
+ SysNotifyMgr.Instance.ShowTip("TreasureSkillUnGet", skillConfig.SkillName, treasureConfig.Name);
+ return;
+ }
+ guideAchievementId = _achievementId;
+ }
}
}
--
Gitblit v1.8.0