| Core/GameEngine/Model/Config/SkillConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/Config/SkillConfig.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Skill/TalentModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Skill/TalentSeriesBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Skill/TalentSkillBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Skill/TalentWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Config/SkillConfig.cs
@@ -1,6 +1,6 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Thursday, May 03, 2018 // [ Date ]: Wednesday, September 26, 2018 //-------------------------------------------------------- using UnityEngine; @@ -60,6 +60,7 @@ public int LearnSkillReq { get ; private set ; } public int LearnSkillLV { get ; private set ; } public int LearnLVReq { get ; private set ; } public int LearnSkillPointReq { get ; private set ; } public int FightPower { get ; private set ; } public int LVUpCostMoneyType { get ; private set ; } public int LVUpCostMoney { get ; private set ; } @@ -190,51 +191,53 @@ LearnLVReq=IsNumeric(rawContents[48]) ? int.Parse(rawContents[48]):0; FightPower=IsNumeric(rawContents[49]) ? int.Parse(rawContents[49]):0; LearnSkillPointReq=IsNumeric(rawContents[49]) ? int.Parse(rawContents[49]):0; LVUpCostMoneyType=IsNumeric(rawContents[50]) ? int.Parse(rawContents[50]):0; FightPower=IsNumeric(rawContents[50]) ? int.Parse(rawContents[50]):0; LVUpCostMoney=IsNumeric(rawContents[51]) ? int.Parse(rawContents[51]):0; LVUpCostMoneyType=IsNumeric(rawContents[51]) ? int.Parse(rawContents[51]):0; LVUpCostExp=IsNumeric(rawContents[52]) ? int.Parse(rawContents[52]):0; LVUpCostMoney=IsNumeric(rawContents[52]) ? int.Parse(rawContents[52]):0; ClientActionLimit=IsNumeric(rawContents[53]) ? int.Parse(rawContents[53]):0; LVUpCostExp=IsNumeric(rawContents[53]) ? int.Parse(rawContents[53]):0; ClientSkillSeriesLimit=IsNumeric(rawContents[54]) ? int.Parse(rawContents[54]):0; ClientActionLimit=IsNumeric(rawContents[54]) ? int.Parse(rawContents[54]):0; SkillOfSeries=IsNumeric(rawContents[55]) ? int.Parse(rawContents[55]):0; ClientSkillSeriesLimit=IsNumeric(rawContents[55]) ? int.Parse(rawContents[55]):0; ExpendMPRate=IsNumeric(rawContents[56]) ? int.Parse(rawContents[56]):0; SkillOfSeries=IsNumeric(rawContents[56]) ? int.Parse(rawContents[56]):0; ExAttr1=IsNumeric(rawContents[57]) ? int.Parse(rawContents[57]):0; ExpendMPRate=IsNumeric(rawContents[57]) ? int.Parse(rawContents[57]):0; ExAttr3=IsNumeric(rawContents[58]) ? int.Parse(rawContents[58]):0; ExAttr1=IsNumeric(rawContents[58]) ? int.Parse(rawContents[58]):0; ExAttr4=IsNumeric(rawContents[59]) ? int.Parse(rawContents[59]):0; ExAttr3=IsNumeric(rawContents[59]) ? int.Parse(rawContents[59]):0; ExAttr5=IsNumeric(rawContents[60]) ? int.Parse(rawContents[60]):0; ExAttr4=IsNumeric(rawContents[60]) ? int.Parse(rawContents[60]):0; WarnInfo=IsNumeric(rawContents[61]) ? int.Parse(rawContents[61]):0; ExAttr5=IsNumeric(rawContents[61]) ? int.Parse(rawContents[61]):0; CtrlActionID=IsNumeric(rawContents[62]) ? int.Parse(rawContents[62]):0; WarnInfo=IsNumeric(rawContents[62]) ? int.Parse(rawContents[62]):0; BuffEffectID=IsNumeric(rawContents[63]) ? int.Parse(rawContents[63]):0; CtrlActionID=IsNumeric(rawContents[63]) ? int.Parse(rawContents[63]):0; EffectName=IsNumeric(rawContents[64]) ? int.Parse(rawContents[64]):0; BuffEffectID=IsNumeric(rawContents[64]) ? int.Parse(rawContents[64]):0; IconName = rawContents[65].Trim(); EffectName=IsNumeric(rawContents[65]) ? int.Parse(rawContents[65]):0; SkillNameIcon = rawContents[66].Trim(); IconName = rawContents[66].Trim(); Description = rawContents[67].Trim(); SkillNameIcon = rawContents[67].Trim(); BuffDescription = rawContents[68].Trim(); Description = rawContents[68].Trim(); Skillsource = rawContents[69].Trim(); BuffDescription = rawContents[69].Trim(); Skillactmark=IsNumeric(rawContents[70]) ? int.Parse(rawContents[70]):0; Skillsource = rawContents[70].Trim(); BuffDisplay=IsNumeric(rawContents[71]) ? int.Parse(rawContents[71]):0; Skillactmark=IsNumeric(rawContents[71]) ? int.Parse(rawContents[71]):0; BuffDisplay=IsNumeric(rawContents[72]) ? int.Parse(rawContents[72]):0; } catch (Exception ex) { Core/GameEngine/Model/Config/SkillConfig.cs.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: db393bd0ebb18b74e98ba16a7d19e7c6 timeCreated: 1525345704 timeCreated: 1537946131 licenseType: Pro MonoImporter: serializedVersion: 2 System/Skill/TalentModel.cs
@@ -17,10 +17,10 @@ get { return m_SelectSeries; } set { if (m_SelectSeries != value && OnSelectSeriesEvent != null) if (m_SelectSeries != value && selectSeriesEvent != null) { m_SelectSeries = value; OnSelectSeriesEvent(); selectSeriesEvent(); } m_SelectSeries = value; } @@ -31,10 +31,10 @@ get { return m_SelectTalentType; } set { if (m_SelectTalentType != value && OnSelectTalentTypeEvnet != null) if (m_SelectTalentType != value && selectTalentTypeEvnet != null) { m_SelectTalentType = value; OnSelectTalentTypeEvnet(); selectTalentTypeEvnet(); } m_SelectTalentType = value; } @@ -45,18 +45,18 @@ get { return m_SelectSkill; } set { if (m_SelectSkill != value && OnSelectSkillEvent != null) if (m_SelectSkill != value && selectSkillEvent != null) { m_SelectSkill = value; OnSelectSkillEvent(); selectSkillEvent(); } m_SelectSkill = value; } } public event Action OnSelectTalentTypeEvnet; public event Action OnSelectSeriesEvent; public event Action OnSelectSkillEvent; public event Action selectTalentTypeEvnet; public event Action selectSeriesEvent; public event Action selectSkillEvent; public event Action talentPointUpdate; public event Action<int> talentSkillUpdate; @@ -181,9 +181,11 @@ } var talentConfig = talent.GetTalentConfig(talent.level + 1); var skillConfig = talent.GetSkillConfig(talent.level + 1); if (skillConfig.LearnSkillPointReq != 0) var requireSeriesPoint = skillConfig.RequireSeriesPoint(); if (requireSeriesPoint != 0) { if (GetSeriesPoint(talentConfig.type, 1) < skillConfig.LearnSkillPointReq) var requireSeries = skillConfig.RequireSeries(); if (GetSeriesPoint(talentConfig.type, requireSeries) < requireSeriesPoint) { error = 4; return false; @@ -337,5 +339,26 @@ return false; } } public static class TalentHelper { public static int RequireSeries(this SkillConfig config) { if (config == null) { return 0; } return config.LearnSkillPointReq / 10000; } public static int RequireSeriesPoint(this SkillConfig config) { if (config == null) { return 0; } return config.LearnSkillPointReq % 10000; } } } System/Skill/TalentSeriesBehaviour.cs
@@ -32,20 +32,35 @@ public void Display() { m_Button.image.SetSprite(talentSeries == model.selectSeries ? "Title_TabRight" : "Title_TabDark"); DisplayTalentPoint(); model.OnSelectSeriesEvent -= OnSelectSeriesEvent; model.OnSelectSeriesEvent += OnSelectSeriesEvent; model.selectSeriesEvent -= OnSelectSeriesEvent; model.selectSeriesEvent += OnSelectSeriesEvent; model.selectTalentTypeEvnet -= OnSelectTalentTypeEvnet; model.selectTalentTypeEvnet += OnSelectTalentTypeEvnet; } void DisplayTalentPoint() { var point = model.GetSeriesPoint(model.selectTalentType, talentSeries); m_TalentPoint.text = StringUtility.Contact("(", point, ")"); } public void Dispose() { model.OnSelectSeriesEvent -= OnSelectSeriesEvent; model.selectSeriesEvent -= OnSelectSeriesEvent; model.selectTalentTypeEvnet -= OnSelectTalentTypeEvnet; } private void OnSelectSeriesEvent() { m_Button.image.SetSprite(talentSeries == model.selectSeries ? "Title_TabRight" : "Title_TabDark"); } private void OnSelectTalentTypeEvnet() { DisplayTalentPoint(); } } } System/Skill/TalentSkillBehaviour.cs
@@ -28,8 +28,8 @@ skillId = _skillId; model.talentSkillUpdate -= TalentSkillUpdate; model.talentSkillUpdate += TalentSkillUpdate; model.OnSelectSkillEvent -= OnSelectSkillEvent; model.OnSelectSkillEvent += OnSelectSkillEvent; model.selectSkillEvent -= OnSelectSkillEvent; model.selectSkillEvent += OnSelectSkillEvent; Display(); } @@ -65,7 +65,7 @@ public void Dispose() { model.talentSkillUpdate -= TalentSkillUpdate; model.OnSelectSkillEvent -= OnSelectSkillEvent; model.selectSkillEvent -= OnSelectSkillEvent; } private void SelectSkill() System/Skill/TalentWin.cs
@@ -68,9 +68,9 @@ model.selectSeries = 1; model.selectTalentType = 1; Display(); model.OnSelectTalentTypeEvnet += OnSelectTalentTypeEvnet; model.OnSelectSeriesEvent += OnSelectSeriesEvent; model.OnSelectSkillEvent += OnSelectSkillEvent; model.selectTalentTypeEvnet += OnSelectTalentTypeEvnet; model.selectSeriesEvent += OnSelectSeriesEvent; model.selectSkillEvent += OnSelectSkillEvent; model.talentSkillUpdate += TalentSkillUpdate; model.talentPointUpdate += TalentPointUpdate; } @@ -81,9 +81,9 @@ protected override void OnPreClose() { model.OnSelectTalentTypeEvnet -= OnSelectTalentTypeEvnet; model.OnSelectSeriesEvent -= OnSelectSeriesEvent; model.OnSelectSkillEvent -= OnSelectSkillEvent; model.selectTalentTypeEvnet -= OnSelectTalentTypeEvnet; model.selectSeriesEvent -= OnSelectSeriesEvent; model.selectSkillEvent -= OnSelectSkillEvent; model.talentSkillUpdate -= TalentSkillUpdate; model.talentPointUpdate -= TalentPointUpdate; for (int i = 0; i < m_TalentSeries.Length; i++) @@ -193,10 +193,11 @@ var skillConfig = talent.GetSkillConfig(talent.level + 1); if (talentConfig != null) { if (skillConfig.LearnSkillPointReq != 0 && index < m_SelectConditions.Length) var requireSeriesPoint = skillConfig.RequireSeriesPoint(); if (requireSeriesPoint != 0 && index < m_SelectConditions.Length) { m_SelectConditions[index].gameObject.SetActive(true); m_SelectConditions[index].text = StringUtility.Contact(0, "/", skillConfig.LearnSkillPointReq); m_SelectConditions[index].text = StringUtility.Contact(0, "/", requireSeriesPoint); index++; } }