From cc3543519d69fe80b556ab2bc57ae65b6824cd6e Mon Sep 17 00:00:00 2001 From: mzh <3213885650@qq.com> Date: Thu, 8 Jan 2026 11:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90m=E3=80=91[1.0.5]=20-=202026-01-06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Changed - 添加更新日志 - 修改加载器选择范围,允许指定程序集检查 ### Fixed - 处理Sample在UnityPackage窗口不显示的问题 --- Assets/10.StoryEditor/CHANGELOG.md | 29 +++++++++++++++++++ Assets/10.StoryEditor/CHANGELOG.md.meta | 3 ++ .../RunTime/VisualEditor/Graph/ScriptGraph.cs | 22 +++++++++----- .../Sample~/{ => ARMazProSample}/Sample.unity | 0 .../{ => ARMazProSample}/Sample.unity.meta | 0 .../Sample~/{ => ARMazProSample}/Script.meta | 0 .../Script/ResourceLoader.cs | 0 .../Script/ResourceLoader.cs.meta | 0 .../Script/TestScriptPlayer.cs | 0 .../Script/TestScriptPlayer.cs.meta | 0 Assets/10.StoryEditor/package.json | 11 +++++-- 11 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 Assets/10.StoryEditor/CHANGELOG.md create mode 100644 Assets/10.StoryEditor/CHANGELOG.md.meta rename Assets/10.StoryEditor/Sample~/{ => ARMazProSample}/Sample.unity (100%) rename Assets/10.StoryEditor/Sample~/{ => ARMazProSample}/Sample.unity.meta (100%) rename Assets/10.StoryEditor/Sample~/{ => ARMazProSample}/Script.meta (100%) rename Assets/10.StoryEditor/Sample~/{ => ARMazProSample}/Script/ResourceLoader.cs (100%) rename Assets/10.StoryEditor/Sample~/{ => ARMazProSample}/Script/ResourceLoader.cs.meta (100%) rename Assets/10.StoryEditor/Sample~/{ => ARMazProSample}/Script/TestScriptPlayer.cs (100%) rename Assets/10.StoryEditor/Sample~/{ => ARMazProSample}/Script/TestScriptPlayer.cs.meta (100%) diff --git a/Assets/10.StoryEditor/CHANGELOG.md b/Assets/10.StoryEditor/CHANGELOG.md new file mode 100644 index 0000000..3e0b4a5 --- /dev/null +++ b/Assets/10.StoryEditor/CHANGELOG.md @@ -0,0 +1,29 @@ +# Changelog +此包的所有更新日志会被记录在此文件中 + +## [1.0.5] - 2026-01-06 +### Changed +- 添加更新日志 +- 修改加载器选择范围,允许指定程序集检查 +### Fixed +- 处理Sample在UnityPackage窗口不显示的问题 + +## [1.0.4] - 2026-01-06 +### Fixed +- 移除Editor程序集在Editor以外平台的编译许可,解决打包报错问题 + +## [1.0.3] - 2026-01-06 +### Changed +- 由于ARMaxPro环境自带了一份DoTween且该DoTween处于Plugins目录无法被程序集引用,移除DoTween并改用异步动画替代 + +## [1.0.2] - 2026-01-06 +### Fixed +- 处理RunTime程序集乱码报错 + +## [1.0.1] - 2026-01-06 +### Added +- 添加程序集com.storyeditor.runtime和com.storyeditor.editor + +## [1.0.0] - 2026-01-06 +### Added +- 初始发布,包含基础剧本编辑器框架。 \ No newline at end of file diff --git a/Assets/10.StoryEditor/CHANGELOG.md.meta b/Assets/10.StoryEditor/CHANGELOG.md.meta new file mode 100644 index 0000000..550e12f --- /dev/null +++ b/Assets/10.StoryEditor/CHANGELOG.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6b633e0eee32489895ce1a69771a3539 +timeCreated: 1767840867 \ No newline at end of file diff --git a/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs b/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs index 83192c7..5410b47 100644 --- a/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs +++ b/Assets/10.StoryEditor/RunTime/VisualEditor/Graph/ScriptGraph.cs @@ -2,6 +2,7 @@ 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; @@ -126,14 +127,14 @@ namespace Stary.Evo.StoryEditor #region 导出设置 - /// - /// 资源加载方式 - /// - [BoxGroup("Export", centerLabel:true)] - [LabelText("资源加载方式"), ValueDropdown(nameof(_iResourceTypes)),SerializeField] - private string loaderType; - #if UNITY_EDITOR + + [BoxGroup("Export")] + [SerializeField, ValueDropdown(nameof(GetAllAssemblyNames))] + private string assembly; + private IEnumerable GetAllAssemblyNames() => + AppDomain.CurrentDomain.GetAssemblies().Select(a => a.GetName().Name).OrderBy(n => n); + /// /// 获取继承 IResource 的所有类 /// @@ -143,6 +144,13 @@ namespace Stary.Evo.StoryEditor private HashSet _iResourceTypes = new(); #endif + /// + /// 资源加载方式 + /// + [BoxGroup("Export", centerLabel:true)] + [LabelText("资源加载方式"), ValueDropdown(nameof(_iResourceTypes)),SerializeField] + private string loaderType; + private IResource _loader; /// /// 资源加载器 diff --git a/Assets/10.StoryEditor/Sample~/Sample.unity b/Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity similarity index 100% rename from Assets/10.StoryEditor/Sample~/Sample.unity rename to Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity diff --git a/Assets/10.StoryEditor/Sample~/Sample.unity.meta b/Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/Sample.unity.meta rename to Assets/10.StoryEditor/Sample~/ARMazProSample/Sample.unity.meta diff --git a/Assets/10.StoryEditor/Sample~/Script.meta b/Assets/10.StoryEditor/Sample~/ARMazProSample/Script.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/Script.meta rename to Assets/10.StoryEditor/Sample~/ARMazProSample/Script.meta diff --git a/Assets/10.StoryEditor/Sample~/Script/ResourceLoader.cs b/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs similarity index 100% rename from Assets/10.StoryEditor/Sample~/Script/ResourceLoader.cs rename to Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs diff --git a/Assets/10.StoryEditor/Sample~/Script/ResourceLoader.cs.meta b/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/Script/ResourceLoader.cs.meta rename to Assets/10.StoryEditor/Sample~/ARMazProSample/Script/ResourceLoader.cs.meta diff --git a/Assets/10.StoryEditor/Sample~/Script/TestScriptPlayer.cs b/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs similarity index 100% rename from Assets/10.StoryEditor/Sample~/Script/TestScriptPlayer.cs rename to Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs diff --git a/Assets/10.StoryEditor/Sample~/Script/TestScriptPlayer.cs.meta b/Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs.meta similarity index 100% rename from Assets/10.StoryEditor/Sample~/Script/TestScriptPlayer.cs.meta rename to Assets/10.StoryEditor/Sample~/ARMazProSample/Script/TestScriptPlayer.cs.meta diff --git a/Assets/10.StoryEditor/package.json b/Assets/10.StoryEditor/package.json index 4fe0a64..521f55c 100644 --- a/Assets/10.StoryEditor/package.json +++ b/Assets/10.StoryEditor/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.storyeditor", - "version": "1.0.4", + "version": "1.0.5", "displayName": "10.StoryEditor", "description": "可视化剧本编辑器\n1.通过可视化图表编辑剧本内容\n2.将剧本导出为json\n3.解析剧本并执行", "unity": "2021.3", @@ -20,5 +20,12 @@ "com.github.siccity.xnode": "1.8.0", "com.cysharp.unitask": "2.5.10", "com.unity.nuget.newtonsoft-json": "3.2.1" - } + }, + "samples": [ + { + "displayName": "ARMazPro Sample", + "description": "基于ARMazPro环境的示例", + "path": "Samples~/ARMazProSample" + } + ] }