From 2986ac4bf5512c6da4beeec2fedc4e3d96817582 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 23 十一月 2018 13:57:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/ModelResConfig.cs |  114 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/Core/GameEngine/Model/Config/ModelResConfig.cs b/Core/GameEngine/Model/Config/ModelResConfig.cs
index fd7db7e..c45ca7d 100644
--- a/Core/GameEngine/Model/Config/ModelResConfig.cs
+++ b/Core/GameEngine/Model/Config/ModelResConfig.cs
@@ -1,62 +1,68 @@
-锘�//--------------------------------------------------------
-//    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Wednesday, June 20, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-    
-	public partial class ModelResConfig : ConfigBase {
+锘�//--------------------------------------------------------
+//    [Author]:			绗簩涓栫晫
+//    [  Date ]:		   Friday, November 23, 2018
+//--------------------------------------------------------
 
-		public int ID { get ; private set ; }
-		public string Name { get ; private set; } 
-		public int Type { get ; private set ; }
-		public string ResourcesName { get ; private set; } 
-		public string BindPoint { get ; private set; } 
-		public string EffFileName { get ; private set; } 
-		public Vector3 UIOffset { get ; private set; } 
-		public Vector3 UIRotation { get ; private set; } 
-		public float UIScale { get ; private set; } 
-
-		public override string getKey()
+using UnityEngine;
+using System;
+
+namespace TableConfig
+{
+
+
+    public partial class ModelResConfig : ConfigBase
+    {
+
+        public int ID { get; private set; }
+        public string Name { get; private set; }
+        public int Type { get; private set; }
+        public string ResourcesName { get; private set; }
+        public string BindPoint { get; private set; }
+        public string EffFileName { get; private set; }
+        public Vector3 UIOffset { get; private set; }
+        public Vector3 UIRotation { get; private set; }
+        public float UIScale { get; private set; }
+        public Vector3 Scale { get; private set; }
+
+        public override string getKey()
         {
             return ID.ToString();
-        }
-
-		public override void Parse() {
-			try
+        }
+
+        public override void Parse()
+        {
+            try
             {
-                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
-			
-				Name = rawContents[1].Trim();
-			
-				Type=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
-			
-				ResourcesName = rawContents[3].Trim();
-			
-				BindPoint = rawContents[4].Trim();
-			
-				EffFileName = rawContents[5].Trim();
-			
-				UIOffset=rawContents[6].Vector3Parse();
-			
-				UIRotation=rawContents[7].Vector3Parse();
-			
-				UIScale=IsNumeric(rawContents[8]) ? float.Parse(rawContents[8]):0; 
+                ID = IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]) : 0;
+
+                Name = rawContents[1].Trim();
+
+                Type = IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]) : 0;
+
+                ResourcesName = rawContents[3].Trim();
+
+                BindPoint = rawContents[4].Trim();
+
+                EffFileName = rawContents[5].Trim();
+
+                UIOffset = rawContents[6].Vector3Parse();
+
+                UIRotation = rawContents[7].Vector3Parse();
+
+                UIScale = IsNumeric(rawContents[8]) ? float.Parse(rawContents[8]) : 0;
+
+                Scale = rawContents[9].Vector3Parse();
             }
             catch (Exception ex)
             {
                 DebugEx.Log(ex);
-            }
-		}
-	
-	}
-
-}
-
-
-
-
+            }
+        }
+
+    }
+
+}
+
+
+
+

--
Gitblit v1.8.0