From 9ed9a5feb0a726e561d6e04b745ab8e4c23e88d6 Mon Sep 17 00:00:00 2001 From: "1605296300@qq.com" Date: Fri, 9 Sep 2022 11:31:07 +0800 Subject: [PATCH] bug fix --- Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 3 +++ Assets/Scripts/UmaViewerBuilder.cs | 26 +++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 10cacdf..06b2137 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -51,4 +51,7 @@ public enum UmaFileType storyevent, supportcard, uianimation, + transferevent, + teambuilding, + challengematch } diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index d0e7b97..d7cc0e2 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -380,6 +380,21 @@ public class UmaViewerBuilder : MonoBehaviour AddAudioSource(BGclip[0]); } } + + string lyricsVar = $"live/musicscores/m{songid}/m{songid}_lyrics"; + UmaDatabaseEntry lyricsAsset = Main.AbList.FirstOrDefault(a => a.Name.Contains(nameVar)); + if(lyricsAsset != null) + { + string filePath = GetABPath(lyricsAsset); + if (File.Exists(filePath)) + { + AssetBundle bundle = AssetBundle.LoadFromFile(filePath); + Main.LoadedBundles.Add(lyricsAsset.Name, bundle); + UI.LoadedAssetsAdd(lyricsAsset); + TextAsset asset = bundle.LoadAsset(Path.GetFileName(lyricsVar)); + Debug.Log(asset.text); + } + } } private void AddAudioSource(AudioClip clip) @@ -404,7 +419,7 @@ public class UmaViewerBuilder : MonoBehaviour { List clips = new List(); UmaViewerUI.Instance.LoadedAssetsAdd(awb); - string awbPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\\Cygames\\umamusume\\dat\\{awb.Url.Substring(0, 2)}\\{awb.Url}"; + string awbPath = GetABPath(awb); ; if (!File.Exists(awbPath)) return clips; FileStream awbFile = File.OpenRead(awbPath); @@ -432,6 +447,7 @@ public class UmaViewerBuilder : MonoBehaviour return clips; } + private void RecursiveLoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false) { @@ -450,7 +466,7 @@ public class UmaViewerBuilder : MonoBehaviour Debug.Log("Loading " + entry.Name); if (Main.LoadedBundles.ContainsKey(entry.Name)) return; - string filePath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\\Cygames\\umamusume\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}"; + string filePath = GetABPath(entry); if (File.Exists(filePath)) { AssetBundle bundle = AssetBundle.LoadFromFile(filePath); @@ -748,7 +764,6 @@ public class UmaViewerBuilder : MonoBehaviour } } - private void UnloadBundle(AssetBundle bundle, bool unloadAllObjects) { var entry = Main.LoadedBundles.FirstOrDefault(b => b.Value == bundle); @@ -774,4 +789,9 @@ public class UmaViewerBuilder : MonoBehaviour Main.LoadedBundles.Clear(); UI.LoadedAssetsClear(); } + + private static string GetABPath(UmaDatabaseEntry entry) + { + return $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\\Cygames\\umamusume\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}"; + } }