From c080c44a275c54783f6e0d3ee6cb86e1e16f562e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 02 十一月 2018 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into DownLoad

---
 Core/GameEngine/Model/Config/NPCConfig.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Core/GameEngine/Model/Config/NPCConfig.cs b/Core/GameEngine/Model/Config/NPCConfig.cs
index 330dfd7..1f5e09b 100644
--- a/Core/GameEngine/Model/Config/NPCConfig.cs
+++ b/Core/GameEngine/Model/Config/NPCConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Monday, August 20, 2018
+//    [  Date ]:		   Thursday, November 01, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -69,6 +69,7 @@
 		public int NPCEffect { get ; private set ; }
 		public int NPCSpeakID { get ; private set ; }
 		public int ClientRealm { get ; private set ; }
+		public string Equips { get ; private set; } 
 
 		public override string getKey()
         {
@@ -198,6 +199,8 @@
 				NPCSpeakID=IsNumeric(rawContents[56]) ? int.Parse(rawContents[56]):0; 
 			
 				ClientRealm=IsNumeric(rawContents[57]) ? int.Parse(rawContents[57]):0; 
+			
+				Equips = rawContents[58].Trim();
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0