From 7aeda74f41d1eb95a30e9f881f5afa20e5faff02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=93=AE?= <834207172@qq.com> Date: Wed, 12 Nov 2025 14:22:04 +0800 Subject: [PATCH] 111 --- .../Editor/ConvertedExslDataMessage.cs | 190 ++++++++++++++---- .../RunTime/Base/AudioEntity.cs | 30 +++ .../RunTime/Base/AudioEntity.cs.meta | 3 + .../RunTime/Base/AudioTableData.cs | 25 +-- .../RunTime/Base/UIEntity.cs | 28 +++ .../RunTime/Base/UIEntity.cs.meta | 3 + .../RunTime/Base/UITableData.cs | 25 +-- .../RunTime/Base/VideoEntity.cs | 24 +++ .../RunTime/Base/VideoEntity.cs.meta | 3 + .../RunTime/Base/VideoTableData.cs | 22 +- .../RunTime/Core/AudioTableDataCore.cs | 20 +- .../RunTime/Core/TableSystem.cs | 3 +- .../RunTime/Core/UITableDataCore.cs | 17 +- .../RunTime/Core/VideoTableDataCore.cs | 14 +- Assets/05.TableTextConversion/package.json | 2 +- 15 files changed, 280 insertions(+), 129 deletions(-) create mode 100644 Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs create mode 100644 Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs.meta create mode 100644 Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs create mode 100644 Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs.meta create mode 100644 Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs create mode 100644 Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs.meta diff --git a/Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs b/Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs index 48a6b0f..03102a1 100644 --- a/Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs +++ b/Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs @@ -9,12 +9,20 @@ using UnityEngine; using Sirenix.OdinInspector; using Sirenix.OdinInspector.Editor; using System.Linq; +using Newtonsoft.Json; using Stary.Evo.TableTextConversion; +using UnityEngine.Serialization; namespace Stary.Evo.TableTextConversion { public class ConvertedExslDataMessage : OdinEditorWindow { + /// + /// 配置文件类型 + /// + [EnumToggleButtons, HideLabel] [OnValueChanged("SetConfigurationFileType")] + public ConfigurationFileType configurationFileType = ConfigurationFileType.Asset; + private static ConvertedExslDataMessage window; // 读取的位置 @@ -33,6 +41,12 @@ namespace Stary.Evo.TableTextConversion window.Show(); } + protected override void Initialize() + { + base.Initialize(); + configurationFileType = (ConfigurationFileType)Enum.Parse(typeof(ConfigurationFileType), + EditorPrefs.GetString("ConfigurationFileType")); + } [Title("转化配置的Exsl文件：", titleAlignment: TitleAlignments.Centered)] [HorizontalGroup("BuildPipeline"), HideLabel] @@ -50,7 +64,7 @@ namespace Stary.Evo.TableTextConversion //[MenuItem("Exsl/信息表转换")] [Button("转化Exsl表格", ButtonSizes.Large)] - public static void CrtateMessage() + public void CrtateMessage() { #region 读取Excel表格并转成DataSet类型的数据 @@ -112,10 +126,10 @@ namespace Stary.Evo.TableTextConversion { #region 遍历表格相应的数据转换成数据 - List messageInfos = new List(); + List messageInfos = new List(); for (int j = 1; j < VoiceCount; j++) { - AudioTableData.MessageInfo messageInfo = new AudioTableData.MessageInfo(); + AudioEntity messageInfo = new AudioEntity(); //获取对话块 messageInfo.index = j - 1; //文件名称 @@ -123,16 +137,16 @@ namespace Stary.Evo.TableTextConversion //获取内容 messageInfo.autype = Enum.TryParse(FilterTo(table.Rows[j][1].ToString()), - out AudioTableData.AudioType auType) + out AudioType auType) ? auType - : AudioTableData.AudioType.Null; + : AudioType.Null; //获取描述 messageInfo.filename = FilterTo(table.Rows[j][2].ToString()); messageInfo.voice = FilterTo(table.Rows[j][3].ToString()); - + messageInfo.uirelated = FilterTo(table.Rows[j][4].ToString()); //添加数据 messageInfos.Add(messageInfo); @@ -140,11 +154,18 @@ namespace Stary.Evo.TableTextConversion #endregion - ScriptObjectSave("AudioTableData", (data) => + if (configurationFileType == ConfigurationFileType.Asset) { - data.infos = new List(); - data.infos = messageInfos; - }); + ScriptObjectSave("AudioTableData", (data) => + { + data.infos = new List(); + data.infos = messageInfos; + }); + } + else if (configurationFileType == ConfigurationFileType.Json) + { + JsonSave>("AudioTableData", () => { return messageInfos; }); + } } #endregion @@ -155,10 +176,10 @@ namespace Stary.Evo.TableTextConversion { #region 遍历表格相应的数据转换成数据 - List messageInfos = new List(); + List messageInfos = new List(); for (int j = 1; j < VoiceCount; j++) { - VideoTableData.MessageInfo messageInfo = new VideoTableData.MessageInfo(); + VideoEntity messageInfo = new VideoEntity(); //获取对话块 messageInfo.index = j - 1; //文件名称 @@ -179,19 +200,27 @@ namespace Stary.Evo.TableTextConversion ? true : false; messageInfo.videoframeName = FilterTo(table.Rows[j][6].ToString()); - - + + //添加数据 messageInfos.Add(messageInfo); } #endregion - ScriptObjectSave("VideoTableData", (data) => + + if (configurationFileType == ConfigurationFileType.Asset) { - data.infos = new List(); - data.infos = messageInfos; - }); + ScriptObjectSave("VideoTableData", (data) => + { + data.infos = new List(); + data.infos = messageInfos; + }); + } + else if (configurationFileType == ConfigurationFileType.Json) + { + JsonSave>("VideoTableData", () => { return messageInfos; }); + } } #endregion @@ -202,9 +231,9 @@ namespace Stary.Evo.TableTextConversion { #region 遍历表格相应的数据转换成数据 - List messageInfos = new List(); - UITableData.MessageInfo messageInfo = null; - List subtitle = null; + List messageInfos = new List(); + UIEntity messageInfo = null; + List subtitle = null; int infoIndex = 0; for (int j = 1; j < VoiceCount; j++) { @@ -212,8 +241,8 @@ namespace Stary.Evo.TableTextConversion if (!table.Rows[j][0].ToString().Equals("")) { Debug.Log(table.Rows[j][0].ToString()); - messageInfo = new UITableData.MessageInfo(); - subtitle = new List(); + messageInfo = new UIEntity(); + subtitle = new List(); messageInfo.subtitle = subtitle; //获取对话块 messageInfo.index = infoIndex; @@ -227,7 +256,7 @@ namespace Stary.Evo.TableTextConversion if (!table.Rows[j][3].ToString().Equals("")) { - var subtitleInfo = new UITableData.SubtitleInfo(); + var subtitleInfo = new SubtitleInfo(); subtitleInfo.lineid = FilterTo(table.Rows[j][3].ToString()); subtitleInfo.subtitle = FilterTo(table.Rows[j][4].ToString()); subtitleInfo.start = @@ -242,7 +271,7 @@ namespace Stary.Evo.TableTextConversion messageInfo.subtitle.Add(subtitleInfo); } - + //添加数据 messageInfos.Add(messageInfo); infoIndex++; @@ -251,7 +280,7 @@ namespace Stary.Evo.TableTextConversion { if (!table.Rows[j][3].ToString().Equals("")) { - var subtitleInfo = new UITableData.SubtitleInfo(); + var subtitleInfo = new SubtitleInfo(); subtitleInfo.lineid = FilterTo(table.Rows[j][3].ToString()); subtitleInfo.subtitle = FilterTo(table.Rows[j][4].ToString()); subtitleInfo.start = @@ -270,11 +299,18 @@ namespace Stary.Evo.TableTextConversion #endregion - ScriptObjectSave("UITableData", (data) => + if (configurationFileType == ConfigurationFileType.Asset) { - data.infos = new List(); - data.infos = messageInfos; - }); + ScriptObjectSave("UITableData", (data) => + { + data.infos = new List(); + data.infos = messageInfos; + }); + } + else if (configurationFileType == ConfigurationFileType.Json) + { + JsonSave>("UITableData", () => { return messageInfos; }); + } } #endregion @@ -322,6 +358,39 @@ namespace Stary.Evo.TableTextConversion AssetDatabase.Refresh(); } + /// + /// ScriptObject数据保存类 + /// + /// + /// 写入数据的一个回调 + /// + private static void JsonSave(string assetName, Func func) where T : IEnumerable, new() + { + // 创建数据实例 + T data = new T(); + //放写入数据操作 + data = func.Invoke(); + // 确保保存目录存在 + if (!Directory.Exists(Assetpath)) + { + Directory.CreateDirectory(Assetpath); + } + + // 构建完整的保存路径 + string jsonFilePath = Path.Combine(Assetpath, $"{assetName}.json"); + + // 序列化数据为JSON + string jsonContent = JsonConvert.SerializeObject(data, Formatting.Indented); + + // 写入文件 + File.WriteAllText(jsonFilePath, jsonContent); + + // 刷新AssetDatabase + AssetDatabase.Refresh(); + + Debug.Log($"UnityEvo: JSON文件已保存到 {jsonFilePath}"); + } + #endregion /// @@ -363,7 +432,7 @@ namespace Stary.Evo.TableTextConversion string[] xlsxFiles = Directory.GetFiles(docFolderPath, "*.xlsx"); result = xlsxFiles.Select(file => Path.GetFileNameWithoutExtension(file)).ToList(); - + selectedExslNames = EditorPrefs.GetString("BuildExslNames"); return result; } @@ -371,15 +440,25 @@ namespace Stary.Evo.TableTextConversion { DocFolderPath = Path.Combine(GetDocFolderPath(), newValue + ".xlsx"); newDataName = newValue; + EditorPrefs.SetString("BuildExslNames", newDataName); } /// /// 获取全部作用域名 /// - public static List GetCreatDomainAllName() + public List GetCreatDomainAllName() { - string domainPath = $"{Application.dataPath}/Domain"; + string domainPath = ""; + if (configurationFileType == ConfigurationFileType.Asset) + { + domainPath = $"{Application.dataPath}/Domain"; + } + else if (configurationFileType == ConfigurationFileType.Json) + { + domainPath = $"{Application.dataPath}/Modules"; + } + string[] domains; // 新增目录获取代码 if (Directory.Exists(domainPath)) @@ -395,12 +474,53 @@ namespace Stary.Evo.TableTextConversion domains = Array.Empty(); } - return domains.Select(file => Path.GetFileNameWithoutExtension(file)).ToList(); + if (configurationFileType == ConfigurationFileType.Asset) + { + selectedDomainNames = EditorPrefs.GetString("CurrentDomainName"); + } + else if (configurationFileType == ConfigurationFileType.Json) + { + selectedDomainNames = EditorPrefs.GetString("CurrentModulesName"); + } + + return domains.ToList(); } private void SetCurrentDomainName(string newValue) { - Assetpath = Application.dataPath + "/Domain/" + newValue + "/AddressableRes/Config/"; + if (configurationFileType == ConfigurationFileType.Asset) + { + Assetpath = Application.dataPath + "/Domain/" + newValue + "/AddressableRes/Config/"; + EditorPrefs.SetString("CurrentDomainName", newValue); + } + else + { + Assetpath = Application.dataPath + "/Modules/" + newValue + "/Main/Res/Config/"; + EditorPrefs.SetString("CurrentModulesName", newValue); + } + + if (!Directory.Exists(Assetpath)) + { + Directory.CreateDirectory(Assetpath); + } + } + + private void SetConfigurationFileType() + { + EditorPrefs.SetString("ConfigurationFileType", configurationFileType.ToString()); } } + + public enum ConfigurationFileType + { + /// + /// json类型 + /// + Json, + + /// + /// asset类型 + /// + Asset + } } \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs b/Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs new file mode 100644 index 0000000..50427e1 --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs @@ -0,0 +1,30 @@ +using System; +using Sirenix.OdinInspector; + +namespace Stary.Evo.TableTextConversion +{ + [Serializable] + public class AudioEntity + { + // 序号 + [GUIColor(0, 1, 0)] public int index; + + // 名称 + public string auid; + + public AudioType autype; + + // 名称描述 + public string filename; + public string voice; + public string uirelated; + } + + public enum AudioType + { + Null, + music, + effect, + sound, + } +} \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs.meta b/Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs.meta new file mode 100644 index 0000000..3445de5 --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Base/AudioEntity.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a1a28b6c544f4e939d68e56f08d87403 +timeCreated: 1762855901 \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs b/Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs index 3ffd1c9..27f8e53 100644 --- a/Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs +++ b/Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs @@ -9,29 +9,6 @@ namespace Stary.Evo.TableTextConversion public class AudioTableData : ScriptableObject, ITableData { public string TableName { get; } - public List infos; - - [Serializable] - public class MessageInfo - { - // 序号 - [GUIColor(0, 1, 0)] public int index; - // 名称 - public string auid; - public AudioType autype; - // 名称描述 - public string filename; - public string voice; - public string uirelated; - } - - public enum AudioType - { - Null, - music, - effect, - sound, - } - + public List infos; } } \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs b/Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs new file mode 100644 index 0000000..697b5fc --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using Sirenix.OdinInspector; + +namespace Stary.Evo.TableTextConversion +{ + [Serializable] + public class UIEntity + { + // 序号 + [GUIColor(0, 1, 0)] public int index; + // 名称 + public string uiid; + // 名称描述 + public string filename; + + public string uitype; + public List subtitle; + } + [Serializable] + public class SubtitleInfo + { + public string lineid; + public string subtitle; + public float start; + public float end; + } +} \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs.meta b/Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs.meta new file mode 100644 index 0000000..ee05acd --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Base/UIEntity.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: aa8c79fd9e99417abfdebb6ffa12629b +timeCreated: 1762855912 \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/UITableData.cs b/Assets/05.TableTextConversion/RunTime/Base/UITableData.cs index 6442164..5a64483 100644 --- a/Assets/05.TableTextConversion/RunTime/Base/UITableData.cs +++ b/Assets/05.TableTextConversion/RunTime/Base/UITableData.cs @@ -9,30 +9,7 @@ namespace Stary.Evo.TableTextConversion public class UITableData : ScriptableObject, ITableData { public string TableName { get; } - public List infos; - - [Serializable] - public class MessageInfo - { - // 序号 - [GUIColor(0, 1, 0)] public int index; - // 名称 - public string uiid; - // 名称描述 - public string filename; - - public string uitype; - public List subtitle; - - } - [Serializable] - public class SubtitleInfo - { - public string lineid; - public string subtitle; - public float start; - public float end; - } + public List infos; } } diff --git a/Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs b/Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs new file mode 100644 index 0000000..2452209 --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs @@ -0,0 +1,24 @@ +using System; +using Sirenix.OdinInspector; + +namespace Stary.Evo.TableTextConversion +{ + [Serializable] + public class VideoEntity + { + // 序号 + [GUIColor(0, 1, 0)] public int index; + + // 名称 + public string vidid; + + // 名称描述 + public string filename; + public string vidtype; + + public string location; + public float time; + public bool subtitle; + public string videoframeName; + } +} \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs.meta b/Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs.meta new file mode 100644 index 0000000..ad9dd37 --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Base/VideoEntity.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f6b98bb6dbce4f999d0ca6d2d08f6900 +timeCreated: 1762855926 \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Base/VideoTableData.cs b/Assets/05.TableTextConversion/RunTime/Base/VideoTableData.cs index a55a539..3903bb0 100644 --- a/Assets/05.TableTextConversion/RunTime/Base/VideoTableData.cs +++ b/Assets/05.TableTextConversion/RunTime/Base/VideoTableData.cs @@ -9,27 +9,7 @@ namespace Stary.Evo.TableTextConversion public class VideoTableData : ScriptableObject, ITableData { public string TableName { get; } - public List infos; - - [Serializable] - public class MessageInfo - { - // 序号 - [GUIColor(0, 1, 0)] public int index; - // 名称 - public string vidid; - // 名称描述 - public string filename; - public string vidtype; - - public string location; - public float time; - public bool subtitle; - public string videoframeName; - } - - - + public List infos; } } \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs b/Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs index a943179..690a433 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs +++ b/Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs @@ -7,14 +7,14 @@ namespace Stary.Evo.TableTextConversion { public interface IAudioTableDataCore : ITableDataCore { - UniTask GetAudioInfo(string auid); - UniTask GetAudioClip(string auid); + UniTask GetAudioAssetInfo(string auid); + UniTask GetAudioAssetClip(string auid); } - +#if YooAssets public class AudioTableDataCore : IAudioTableDataCore, IDisposable { - private Stary.Evo.TableTextConversion.AudioTableData audioTableData; + private AudioTableData audioTableData; public string TableName => "Config_AudioTableData"; public bool IsLoad { get; set; } @@ -23,14 +23,15 @@ namespace Stary.Evo.TableTextConversion public async UniTask LoadData() { var audioHandle = - YooAssets.LoadAssetAsync(TableName); + YooAssets.LoadAssetAsync(TableName); await audioHandle.Task; - audioTableData = audioHandle.GetAssetObject(); + audioTableData = audioHandle.GetAssetObject(); if (audioTableData == null) { Debug.LogError($"加载音频表失败，请排查config下是否存在【{TableName}】表"); return; } + IsLoad = true; } @@ -40,7 +41,7 @@ namespace Stary.Evo.TableTextConversion /// /// /// - public async UniTask GetAudioInfo(string auid) + public async UniTask GetAudioAssetInfo(string auid) { if (!IsLoad) { @@ -61,14 +62,14 @@ namespace Stary.Evo.TableTextConversion /// /// /// - public async UniTask GetAudioClip(string auid) + public async UniTask GetAudioAssetClip(string auid) { if (!IsLoad) { await LoadData(); } - var info = await GetAudioInfo(auid); + var info = await GetAudioAssetInfo(auid); var handle = YooAssets.LoadAssetAsync(info.filename); await handle.Task; if (handle.Status == EOperationStatus.Succeed) @@ -89,4 +90,5 @@ namespace Stary.Evo.TableTextConversion audioTableData = null; } } +#endif } \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs b/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs index 6c85f5b..bbc65f0 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs +++ b/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs @@ -24,7 +24,7 @@ namespace Stary.Evo.TableTextConversion public IAudioTableDataCore AudioTableCore; public IUITableDataCore UITableCore; public IVideoTableDataCore VideoTableCore; - +#if YooAssets // 私有构造函数，防止外部实例化 private TableSystem() { @@ -32,6 +32,7 @@ namespace Stary.Evo.TableTextConversion UITableCore = new UITableDataCore(); VideoTableCore = new VideoTableDataCore(); } +#endif public void Dispose() { diff --git a/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs b/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs index 158ef7c..6bc1f96 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs +++ b/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs @@ -7,11 +7,11 @@ namespace Stary.Evo.TableTextConversion { public interface IUITableDataCore : ITableDataCore { - UniTask GetUIInfo(string uiid); - UniTask GetSprite(string uiid); + UniTask GetUIAssetInfo(string uiid); + UniTask GetSpriteAsset(string uiid); } - +#if YooAssets public class UITableDataCore : IUITableDataCore, IDisposable { public string TableName => "Config_UITableData"; @@ -21,9 +21,9 @@ namespace Stary.Evo.TableTextConversion public async UniTask LoadData() { - var handle = YooAssets.LoadAssetAsync(TableName); + var handle = YooAssets.LoadAssetAsync(TableName); await handle.Task; - uiTableDatas = handle.GetAssetObject(); + uiTableDatas = handle.GetAssetObject(); if (uiTableDatas == null) { Debug.LogError($"加载UI表失败，请排查config下是否存在【{TableName}】表"); @@ -32,7 +32,7 @@ namespace Stary.Evo.TableTextConversion IsLoad = true; } - public async UniTask GetUIInfo(string uiid) + public async UniTask GetUIAssetInfo(string uiid) { if (!IsLoad) { @@ -48,14 +48,14 @@ namespace Stary.Evo.TableTextConversion return info; } - public async UniTask GetSprite(string uiid) + public async UniTask GetSpriteAsset(string uiid) { if (!IsLoad) { await LoadData(); } - var info = await GetUIInfo(uiid); + var info = await GetUIAssetInfo(uiid); var handle = YooAssets.LoadAssetAsync(info.filename); await handle.Task; if (handle.Status == EOperationStatus.Succeed) @@ -76,4 +76,5 @@ namespace Stary.Evo.TableTextConversion uiTableDatas = null; } } +#endif } \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs b/Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs index d21014a..c9cf1a9 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs +++ b/Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs @@ -8,32 +8,33 @@ namespace Stary.Evo.TableTextConversion public interface IVideoTableDataCore : ITableDataCore { UniTask LoadData(); - UniTask PlayVideoName(string vidid); + UniTask PlayVideoAssetName(string vidid); } - +#if YooAssets public class VideoTableDataCore : IVideoTableDataCore, IDisposable { public string TableName => "Config_VideoTableData"; public bool IsLoad { get; set; } - private Stary.Evo.TableTextConversion.VideoTableData videoTableDatas; + private VideoTableData videoTableDatas; public async UniTask LoadData() { - var handle = YooAssets.LoadAssetAsync(TableName); + var handle = YooAssets.LoadAssetAsync(TableName); await handle.Task; - videoTableDatas = handle.GetAssetObject(); + videoTableDatas = handle.GetAssetObject(); if (videoTableDatas == null) { Debug.LogError($"加载视频表失败，请排查config下是否存在【{TableName}】表"); return; } + IsLoad = true; } - public async UniTask PlayVideoName(string vidid) + public async UniTask PlayVideoAssetName(string vidid) { if (!IsLoad) { @@ -59,4 +60,5 @@ namespace Stary.Evo.TableTextConversion videoTableDatas = null; } } +#endif } \ No newline at end of file diff --git a/Assets/05.TableTextConversion/package.json b/Assets/05.TableTextConversion/package.json index 05815b9..ccd3e76 100644 --- a/Assets/05.TableTextConversion/package.json +++ b/Assets/05.TableTextConversion/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tabletextconversion", - "version": "2.0.3", + "version": "2.0.4", "displayName": "05.TableTextConversion", "description": "表格转化工具", "unity": "2021.3",