diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 632db93..4eafdbd 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -64,6 +64,33 @@ public class FaceTypeData } } +[System.Serializable] +public class CharaEntry +{ + public string Name; + public Sprite Icon; + public int Id; +} + +[System.Serializable] +public class LiveEntry +{ + public int MusicId; + public string SongName; + public string BackGroundId; + public List LiveSettings = new List(); + + public LiveEntry(string data) + { + string[] lines = data.Split("\n"[0]); + for (int i = 1; i < lines.Length; i++) + { + LiveSettings.Add(lines[i].Split(',')); + } + BackGroundId = LiveSettings[1][2]; + } +} + public enum UmaFileType { _3d_cutt, diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs index 4f5091c..a7ad46b 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs @@ -1,12 +1,7 @@ using UnityEngine; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Mono.Data.Sqlite; -using System.IO; -using UnityEngine.XR; using System.Data; public class UmaDatabaseController @@ -45,6 +40,7 @@ public class UmaDatabaseController public IEnumerable MetaEntries; public IEnumerable CharaData; public IEnumerable FaceTypeData; + public IEnumerable LiveData; /// Meta Database Connection private SqliteConnection metaDb; @@ -67,9 +63,11 @@ public class UmaDatabaseController } metaDb.Open(); MetaEntries = ReadMeta(metaDb); + masterDb.Open(); CharaData = ReadMaster(masterDb); FaceTypeData = ReadFaceTypeData(masterDb); + LiveData = ReadAllLiveData(masterDb); } catch { @@ -142,6 +140,21 @@ public class UmaDatabaseController } } + static IEnumerable ReadAllLiveData(SqliteConnection conn) + { + SqliteCommand sqlite_cmd = conn.CreateCommand(); + sqlite_cmd.CommandText = + $"SELECT * FROM live_data L,(SELECT D.'index' songid,D.'text' songname FROM text_data D WHERE id like 16) T WHERE L.music_id like T.songid"; + SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader(); + var result = new DataTable(); + result.Load(sqlite_datareader); + var temp = result.Rows.GetEnumerator(); + while (temp.MoveNext()) + { + yield return (DataRow)temp.Current; + } + } + public static DataRow ReadCharaData(int id) { SqliteCommand sqlite_cmd = instance.masterDb.CreateCommand(); diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index cb61fa9..ca4cbb6 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -1,18 +1,17 @@ using Newtonsoft.Json.Linq; -using System.Reflection; using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; using UnityEngine; -using UnityEngine.UI; +using System; public class UmaViewerMain : MonoBehaviour { public static UmaViewerMain Instance; private UmaViewerUI UI => UmaViewerUI.Instance; private UmaViewerBuilder Builder => UmaViewerBuilder.Instance; - + public JArray UmaCharaData; public JArray UmaLiveData; @@ -62,36 +61,36 @@ public class UmaViewerMain : MonoBehaviour UI.LoadMapPanel(); }); - yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicLiveDataInfo", txt => - { - UmaLiveData = JArray.Parse(txt); - var asset = AbList.FirstOrDefault(a => a.Name.Equals("livesettings")); - if(asset != null) - { - string filePath = UmaDatabaseController.GetABPath(asset); - if (File.Exists(filePath)) - { - AssetBundle bundle = AssetBundle.LoadFromFile(filePath); - foreach (var item in UmaLiveData) - { - if (!Lives.Where(c => c.MusicId == (int)item["musicId"]).Any()) - { - if (bundle.Contains((string)item["musicId"])) - { - TextAsset liveData = bundle.LoadAsset((string)item["musicId"]); - Lives.Add(new LiveEntry(liveData.text) - { - MusicId = (int)item["musicId"], - songName = (string)item["songName"] - }); - } + + var asset = AbList.FirstOrDefault(a => a.Name.Equals("livesettings")); + if (asset != null) + { + string filePath = UmaDatabaseController.GetABPath(asset); + if (File.Exists(filePath)) + { + AssetBundle bundle = AssetBundle.LoadFromFile(filePath); + foreach (var item in UmaDatabaseController.Instance.LiveData) + { + var musicId = Convert.ToInt32(item["music_id"]); + var songName = item["songname"].ToString(); + if (!Lives.Where(c => c.MusicId == musicId).Any()) + { + if (bundle.Contains(musicId.ToString())) + { + TextAsset liveData = bundle.LoadAsset(musicId.ToString()); + + Lives.Add(new LiveEntry(liveData.text) + { + MusicId = musicId, + SongName = songName + }); } } - UI.LoadLivePanels(); } + UI.LoadLivePanels(); } - }); + } } public void OpenUrl(string url) @@ -99,31 +98,4 @@ public class UmaViewerMain : MonoBehaviour Application.OpenURL(url); } - [System.Serializable] - public class CharaEntry - { - public string Name; - public Sprite Icon; - public int Id; - } - - [System.Serializable] - public class LiveEntry - { - public int MusicId; - public string songName; - public string BackGroundId; - public List LiveSettings = new List(); - - public LiveEntry(string data) - { - string[] lines = data.Split("\n"[0]); - for (int i = 1; i < lines.Length; i++) - { - LiveSettings.Add(lines[i].Split(',')); - } - BackGroundId = LiveSettings[1][2]; - } - } - } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 9f97aab..b0026aa 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -279,7 +279,7 @@ public class UmaViewerUI : MonoBehaviour { var liveInstance = live; var container = Instantiate(UmaContainerNoTMPPrefab, LiveList.content).GetComponent(); - container.GetComponentInChildren().text = " "+ live.MusicId + " " + live.songName; + container.GetComponentInChildren().text = " "+ live.MusicId + " " + live.SongName; var imageInstance1 = container.GetComponent(); container.Button.onClick.AddListener(() => { HighlightChildImage(LiveList.content, imageInstance1); @@ -287,7 +287,7 @@ public class UmaViewerUI : MonoBehaviour }); var CharaContainer = Instantiate(UmaContainerNoTMPPrefab, LiveSoundList.content).GetComponent(); - CharaContainer.GetComponentInChildren().text = " " + live.MusicId + " " + live.songName; + CharaContainer.GetComponentInChildren().text = " " + live.MusicId + " " + live.SongName; var CharaimageInstance1 = CharaContainer.GetComponent(); CharaContainer.Button.onClick.AddListener(() => { HighlightChildImage(LiveSoundList.content, CharaimageInstance1);