From a974a2621a6dcb90b8fe52b23d075814873c0960 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 23 十月 2018 20:53:49 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Core/GameEngine/Model/Config/JobSetupConfig.cs | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/Core/GameEngine/Model/Config/JobSetupConfig.cs b/Core/GameEngine/Model/Config/JobSetupConfig.cs
index 7879b98..162c4c9 100644
--- a/Core/GameEngine/Model/Config/JobSetupConfig.cs
+++ b/Core/GameEngine/Model/Config/JobSetupConfig.cs
@@ -1,14 +1,14 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, June 20, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, October 22, 2018
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
public partial class JobSetupConfig : ConfigBase {
public int Job { get ; private set ; }
@@ -29,17 +29,18 @@
public int MaxSwitchTargetDist { get ; private set ; }
public int[] HangupSkillList;
public string DungeonSkillList { get ; private set; }
+ public string OffLineSkillList { get ; private set; }
public int HpPerUseSkill { get ; private set ; }
public int[] HpSkillList;
public int[] GainSkillList;
public int MoveLimitDist { get ; private set ; }
-
+
public override string getKey()
{
return Job.ToString();
- }
-
- public override void Parse() {
+ }
+
+ public override void Parse() {
try
{
Job=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
@@ -103,34 +104,36 @@
DungeonSkillList = rawContents[17].Trim();
- HpPerUseSkill=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0;
+ OffLineSkillList = rawContents[18].Trim();
- string[] HpSkillListStringArray = rawContents[19].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ HpPerUseSkill=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0;
+
+ string[] HpSkillListStringArray = rawContents[20].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
HpSkillList = new int[HpSkillListStringArray.Length];
for (int i=0;i<HpSkillListStringArray.Length;i++)
{
int.TryParse(HpSkillListStringArray[i],out HpSkillList[i]);
}
- string[] GainSkillListStringArray = rawContents[20].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] GainSkillListStringArray = rawContents[21].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
GainSkillList = new int[GainSkillListStringArray.Length];
for (int i=0;i<GainSkillListStringArray.Length;i++)
{
int.TryParse(GainSkillListStringArray[i],out GainSkillList[i]);
}
- MoveLimitDist=IsNumeric(rawContents[21]) ? int.Parse(rawContents[21]):0;
+ MoveLimitDist=IsNumeric(rawContents[22]) ? int.Parse(rawContents[22]):0;
}
catch (Exception ex)
{
DebugEx.Log(ex);
- }
- }
-
- }
-
-}
-
-
-
-
+ }
+ }
+
+ }
+
+}
+
+
+
+
--
Gitblit v1.8.0