From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Skill/SkillModel.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/System/Skill/SkillModel.cs b/System/Skill/SkillModel.cs
index 9b3abd8..7f93764 100644
--- a/System/Skill/SkillModel.cs
+++ b/System/Skill/SkillModel.cs
@@ -49,7 +49,6 @@
public bool jumpToPass { get; set; }
public int minTaskHole { get; private set; }
public int maxTaskHole { get; private set; }
- public int immediatelyUnlockTask { get; private set; }
void ParseConfig()
{
for (int i = 1; i <= 3; i++)
@@ -86,8 +85,6 @@
passEquipCnt = int.Parse(funcCfg.Numerical2);
taskHoleDict = ConfigParse.GetDic<int, int>(funcCfg.Numerical4);
}
- funcCfg = Config.Instance.Get<FuncConfigConfig>("PassiveSkillTask");
- immediatelyUnlockTask = 0;//int.Parse(funcCfg.Numerical2);
funcCfg = Config.Instance.Get<FuncConfigConfig>("PassSkillEquipGetWay");
if (funcCfg != null)
{
@@ -366,7 +363,7 @@
}
PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } }
-
+ PlayerMainDate mainData { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
public void SendEquipPassSkill(int _page, int _index, int _skillId)
{
var pak = new CB407_tagCMPassiveSet();
@@ -662,7 +659,7 @@
foreach (var hole in taskHoleDict.Keys)
{
var taskId = taskHoleDict[hole];
- if (taskId == immediatelyUnlockTask)
+ if (IsImmediatelyUnlock(hole))
{
var config = Config.Instance.Get<PyTaskConfig>(taskId);
if (PlayerDatas.Instance.baseData.LV >= config.lv
@@ -675,6 +672,16 @@
}
}
+ public bool IsImmediatelyUnlock(int hole)
+ {
+ if (taskHoleDict.ContainsKey(hole))
+ {
+ var taskId = taskHoleDict[hole];
+ return mainData.TaskId_Skill.Contains(taskId);
+ }
+ return false;
+ }
+
public void SetTaskHoleRemind()
{
DayRemind.Instance.SetDayRemind(DayRemind.TASK_SKILL_HOLE, true);
--
Gitblit v1.8.0