diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index f2b5b3ee7..81266b05c 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 09546aca93a801441859af2a811fe53b m_currentHash: serializedVersion: 2 - Hash: d59a20f3fd4fe19d46cca3d13d0af15a + Hash: 2167dba1e00620dbf134bf4f8704c12d m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_BundleLocalCatalog: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset b/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset index 990b906bc..74b193317 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset @@ -92,6 +92,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: f6a76cf314d765d4ab9562f9021f80dc + m_Address: "Animation/\u9152\u5427\u8C03\u9152\u59B9" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/Plugins/SOEditorTool/Editor/SOEditorConfigEditor.cs b/Assets/Plugins/SOEditorTool/Editor/SOEditorConfigEditor.cs index 9714128f2..1d7078c77 100644 --- a/Assets/Plugins/SOEditorTool/Editor/SOEditorConfigEditor.cs +++ b/Assets/Plugins/SOEditorTool/Editor/SOEditorConfigEditor.cs @@ -125,7 +125,7 @@ public class SOEditorConfigEditor : Editor GenericMenu menu = new GenericMenu(); var allSoTypes = TypeCache.GetTypesDerivedFrom() - .Where(t => !t.IsAbstract && !t.IsGenericType && !t.Namespace.StartsWith("Unity") && !t.Namespace.StartsWith("UnityEditor")) + .Where(t => !t.IsAbstract && !t.IsGenericType && !string.IsNullOrEmpty(t.Namespace) && !t.Namespace.StartsWith("Unity") && !t.Namespace.StartsWith("UnityEditor")) .OrderBy(t => t.Name); foreach (var type in allSoTypes) diff --git a/Assets/Plugins/SOEditorTool/Editor/UniversalSOEditor.cs b/Assets/Plugins/SOEditorTool/Editor/UniversalSOEditor.cs index 7c593cba3..23cc49f5a 100644 --- a/Assets/Plugins/SOEditorTool/Editor/UniversalSOEditor.cs +++ b/Assets/Plugins/SOEditorTool/Editor/UniversalSOEditor.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; using UnityEditor; using System.Collections.Generic; using System; @@ -40,6 +40,9 @@ public class UniversalSOManager : EditorWindow { _config = AssetDatabase.LoadAssetAtPath(configPath); } + + // 加载保存的资源路径 + _searchRootPath = EditorPrefs.GetString("UniversalSOManager_SearchRootPath", "Assets/SOGameData"); } private void OnDisable() @@ -49,6 +52,9 @@ public class UniversalSOManager : EditorWindow { EditorPrefs.SetString("UniversalSOManager_ConfigPath", AssetDatabase.GetAssetPath(_config)); } + + // 保存资源路径 + EditorPrefs.SetString("UniversalSOManager_SearchRootPath", _searchRootPath); } private void OnGUI() diff --git a/Assets/Plugins/SOEditorTool/Example.meta b/Assets/Plugins/SOEditorTool/Example.meta deleted file mode 100644 index 376d270d6..000000000 --- a/Assets/Plugins/SOEditorTool/Example.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 7c22e204a4c845268592ac59ecdc4b52 -timeCreated: 1765259304 \ No newline at end of file diff --git a/Assets/Plugins/SOEditorTool/Example/WeaponConfig.cs b/Assets/Plugins/SOEditorTool/Example/WeaponConfig.cs deleted file mode 100644 index f759d8579..000000000 --- a/Assets/Plugins/SOEditorTool/Example/WeaponConfig.cs +++ /dev/null @@ -1,7 +0,0 @@ -using UnityEngine; - -[CreateAssetMenu(fileName = "NewWeapon", menuName = "SOConfig/Weapon")] -public class WeaponConfig : ScriptableObject -{ - [Header("武器")] [CNName("武器名称")] public int weaponName; -} \ No newline at end of file diff --git a/Assets/Plugins/SOEditorTool/Example/WeaponConfig.cs.meta b/Assets/Plugins/SOEditorTool/Example/WeaponConfig.cs.meta deleted file mode 100644 index 7aee839a7..000000000 --- a/Assets/Plugins/SOEditorTool/Example/WeaponConfig.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ca7dfd64ca684b00b235658f84d4206d -timeCreated: 1765259314 \ No newline at end of file diff --git a/Assets/Scenes/网格测试.unity b/Assets/Scenes/网格测试.unity index c5799fab9..e0fbe64ba 100644 --- a/Assets/Scenes/网格测试.unity +++ b/Assets/Scenes/网格测试.unity @@ -1521,6 +1521,67 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isLocked: 0 +--- !u!1001 &1701662108 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1355800832498282156, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_Name + value: BlockShape + objectReference: {fileID: 0} + - target: {fileID: 1564096825049927058, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: _blockShapeData.sprite + value: + objectReference: {fileID: 21300000, guid: c0724ae6698e0454da14fa5f9e87918a, type: 3} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalPosition.x + value: 2.06 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalPosition.y + value: -0.14 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4390508356052025844, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 03e5e9a1437535042ae48b2ba034dd93, type: 3} --- !u!1 &1773523315 GameObject: m_ObjectHideFlags: 0 @@ -1727,3 +1788,4 @@ SceneRoots: - {fileID: 1467061559} - {fileID: 791020756} - {fileID: 1429030511} + - {fileID: 1701662108} diff --git a/Assets/Plugins/SOEditorTool/Example/ExampleConfig.asset b/Assets/ScriptableObjects/SOEditorConfig.asset similarity index 87% rename from Assets/Plugins/SOEditorTool/Example/ExampleConfig.asset rename to Assets/ScriptableObjects/SOEditorConfig.asset index 87bc2c699..d4959d48d 100644 --- a/Assets/Plugins/SOEditorTool/Example/ExampleConfig.asset +++ b/Assets/ScriptableObjects/SOEditorConfig.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b9d2ad94e1454d91833b3134b5c927bd, type: 3} - m_Name: ExampleConfig + m_Name: SOEditorConfig m_EditorClassIdentifier: targetTypeNames: - - WeaponConfig + - AibisDream.BlockShapeDataSO diff --git a/Assets/Plugins/SOEditorTool/Example/ExampleConfig.asset.meta b/Assets/ScriptableObjects/SOEditorConfig.asset.meta similarity index 79% rename from Assets/Plugins/SOEditorTool/Example/ExampleConfig.asset.meta rename to Assets/ScriptableObjects/SOEditorConfig.asset.meta index 1ae378c28..c103123e7 100644 --- a/Assets/Plugins/SOEditorTool/Example/ExampleConfig.asset.meta +++ b/Assets/ScriptableObjects/SOEditorConfig.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd879080496a8eb47bee4af200e048ba +guid: 893179436b37c68439464d01a768223d NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000