From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Core/GameEngine/Model/Config/SkillConfig.cs | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/Core/GameEngine/Model/Config/SkillConfig.cs b/Core/GameEngine/Model/Config/SkillConfig.cs
index 7d0fa88..5ac4014 100644
--- a/Core/GameEngine/Model/Config/SkillConfig.cs
+++ b/Core/GameEngine/Model/Config/SkillConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, September 26, 2018
+// [ Date ]: Wednesday, October 24, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -57,6 +57,7 @@
public int EffectValue61 { get ; private set ; }
public int EffectValue62 { get ; private set ; }
public int EffectValue63 { get ; private set ; }
+ public int StateSkillLV { get ; private set ; }
public int LearnSkillReq { get ; private set ; }
public int LearnSkillLV { get ; private set ; }
public int LearnLVReq { get ; private set ; }
@@ -185,59 +186,61 @@
EffectValue63=IsNumeric(rawContents[45]) ? int.Parse(rawContents[45]):0;
- LearnSkillReq=IsNumeric(rawContents[46]) ? int.Parse(rawContents[46]):0;
+ StateSkillLV=IsNumeric(rawContents[46]) ? int.Parse(rawContents[46]):0;
- LearnSkillLV=IsNumeric(rawContents[47]) ? int.Parse(rawContents[47]):0;
+ LearnSkillReq=IsNumeric(rawContents[47]) ? int.Parse(rawContents[47]):0;
- LearnLVReq=IsNumeric(rawContents[48]) ? int.Parse(rawContents[48]):0;
+ LearnSkillLV=IsNumeric(rawContents[48]) ? int.Parse(rawContents[48]):0;
- LearnSkillPointReq=IsNumeric(rawContents[49]) ? int.Parse(rawContents[49]):0;
+ LearnLVReq=IsNumeric(rawContents[49]) ? int.Parse(rawContents[49]):0;
- FightPower=IsNumeric(rawContents[50]) ? int.Parse(rawContents[50]):0;
+ LearnSkillPointReq=IsNumeric(rawContents[50]) ? int.Parse(rawContents[50]):0;
- LVUpCostMoneyType=IsNumeric(rawContents[51]) ? int.Parse(rawContents[51]):0;
+ FightPower=IsNumeric(rawContents[51]) ? int.Parse(rawContents[51]):0;
- LVUpCostMoney=IsNumeric(rawContents[52]) ? int.Parse(rawContents[52]):0;
+ LVUpCostMoneyType=IsNumeric(rawContents[52]) ? int.Parse(rawContents[52]):0;
- LVUpCostExp=IsNumeric(rawContents[53]) ? int.Parse(rawContents[53]):0;
+ LVUpCostMoney=IsNumeric(rawContents[53]) ? int.Parse(rawContents[53]):0;
- ClientActionLimit=IsNumeric(rawContents[54]) ? int.Parse(rawContents[54]):0;
+ LVUpCostExp=IsNumeric(rawContents[54]) ? int.Parse(rawContents[54]):0;
- ClientSkillSeriesLimit=IsNumeric(rawContents[55]) ? int.Parse(rawContents[55]):0;
+ ClientActionLimit=IsNumeric(rawContents[55]) ? int.Parse(rawContents[55]):0;
- SkillOfSeries=IsNumeric(rawContents[56]) ? int.Parse(rawContents[56]):0;
+ ClientSkillSeriesLimit=IsNumeric(rawContents[56]) ? int.Parse(rawContents[56]):0;
- ExpendMPRate=IsNumeric(rawContents[57]) ? int.Parse(rawContents[57]):0;
+ SkillOfSeries=IsNumeric(rawContents[57]) ? int.Parse(rawContents[57]):0;
- ExAttr1=IsNumeric(rawContents[58]) ? int.Parse(rawContents[58]):0;
+ ExpendMPRate=IsNumeric(rawContents[58]) ? int.Parse(rawContents[58]):0;
- ExAttr3=IsNumeric(rawContents[59]) ? int.Parse(rawContents[59]):0;
+ ExAttr1=IsNumeric(rawContents[59]) ? int.Parse(rawContents[59]):0;
- ExAttr4=IsNumeric(rawContents[60]) ? int.Parse(rawContents[60]):0;
+ ExAttr3=IsNumeric(rawContents[60]) ? int.Parse(rawContents[60]):0;
- ExAttr5=IsNumeric(rawContents[61]) ? int.Parse(rawContents[61]):0;
+ ExAttr4=IsNumeric(rawContents[61]) ? int.Parse(rawContents[61]):0;
- WarnInfo=IsNumeric(rawContents[62]) ? int.Parse(rawContents[62]):0;
+ ExAttr5=IsNumeric(rawContents[62]) ? int.Parse(rawContents[62]):0;
- CtrlActionID=IsNumeric(rawContents[63]) ? int.Parse(rawContents[63]):0;
+ WarnInfo=IsNumeric(rawContents[63]) ? int.Parse(rawContents[63]):0;
- BuffEffectID=IsNumeric(rawContents[64]) ? int.Parse(rawContents[64]):0;
+ CtrlActionID=IsNumeric(rawContents[64]) ? int.Parse(rawContents[64]):0;
- EffectName=IsNumeric(rawContents[65]) ? int.Parse(rawContents[65]):0;
+ BuffEffectID=IsNumeric(rawContents[65]) ? int.Parse(rawContents[65]):0;
- IconName = rawContents[66].Trim();
+ EffectName=IsNumeric(rawContents[66]) ? int.Parse(rawContents[66]):0;
- SkillNameIcon = rawContents[67].Trim();
+ IconName = rawContents[67].Trim();
- Description = rawContents[68].Trim();
+ SkillNameIcon = rawContents[68].Trim();
- BuffDescription = rawContents[69].Trim();
+ Description = rawContents[69].Trim();
- Skillsource = rawContents[70].Trim();
+ BuffDescription = rawContents[70].Trim();
- Skillactmark=IsNumeric(rawContents[71]) ? int.Parse(rawContents[71]):0;
+ Skillsource = rawContents[71].Trim();
- BuffDisplay=IsNumeric(rawContents[72]) ? int.Parse(rawContents[72]):0;
+ Skillactmark=IsNumeric(rawContents[72]) ? int.Parse(rawContents[72]):0;
+
+ BuffDisplay=IsNumeric(rawContents[73]) ? int.Parse(rawContents[73]):0;
}
catch (Exception ex)
{
--
Gitblit v1.8.0