From 89ecddb0d865eef208e01efe8d83ee9e72555457 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 23 四月 2019 17:47:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/NPCConfig.cs |   79 ++++++++++++++++++++-------------------
 1 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/Core/GameEngine/Model/Config/NPCConfig.cs b/Core/GameEngine/Model/Config/NPCConfig.cs
index c1ccf06..93f23a4 100644
--- a/Core/GameEngine/Model/Config/NPCConfig.cs
+++ b/Core/GameEngine/Model/Config/NPCConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           Thursday, February 14, 2019
+//    [  Date ]:           Tuesday, April 23, 2019
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -35,6 +35,7 @@
 	public readonly int IceAtk;
 	public readonly int PoisionDef;
 	public readonly int IceDef;
+	public readonly int ThunderDef;
 	public readonly int AtkInterval;
 	public readonly int Hit;
 	public readonly int MissRate;
@@ -127,84 +128,86 @@
 
 			int.TryParse(tables[21],out IceDef); 
 
-			int.TryParse(tables[22],out AtkInterval); 
+			int.TryParse(tables[22],out ThunderDef); 
 
-			int.TryParse(tables[23],out Hit); 
+			int.TryParse(tables[23],out AtkInterval); 
 
-			int.TryParse(tables[24],out MissRate); 
+			int.TryParse(tables[24],out Hit); 
 
-			int.TryParse(tables[25],out SuperHiteRate); 
+			int.TryParse(tables[25],out MissRate); 
 
-			int.TryParse(tables[26],out OrgSpeed); 
+			int.TryParse(tables[26],out SuperHiteRate); 
 
-			int.TryParse(tables[27],out MoveType); 
+			int.TryParse(tables[27],out OrgSpeed); 
 
-			int.TryParse(tables[28],out AtkDist); 
+			int.TryParse(tables[28],out MoveType); 
 
-			int.TryParse(tables[29],out Skill1); 
+			int.TryParse(tables[29],out AtkDist); 
 
-			int.TryParse(tables[30],out Skill2); 
+			int.TryParse(tables[30],out Skill1); 
 
-			int.TryParse(tables[31],out Skill3); 
+			int.TryParse(tables[31],out Skill2); 
 
-			int.TryParse(tables[32],out Skill4); 
+			int.TryParse(tables[32],out Skill3); 
 
-			int.TryParse(tables[33],out Skill5); 
+			int.TryParse(tables[33],out Skill4); 
 
-			int.TryParse(tables[34],out Skill6); 
+			int.TryParse(tables[34],out Skill5); 
 
-			int.TryParse(tables[35],out Skill7); 
+			int.TryParse(tables[35],out Skill6); 
 
-			int.TryParse(tables[36],out Skill8); 
+			int.TryParse(tables[36],out Skill7); 
 
-			int.TryParse(tables[37],out AtkType); 
+			int.TryParse(tables[37],out Skill8); 
 
-			int.TryParse(tables[38],out Sight); 
+			int.TryParse(tables[38],out AtkType); 
 
-			int.TryParse(tables[39],out MoveArea); 
+			int.TryParse(tables[39],out Sight); 
 
-			int.TryParse(tables[40],out DHP); 
+			int.TryParse(tables[40],out MoveArea); 
 
-			int.TryParse(tables[41],out MaxHPEx); 
+			int.TryParse(tables[41],out DHP); 
 
-			int.TryParse(tables[42],out IsBoss); 
+			int.TryParse(tables[42],out MaxHPEx); 
 
-			int.TryParse(tables[43],out SP); 
+			int.TryParse(tables[43],out IsBoss); 
 
-			int.TryParse(tables[44],out AIType); 
+			int.TryParse(tables[44],out SP); 
 
-			int.TryParse(tables[45],out CanAttack); 
+			int.TryParse(tables[45],out AIType); 
 
-			float.TryParse(tables[46],out weight); 
+			int.TryParse(tables[46],out CanAttack); 
 
-			HeadPortrait = tables[47];
+			float.TryParse(tables[47],out weight); 
 
-			int.TryParse(tables[48],out Show); 
+			HeadPortrait = tables[48];
 
-			int.TryParse(tables[49],out AtkFeedback); 
+			int.TryParse(tables[49],out Show); 
 
-			int.TryParse(tables[50],out hurtFeedback); 
+			int.TryParse(tables[50],out AtkFeedback); 
 
-			int.TryParse(tables[51],out AutomaticFace); 
+			int.TryParse(tables[51],out hurtFeedback); 
 
-			int.TryParse(tables[52],out Dig); 
+			int.TryParse(tables[52],out AutomaticFace); 
 
-			string[] SoundsStringArray = tables[53].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			int.TryParse(tables[53],out Dig); 
+
+			string[] SoundsStringArray = tables[54].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			Sounds = new int[SoundsStringArray.Length];
 			for (int i=0;i<SoundsStringArray.Length;i++)
 			{
 				 int.TryParse(SoundsStringArray[i],out Sounds[i]);
 			}
 
-			int.TryParse(tables[54],out LifeBarCount); 
+			int.TryParse(tables[55],out LifeBarCount); 
 
-			int.TryParse(tables[55],out NPCEffect); 
+			int.TryParse(tables[56],out NPCEffect); 
 
-			int.TryParse(tables[56],out NPCSpeakID); 
+			int.TryParse(tables[57],out NPCSpeakID); 
 
-			int.TryParse(tables[57],out ClientRealm); 
+			int.TryParse(tables[58],out ClientRealm); 
 
-			Equips = tables[58];
+			Equips = tables[59];
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0