From 9473e46f8c7eb690eb8a3df4a8b53b5e527c098b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 11 十月 2018 10:46:10 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
Core/GameEngine/Model/Config/TalentConfig.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TalentConfig.cs b/Core/GameEngine/Model/Config/TalentConfig.cs
index 673f07d..fcb36a4 100644
--- a/Core/GameEngine/Model/Config/TalentConfig.cs
+++ b/Core/GameEngine/Model/Config/TalentConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, September 26, 2018
+// [ Date ]: Thursday, October 11, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -13,7 +13,8 @@
public int skillId { get ; private set ; }
public int type { get ; private set ; }
- public int series { get ; private set ; }
+ public int series { get ; private set ; }
+ public int order { get ; private set ; }
public override string getKey()
{
@@ -27,7 +28,9 @@
type=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
- series=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
+ series=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
+
+ order=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
}
catch (Exception ex)
{
--
Gitblit v1.8.0