From 458f4c831623966402f78d1ec00b24aebf674e66 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 12 十二月 2018 09:46:22 +0800
Subject: [PATCH] Merge branch 'master' into Cross_Server
---
Core/GameEngine/Model/Config/ModelResConfig.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ModelResConfig.cs b/Core/GameEngine/Model/Config/ModelResConfig.cs
index f32ee00..48c2907 100644
--- a/Core/GameEngine/Model/Config/ModelResConfig.cs
+++ b/Core/GameEngine/Model/Config/ModelResConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, November 28, 2018
+// [ Date ]: Monday, December 10, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -20,6 +20,7 @@
public string Material_Fight_Suit { get ; private set; }
public string Material_UI_Normal { get ; private set; }
public string Material_UI_Suit { get ; private set; }
+ public string boneNameList { get ; private set; }
public string EffFileName { get ; private set; }
public Vector3 UIOffset { get ; private set; }
public Vector3 UIRotation { get ; private set; }
@@ -52,15 +53,17 @@
Material_UI_Suit = rawContents[8].Trim();
- EffFileName = rawContents[9].Trim();
+ boneNameList = rawContents[9].Trim();
- UIOffset=rawContents[10].Vector3Parse();
+ EffFileName = rawContents[10].Trim();
- UIRotation=rawContents[11].Vector3Parse();
+ UIOffset=rawContents[11].Vector3Parse();
- UIScale=rawContents[12].Vector3Parse();
+ UIRotation=rawContents[12].Vector3Parse();
- Scale=rawContents[13].Vector3Parse();
+ UIScale=rawContents[13].Vector3Parse();
+
+ Scale=rawContents[14].Vector3Parse();
}
catch (Exception ex)
{
--
Gitblit v1.8.0