diff --git a/Assets/Scripts/UmaViewerDownload.cs b/Assets/Scripts/UmaViewerDownload.cs index 4456990..9ab80e1 100644 --- a/Assets/Scripts/UmaViewerDownload.cs +++ b/Assets/Scripts/UmaViewerDownload.cs @@ -7,25 +7,17 @@ public class UmaViewerDownload : MonoBehaviour { public static IEnumerator DownloadText(string url, System.Action callback) { - if (PlayerPrefs.GetString(url, "")=="") - { - UnityWebRequest www = UnityWebRequest.Get(url); - yield return www.SendWebRequest(); + UnityWebRequest www = UnityWebRequest.Get(url); + yield return www.SendWebRequest(); - if (www.result != UnityWebRequest.Result.Success) - { - Debug.Log(www.error); - } - else - { - PlayerPrefs.SetString(url, www.downloadHandler.text); - callback(www.downloadHandler.text); - } + if (www.result != UnityWebRequest.Result.Success) + { + Debug.Log(www.error); + callback(""); } else { - callback(PlayerPrefs.GetString(url, "")); + callback(www.downloadHandler.text); } - } } diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index 0e571c2..ae5c95f 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -3,6 +3,8 @@ using System.IO; using System.Linq; using UnityEngine; using System; +using Newtonsoft.Json.Linq; +using System.Collections; public class UmaViewerMain : MonoBehaviour { @@ -31,8 +33,22 @@ public class UmaViewerMain : MonoBehaviour AbSounds = AbList.Where(ab => ab.Name.EndsWith(".awb") || ab.Name.EndsWith(".acb")).ToList(); } - private void Start() + private IEnumerator Start() { + Dictionary enNames = new Dictionary(); + yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicCharaDataInfo", txt => + { + if (string.IsNullOrEmpty(txt)) return; + var umaData = JArray.Parse(txt); + foreach (var item in umaData) + { + if (!enNames.ContainsKey((int)item["charaId"])) + { + enNames.Add((int)item["charaId"], item["charaNameEnglish"].ToString()); + } + } + }); + var UmaCharaData = UmaDatabaseController.Instance.CharaData; foreach (var item in UmaCharaData) { @@ -41,7 +57,7 @@ public class UmaViewerMain : MonoBehaviour { Characters.Add(new CharaEntry() { - Name = item["charaname"].ToString(), + Name = enNames.ContainsKey(id)? enNames[id] : item["charaname"].ToString(), Icon = UmaViewerBuilder.Instance.LoadCharaIcon(id.ToString()), Id = id });