From b069a25c942fddf32b4cb12dda7e966b5ca17ac0 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 06 六月 2019 17:23:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

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

diff --git a/Core/GameEngine/Model/Config/ModelResConfig.cs b/Core/GameEngine/Model/Config/ModelResConfig.cs
index 53b3d90..a22f25a 100644
--- a/Core/GameEngine/Model/Config/ModelResConfig.cs
+++ b/Core/GameEngine/Model/Config/ModelResConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           Wednesday, May 15, 2019
+//    [  Date ]:           Thursday, June 06, 2019
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -29,6 +29,7 @@
 	public readonly Vector3 UIScale;
 	public readonly Vector3 Scale;
 	public readonly int RelatedPartID;
+	public readonly int ActionType;
 
 	public ModelResConfig()
     {
@@ -71,6 +72,8 @@
 			Scale=tables[14].Vector3Parse();
 
 			int.TryParse(tables[15],out RelatedPartID); 
+
+			int.TryParse(tables[16],out ActionType); 
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0