diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Data/FieldData.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Data/FieldData.cs index 544fc30..90f9e17 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Data/FieldData.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Data/FieldData.cs @@ -16,7 +16,6 @@ namespace Tools.ExcelResolver.Editor public TType type; public string info; public string description; - public string path; internal CodeMemberField GetCodeMemberField() { diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs index c84f667..97a4220 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs @@ -233,7 +233,6 @@ namespace Tools.ExcelResolver.Editor type = ExcelResolverUtil.GetTTypeByString(worksheet.Cells[3, col].Text, worksheet.Cells[3, col], classCodeData.className), info = worksheet.Cells[4, col].Text, description = worksheet.Cells[5, col].Text, - path = worksheet.Cells[6, col].Text, }; fieldDatas.Add(col, fieldData); } @@ -254,7 +253,6 @@ namespace Tools.ExcelResolver.Editor type = ExcelResolverUtil.GetTTypeByString(worksheet.Cells[row, 2].Text, worksheet.Cells[row, 2], classCodeData.className), info = worksheet.Cells[row, 4].Text, description = worksheet.Cells[row, 5].Text, - path = worksheet.Cells[row, 6].Text, }; fieldDatas.Add(row, fieldData); } diff --git a/Assets/_Project/ExcelResolver/Excel/Test.xlsx b/Assets/_Project/ExcelResolver/Excel/Test.xlsx deleted file mode 100644 index c1909aa..0000000 Binary files a/Assets/_Project/ExcelResolver/Excel/Test.xlsx and /dev/null differ diff --git a/Assets/_Project/ExcelResolver/Excel/_Test.xlsx b/Assets/_Project/ExcelResolver/Excel/_Test.xlsx new file mode 100644 index 0000000..079b167 Binary files /dev/null and b/Assets/_Project/ExcelResolver/Excel/_Test.xlsx differ diff --git a/Assets/_Project/ExcelResolver/Excel/Test.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/_Test.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/Test.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/_Test.xlsx.meta diff --git a/Assets/_Project/ExcelResolver/Excel/_com.xlsx b/Assets/_Project/ExcelResolver/Excel/_com.xlsx index c52184a..8bd7429 100644 Binary files a/Assets/_Project/ExcelResolver/Excel/_com.xlsx and b/Assets/_Project/ExcelResolver/Excel/_com.xlsx differ diff --git a/Assets/_Project/ExcelResolver/Excel/_hero.xlsx b/Assets/_Project/ExcelResolver/Excel/_hero.xlsx index fff69e6..01bf040 100644 Binary files a/Assets/_Project/ExcelResolver/Excel/_hero.xlsx and b/Assets/_Project/ExcelResolver/Excel/_hero.xlsx differ diff --git a/Assets/_Project/ExcelResolver/Excel/_monster.xlsx b/Assets/_Project/ExcelResolver/Excel/_monster.xlsx index 9a7555b..468ae92 100644 Binary files a/Assets/_Project/ExcelResolver/Excel/_monster.xlsx and b/Assets/_Project/ExcelResolver/Excel/_monster.xlsx differ diff --git a/Assets/_Project/ExcelResolver/Excel/_monster2.xlsx b/Assets/_Project/ExcelResolver/Excel/_monster2.xlsx deleted file mode 100644 index d8abefd..0000000 Binary files a/Assets/_Project/ExcelResolver/Excel/_monster2.xlsx and /dev/null differ diff --git a/Assets/_Project/ExcelResolver/Excel/monster2.xlsx b/Assets/_Project/ExcelResolver/Excel/monster2.xlsx new file mode 100644 index 0000000..29cd322 Binary files /dev/null and b/Assets/_Project/ExcelResolver/Excel/monster2.xlsx differ diff --git a/Assets/_Project/ExcelResolver/Excel/_monster2.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/monster2.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/_monster2.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/monster2.xlsx.meta diff --git a/Assets/_Project/ScriptableObject/Excel/Test.meta b/Assets/_Project/ScriptableObject/Excel/monster2.meta similarity index 77% rename from Assets/_Project/ScriptableObject/Excel/Test.meta rename to Assets/_Project/ScriptableObject/Excel/monster2.meta index be8d2a9..94b870a 100644 --- a/Assets/_Project/ScriptableObject/Excel/Test.meta +++ b/Assets/_Project/ScriptableObject/Excel/monster2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b73bb5af007b45341964af83ae76e1e9 +guid: e20c813407bc0484ab7f3cb8ac70720c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset b/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset new file mode 100644 index 0000000..b75bfed --- /dev/null +++ b/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dccd381378a062b499ddc03703bfa842, type: 3} + m_Name: _monster2Util + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: + - {fileID: 11400000, guid: 4a8c4100d6943fa4a9dff3024cf251e4, type: 2} + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: Data + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.ValueTuple`3[[System.Int32, + mscorlib],[System.Int32, mscorlib],[System.Int32, mscorlib]], mscorlib],[Tools.ExcelResolver.monster2, + Assembly-CSharp]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.ValueTuple`3[[System.Int32, + mscorlib],[System.Int32, mscorlib],[System.Int32, mscorlib]], mscorlib]], + mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 7 + Data: System.ValueTuple`3[[System.Int32, mscorlib],[System.Int32, mscorlib],[System.Int32, + mscorlib]], mscorlib + - Name: Item1 + Entry: 3 + Data: 1 + - Name: Item2 + Entry: 3 + Data: 1 + - Name: Item3 + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: $v + Entry: 10 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset.meta b/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset.meta new file mode 100644 index 0000000..0a306e7 --- /dev/null +++ b/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a33d53564060c934aac5da5e287613e8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset b/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset new file mode 100644 index 0000000..4746aa7 --- /dev/null +++ b/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16a0885aa5ee33046af22575907b7409, type: 3} + m_Name: monster2_1_1_1 + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: nihao + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Single, + mscorlib]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.Int32, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 2 + - Name: $v + Entry: 4 + Data: 2.3 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 5 + - Name: $v + Entry: 4 + Data: 4.6 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + id: 1 + level: 1 + star: 1 + name: "\u9053\u58EB" + icon: hero_1 + has: 1 + hp: 100 + atk: 20 + speed: 1.2 + pos: {x: 0, y: 1, z: 9} + ches: {x: 0, y: 1} + attack_target: + - {x: 1, y: 2} + - {x: 1, y: 2} + - {x: 1, y: 2} + - {x: 1, y: 2} + color: 3 diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset.meta b/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset.meta new file mode 100644 index 0000000..1b64185 --- /dev/null +++ b/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a8c4100d6943fa4a9dff3024cf251e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Generator/Excel/Test.cs b/Assets/_Project/Scripts/Generator/Excel/Test.cs deleted file mode 100644 index 69f04af..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Test.cs +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class Test : SerializedScriptableObject, IExcelSOData - { - - /// - /// 英雄 - /// - public int id; - - /// - /// - /// - public Item item; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/Test.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Test.cs.meta deleted file mode 100644 index ee20f99..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Test.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 1c45734ab68bc9b4d9e31e53f3f360e2 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs.meta b/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs.meta deleted file mode 100644 index 965ec37..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: ab74c9c14b1a72b438c93e10a5c51397 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/monster2.cs b/Assets/_Project/Scripts/Generator/Excel/monster2.cs new file mode 100644 index 0000000..52ff47a --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/monster2.cs @@ -0,0 +1,93 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tools.ExcelResolver +{ + using System; + using System.Collections; + using System.Collections.Generic; + using UnityEngine; + using Sirenix.OdinInspector; + + + public class monster2 : SerializedScriptableObject, IExcelSOData + { + + /// + /// 英雄 + /// + public int id; + + /// + /// 等级 + /// + public int level; + + /// + /// 星级 + /// + public int star; + + /// + /// 名称 + /// + public string name; + + /// + /// icon + /// + public string icon; + + /// + /// 有宠物 + /// + public bool has; + + /// + /// 血量 + /// + public int hp; + + /// + /// 攻击力 + /// + public int atk; + + /// + /// 移速 + /// + public float speed; + + /// + /// 位置 + /// + public Vector3 pos; + + /// + /// 位置 + /// + public Vector2 ches; + + /// + /// 攻击优先级 + /// + public List attack_target; + + /// + /// 你好 + /// + public Dictionary nihao; + + /// + /// + /// + public CustomizeColor color; + } +} diff --git a/Assets/_Project/Scripts/Generator/Excel/monster2.cs.meta b/Assets/_Project/Scripts/Generator/Excel/monster2.cs.meta new file mode 100644 index 0000000..d73700d --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/monster2.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 16a0885aa5ee33046af22575907b7409 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs b/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs similarity index 79% rename from Assets/_Project/Scripts/Generator/Excel/TestUtil.cs rename to Assets/_Project/Scripts/Generator/Excel/monster2Util.cs index 6889e1e..6d12712 100644 --- a/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs +++ b/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs @@ -17,9 +17,9 @@ namespace Tools.ExcelResolver using Sirenix.OdinInspector; - public class TestUtil : SerializedScriptableObject, IExcelSOUtil + public class monster2Util : SerializedScriptableObject, IExcelSOUtil { - public List Data; + public Dictionary<(System.Int32, System.Int32, System.Int32), monster2> Data; } } diff --git a/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs.meta b/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs.meta new file mode 100644 index 0000000..1df34d6 --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dccd381378a062b499ddc03703bfa842 \ No newline at end of file