diff --git a/Assets/AssetsPackage/物品数据/属性容器.asset b/Assets/AssetsPackage/物品数据/物品属性.asset similarity index 62% rename from Assets/AssetsPackage/物品数据/属性容器.asset rename to Assets/AssetsPackage/物品数据/物品属性.asset index 5289e0a..4fdb813 100644 --- a/Assets/AssetsPackage/物品数据/属性容器.asset +++ b/Assets/AssetsPackage/物品数据/物品属性.asset @@ -1,39 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6358681353448287529 -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: e891e45f4230ee04d8d329520fd39cbc, type: 3} - m_Name: "\u653B\u51FB\u529B" - m_EditorClassIdentifier: - type: 0 - defaultValue: 0 - minValue: 0 - maxValue: 9999 - container: {fileID: 11400000} ---- !u!114 &-1377547097575584075 -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: e891e45f4230ee04d8d329520fd39cbc, type: 3} - m_Name: "\u653B\u51FB\u901F\u5EA6" - m_EditorClassIdentifier: - type: 0 - defaultValue: 0 - minValue: 0 - maxValue: 9999 - container: {fileID: 11400000} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -44,8 +10,60 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 23403840a9d12654f8f15c6188728498, type: 3} - m_Name: "\u5C5E\u6027\u5BB9\u5668" + m_Name: "\u7269\u54C1\u5C5E\u6027" m_EditorClassIdentifier: instances: - - {fileID: -1377547097575584075} - - {fileID: -6358681353448287529} + - {fileID: 6610366098165316818} + - {fileID: 2362838488679916709} + - {fileID: 4633682211995004289} +--- !u!114 &2362838488679916709 +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: e891e45f4230ee04d8d329520fd39cbc, type: 3} + m_Name: "\u9632\u5FA1" + m_EditorClassIdentifier: + type: 0 + defaultValue: 0 + minValue: 0 + maxValue: 9999 + container: {fileID: 11400000} +--- !u!114 &4633682211995004289 +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: e891e45f4230ee04d8d329520fd39cbc, type: 3} + m_Name: "\u9B54\u6CD5\u503C" + m_EditorClassIdentifier: + type: 3 + defaultValue: 0 + minValue: 0 + maxValue: 100 + container: {fileID: 11400000} +--- !u!114 &6610366098165316818 +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: e891e45f4230ee04d8d329520fd39cbc, type: 3} + m_Name: "\u653B\u51FB" + m_EditorClassIdentifier: + type: 0 + defaultValue: 0 + minValue: 0 + maxValue: 9999 + container: {fileID: 11400000} diff --git a/Assets/AssetsPackage/物品数据/属性容器.asset.meta b/Assets/AssetsPackage/物品数据/物品属性.asset.meta similarity index 79% rename from Assets/AssetsPackage/物品数据/属性容器.asset.meta rename to Assets/AssetsPackage/物品数据/物品属性.asset.meta index 4b228e4..490f360 100644 --- a/Assets/AssetsPackage/物品数据/属性容器.asset.meta +++ b/Assets/AssetsPackage/物品数据/物品属性.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 09e8991e4b5a20745a227d1bc138548a +guid: d07fad53a94189c42bcebe454bc4dde0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs b/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs index d8052a1..3aa4843 100644 --- a/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs +++ b/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs @@ -16,41 +16,38 @@ namespace MuHuaEditor { private UIAttributeList attributeList; public VisualElement AttributeList => Q("AttributeList"); + public Button Button1 => Q