diff --git a/Assets/10.StoryEditor/CHANGELOG.md b/Assets/10.StoryEditor/CHANGELOG.md index 3e0b4a5..96a33f8 100644 --- a/Assets/10.StoryEditor/CHANGELOG.md +++ b/Assets/10.StoryEditor/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog 此包的所有更新日志会被记录在此文件中 +## [1.0.6] - 2026-01-08 +### Fixed +- 处理Sample无法下载的问题 +- 处理Graph选择加载器时指定程序集后不产生选项的问题 + ## [1.0.5] - 2026-01-06 ### Changed - 添加更新日志 diff --git a/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs b/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs index 5410b47..18e1e65 100644 --- a/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs +++ b/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs @@ -2,11 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using Cysharp.Threading.Tasks; using Newtonsoft.Json; using Sirenix.OdinInspector; -using Sirenix.Utilities; using UnityEngine; using XNode; @@ -134,12 +132,23 @@ namespace Stary.Evo.StoryEditor private string assembly; private IEnumerable GetAllAssemblyNames() => AppDomain.CurrentDomain.GetAssemblies().Select(a => a.GetName().Name).OrderBy(n => n); - + /// /// 获取继承 IResource 的所有类 /// - private HashSet _iResourceTypes = AssemblyUtilities.GetTypes(AssemblyCategory.Scripts) - .Where(t => t.IsClass && typeof(IResource).IsAssignableFrom(t)).Select(t => t.ToString()).ToHashSet(); + private HashSet IResourceTypes + { + get + { + if (string.IsNullOrEmpty(assembly)) + return new(); + var asm = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.GetName().Name == assembly); + return asm == null + ? new() + : asm.GetTypes().Where(t => t.IsClass && !t.IsAbstract && typeof(IResource).IsAssignableFrom(t)) + .Select(t => t.Name).ToHashSet(); + } + } #else private HashSet _iResourceTypes = new(); #endif @@ -148,7 +157,7 @@ namespace Stary.Evo.StoryEditor /// 资源加载方式 /// [BoxGroup("Export", centerLabel:true)] - [LabelText("资源加载方式"), ValueDropdown(nameof(_iResourceTypes)),SerializeField] + [LabelText("资源加载方式"), ValueDropdown(nameof(IResourceTypes)),SerializeField] private string loaderType; private IResource _loader; diff --git a/Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity b/Assets/10.StoryEditor/Samples~/ARMazProSample/Sample.unity similarity index 100% rename from Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity rename to Assets/10.StoryEditor/Samples~/ARMazProSample/Sample.unity diff --git a/Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity.meta b/Assets/10.StoryEditor/Samples~/ARMazProSample/Sample.unity.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity.meta rename to Assets/10.StoryEditor/Samples~/ARMazProSample/Sample.unity.meta diff --git a/Assets/10.StoryEditor/Sample~/ARMazProSample/Script.meta b/Assets/10.StoryEditor/Samples~/ARMazProSample/Script.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/ARMazProSample/Script.meta rename to Assets/10.StoryEditor/Samples~/ARMazProSample/Script.meta diff --git a/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs b/Assets/10.StoryEditor/Samples~/ARMazProSample/Script/ResourceLoader.cs similarity index 100% rename from Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs rename to Assets/10.StoryEditor/Samples~/ARMazProSample/Script/ResourceLoader.cs diff --git a/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs.meta b/Assets/10.StoryEditor/Samples~/ARMazProSample/Script/ResourceLoader.cs.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs.meta rename to Assets/10.StoryEditor/Samples~/ARMazProSample/Script/ResourceLoader.cs.meta diff --git a/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs b/Assets/10.StoryEditor/Samples~/ARMazProSample/Script/TestScriptPlayer.cs similarity index 100% rename from Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs rename to Assets/10.StoryEditor/Samples~/ARMazProSample/Script/TestScriptPlayer.cs diff --git a/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs.meta b/Assets/10.StoryEditor/Samples~/ARMazProSample/Script/TestScriptPlayer.cs.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs.meta rename to Assets/10.StoryEditor/Samples~/ARMazProSample/Script/TestScriptPlayer.cs.meta diff --git a/Assets/10.StoryEditor/package.json b/Assets/10.StoryEditor/package.json index 521f55c..7e3765c 100644 --- a/Assets/10.StoryEditor/package.json +++ b/Assets/10.StoryEditor/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.storyeditor", - "version": "1.0.5", + "version": "1.0.6", "displayName": "10.StoryEditor", "description": "可视化剧本编辑器\n1.通过可视化图表编辑剧本内容\n2.将剧本导出为json\n3.解析剧本并执行", "unity": "2021.3",