diff --git a/Assets/05.TableTextConversion/RunTime/Core/AudioTableData.cs b/Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs similarity index 93% rename from Assets/05.TableTextConversion/RunTime/Core/AudioTableData.cs rename to Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs index 0dcf072..a943179 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/AudioTableData.cs +++ b/Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs @@ -1,20 +1,18 @@ using System; -using System.Threading; using Cysharp.Threading.Tasks; -using Stary.Evo; using UnityEngine; using YooAsset; -namespace Main +namespace Stary.Evo.TableTextConversion { - public interface IAudioTableData : ITableData + public interface IAudioTableDataCore : ITableDataCore { UniTask GetAudioInfo(string auid); UniTask GetAudioClip(string auid); } - public class AudioTableData : IAudioTableData, IDisposable + public class AudioTableDataCore : IAudioTableDataCore, IDisposable { private Stary.Evo.TableTextConversion.AudioTableData audioTableData; diff --git a/Assets/05.TableTextConversion/RunTime/Core/AudioTableData.cs.meta b/Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs.meta similarity index 100% rename from Assets/05.TableTextConversion/RunTime/Core/AudioTableData.cs.meta rename to Assets/05.TableTextConversion/RunTime/Core/AudioTableDataCore.cs.meta diff --git a/Assets/05.TableTextConversion/RunTime/Core/ITableData.cs b/Assets/05.TableTextConversion/RunTime/Core/ITableData.cs deleted file mode 100644 index e62a281..0000000 --- a/Assets/05.TableTextConversion/RunTime/Core/ITableData.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Cysharp.Threading.Tasks; -using UnityEngine; - -public interface ITableData -{ - string TableName { get; } - bool IsLoad { get; set; } - UniTask LoadData(); -} \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Core/ITableDataCore.cs b/Assets/05.TableTextConversion/RunTime/Core/ITableDataCore.cs new file mode 100644 index 0000000..c3840f9 --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Core/ITableDataCore.cs @@ -0,0 +1,13 @@ + + +using Cysharp.Threading.Tasks; + +namespace Stary.Evo.TableTextConversion +{ + public interface ITableDataCore + { + string TableName { get; } + bool IsLoad { get; set; } + UniTask LoadData(); + } +} \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Core/ITableData.cs.meta b/Assets/05.TableTextConversion/RunTime/Core/ITableDataCore.cs.meta similarity index 100% rename from Assets/05.TableTextConversion/RunTime/Core/ITableData.cs.meta rename to Assets/05.TableTextConversion/RunTime/Core/ITableDataCore.cs.meta diff --git a/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs b/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs new file mode 100644 index 0000000..68d23aa --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs @@ -0,0 +1,43 @@ +using System; + +namespace Stary.Evo.TableTextConversion +{ + public class TableSystem : IDisposable + { + // 单例实例 + private static TableSystem _instance; + + // 公共访问属性 + public static TableSystem Instance + { + get + { + if (_instance == null) + { + _instance = new TableSystem(); + } + + return _instance; + } + } + + public IAudioTableDataCore AudioTableCore; + public IUITableDataCore UITableCore; + public IVideoTableDataCore VideoTableCore; + + // 私有构造函数,防止外部实例化 + private TableSystem() + { + AudioTableCore = new AudioTableDataCore(); + UITableCore = new UITableDataCore(); + VideoTableCore = new VideoTableDataCore(); + } + + public void Dispose() + { + AudioTableCore = null; + UITableCore = null; + VideoTableCore = null; + } + } +} \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs.meta b/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs.meta new file mode 100644 index 0000000..5441689 --- /dev/null +++ b/Assets/05.TableTextConversion/RunTime/Core/TableSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 943d2e1e53404a23b8871dc3e64e0dc9 +timeCreated: 1757473764 \ No newline at end of file diff --git a/Assets/05.TableTextConversion/RunTime/Core/UITableData.cs b/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs similarity index 93% rename from Assets/05.TableTextConversion/RunTime/Core/UITableData.cs rename to Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs index 1467353..158ef7c 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/UITableData.cs +++ b/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs @@ -1,19 +1,18 @@ using System; using Cysharp.Threading.Tasks; -using Stary.Evo; using UnityEngine; using YooAsset; -namespace X_04_04 +namespace Stary.Evo.TableTextConversion { - public interface IUITableData : ITableData + public interface IUITableDataCore : ITableDataCore { UniTask GetUIInfo(string uiid); UniTask GetSprite(string uiid); } - public class UITableData : IUITableData, IDisposable + public class UITableDataCore : IUITableDataCore, IDisposable { public string TableName => "Config_UITableData"; public bool IsLoad { get; set; } diff --git a/Assets/05.TableTextConversion/RunTime/Core/UITableData.cs.meta b/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs.meta similarity index 83% rename from Assets/05.TableTextConversion/RunTime/Core/UITableData.cs.meta rename to Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs.meta index a4c8c6c..99be68e 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/UITableData.cs.meta +++ b/Assets/05.TableTextConversion/RunTime/Core/UITableDataCore.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: acecbcc2903fe7044bfb88198181773a +guid: e562d8d5a2bf0c04486e6b861c2d9b37 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/05.TableTextConversion/RunTime/Core/VideoTableData.cs b/Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs similarity index 83% rename from Assets/05.TableTextConversion/RunTime/Core/VideoTableData.cs rename to Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs index cf58913..d21014a 100644 --- a/Assets/05.TableTextConversion/RunTime/Core/VideoTableData.cs +++ b/Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs @@ -1,20 +1,18 @@ using System; -using System.Threading; using Cysharp.Threading.Tasks; -using Stary.Evo; using UnityEngine; using YooAsset; -namespace Main +namespace Stary.Evo.TableTextConversion { - public interface IVideoTableData : ITableData + public interface IVideoTableDataCore : ITableDataCore { UniTask LoadData(); UniTask PlayVideoName(string vidid); } - public class VideoTableData : IVideoTableData, IDisposable + public class VideoTableDataCore : IVideoTableDataCore, IDisposable { public string TableName => "Config_VideoTableData"; public bool IsLoad { get; set; } @@ -35,8 +33,7 @@ namespace Main } - async UniTask IVideoTableData.PlayVideoName( - string vidid) + public async UniTask PlayVideoName(string vidid) { if (!IsLoad) { diff --git a/Assets/05.TableTextConversion/RunTime/Core/VideoTableData.cs.meta b/Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs.meta similarity index 100% rename from Assets/05.TableTextConversion/RunTime/Core/VideoTableData.cs.meta rename to Assets/05.TableTextConversion/RunTime/Core/VideoTableDataCore.cs.meta diff --git a/Assets/05.TableTextConversion/package.json b/Assets/05.TableTextConversion/package.json index ea6997e..b0ae3a1 100644 --- a/Assets/05.TableTextConversion/package.json +++ b/Assets/05.TableTextConversion/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tabletextconversion", - "version": "1.1.6", + "version": "1.1.7", "displayName": "05.TableTextConversion", "description": "表格转化工具", "unity": "2021.3",