diff --git a/Client/Assets/Scripts/Data/AttributesDefine.cs.meta b/Client/Assets/Scripts/Data/AttributesDefine.cs.meta index 76c19b5..33abf30 100644 --- a/Client/Assets/Scripts/Data/AttributesDefine.cs.meta +++ b/Client/Assets/Scripts/Data/AttributesDefine.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 9ff25140406bbd94499d6fb418c4add5 \ No newline at end of file +guid: 449907b94fa9f8742a43a61b7fc2e5dc \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/CharacterDefine.cs b/Client/Assets/Scripts/Data/CharacterDefine.cs index 167902b..3c9abf0 100644 --- a/Client/Assets/Scripts/Data/CharacterDefine.cs +++ b/Client/Assets/Scripts/Data/CharacterDefine.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Text.RegularExpressions; using System.Xml.Linq; using UnityEditor.ShaderGraph.Internal; @@ -23,6 +24,7 @@ namespace Data public class CharacterDef : Define { + public CharacterAttributesDef attributes; public string texturePath = null; public DrawingOrderDef drawingOrder_down, @@ -71,14 +73,18 @@ namespace Data public override bool Init(XElement xmlDef) { base.Init(xmlDef); - foreach (var node in xmlDef.Elements("DrawNodeDef")) - { - var drawNode = new DrawNodeDef(); - drawNode.Init(node); - drawNodes.Add(drawNode); - } - return true; + var nodes = xmlDef.Elements("DrawNodeDef"); + if (nodes.Count() == 0) + return false; + foreach (var node in nodes) + { + var drawNode = new DrawNodeDef(); + drawNode.Init(node); + drawNodes.Add(drawNode); + } + + return true;; } } diff --git a/Client/Assets/Scripts/Data/DefinePack.cs b/Client/Assets/Scripts/Data/DefinePack.cs index 25e39cb..550229e 100644 --- a/Client/Assets/Scripts/Data/DefinePack.cs +++ b/Client/Assets/Scripts/Data/DefinePack.cs @@ -153,7 +153,7 @@ namespace Data } } - private Define LoadDefineClass(XElement defineDoc,string className) + private static Define LoadDefineClass(XElement defineDoc,string className) { var assembly = Assembly.GetExecutingAssembly(); @@ -211,7 +211,7 @@ namespace Data return define; } - public void DefaultInitDefine(Define define,XElement defineDoc,Type defineType) + public static void DefaultInitDefine(Define define,XElement defineDoc,Type defineType) { var fields = defineType.GetFields(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic);