diff options
Diffstat (limited to 'WorldlineKeepers/Assets/Scripts/Data')
5 files changed, 37 insertions, 4 deletions
diff --git a/WorldlineKeepers/Assets/Scripts/Data/DataManager_Func.cs b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Func.cs new file mode 100644 index 0000000..da84bad --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Func.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace WK.Data +{ + + public partial class DataManager : Singleton<DataManager> + { + + public FileDescriptor GetFile(string filekey) + { + FileDescriptor descriptor; + if(m_Filelist.TryGetValue(filekey, out descriptor)) + { + return m_Filelist[filekey]; + } + return null; + } + + } +}
\ No newline at end of file diff --git a/WorldlineKeepers/Assets/Scripts/Data/DataManager_Func.cs.meta b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Func.cs.meta new file mode 100644 index 0000000..b324431 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Func.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d3bd86dfb681bd544928fa409fe503a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs index b7fb0b9..e5b78b4 100644 --- a/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs +++ b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs @@ -17,10 +17,10 @@ namespace WK.Data /// <returns></returns> public CoroutineHandle AsyncLoadAll() { - return Timing.Instance.RunCoroutineOnInstance(AsyncLoadAllData()); + return Timing.Instance.RunCoroutineOnInstance(CoLoadAllData()); } - private IEnumerator<float> AsyncLoadAllData() + private IEnumerator<float> CoLoadAllData() { Load_Filelist(); yield return Timing.WaitForSeconds(StaticDefine.IntervalLoadFile); @@ -33,9 +33,7 @@ namespace WK.Data { TextAsset text = ResourceManager.Instance.LoadAsset<TextAsset>(StaticDefine.FileList); string content = text.text; - List<FileDescriptor> files = CSVReader.Read<FileDescriptor>(content); CSVReader.ReadDictionary<string, FileDescriptor>(m_Filelist, content, "key"); - Debug.Log(m_Filelist.Count); } diff --git a/WorldlineKeepers/Assets/Scripts/Data/Metadata/FileKey.cs b/WorldlineKeepers/Assets/Scripts/Data/Metadata/FileKey.cs index 2fdff3f..51d4d20 100644 --- a/WorldlineKeepers/Assets/Scripts/Data/Metadata/FileKey.cs +++ b/WorldlineKeepers/Assets/Scripts/Data/Metadata/FileKey.cs @@ -8,6 +8,7 @@ namespace WK.Data default_stats, default_buffs, default_items, + spr_milk_bg, all } diff --git a/WorldlineKeepers/Assets/Scripts/Data/Metadata/Filelist.cs b/WorldlineKeepers/Assets/Scripts/Data/Metadata/Filelist.cs index c4ae257..a9f50b2 100644 --- a/WorldlineKeepers/Assets/Scripts/Data/Metadata/Filelist.cs +++ b/WorldlineKeepers/Assets/Scripts/Data/Metadata/Filelist.cs @@ -13,6 +13,7 @@ namespace WK.Data CSV = 0, Json = 1, Txt = 2, + Png = 3, } /// <summary> |