diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index aae1cb7..10d61e4 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -12030,7 +12030,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1882365342} m_Direction: 2 m_Value: 1 - m_Size: 0.5800894 + m_Size: 0.58008933 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -15204,6 +15204,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 94327bb2c8a0f0a418a2eb8912da68d3, type: 3} m_Name: m_EditorClassIdentifier: + canvasScaler: {fileID: 0} CharactersList: {fileID: 1558324558} CostumeList: {fileID: 270183827} AnimationSetList: {fileID: 92965282} diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index c67fd24..a3b6ddd 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -344,6 +344,8 @@ public class UmaViewerBuilder : MonoBehaviour public void LoadLive(int id) { var asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name.EndsWith("cutt_son" + id)); + if (asset == null) return; + if (CurrentLiveContainer != null) { Destroy(CurrentLiveContainer.gameObject); @@ -503,15 +505,23 @@ public class UmaViewerBuilder : MonoBehaviour TextAsset asset = bundle.LoadAsset(Path.GetFileNameWithoutExtension(lyricsVar)); string[] lines = asset.text.Split("\n"[0]); + for (int i = 1; i < lines.Length; i++) { string[] words = lines[i].Split(','); - UmaLyricsData lyricsData = new UmaLyricsData() + if (words.Length > 0) { - time = float.Parse(words[0])/1000, - text = words[1].Replace("[COMMA]",",") - }; - CurrentLyrics.Add(lyricsData); + try + { + UmaLyricsData lyricsData = new UmaLyricsData() + { + time = float.Parse(words[0]) / 1000, + text = (words.Length > 1) ? words[1].Replace("[COMMA]", ",") : "" + }; + CurrentLyrics.Add(lyricsData); + } + catch{} + } } } } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 10bc530..32e5041 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -70,7 +70,6 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack public void HighlightChildImage(Transform mainObject, Image child) { - //Debug.Log("Looking for " + child.name + " in " + mainObject.name); foreach(var t in mainObject.GetComponentsInChildren()) { if (t.transform.parent != mainObject) continue; @@ -165,9 +164,9 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack var CharaContainer = Instantiate(UmaContainerNoTMPPrefab, LiveSoundList.content).GetComponent(); CharaContainer.GetComponentInChildren().text = " " + live.MusicId + " " + live.songName; - var CharaimageInstance1 = container.GetComponent(); + var CharaimageInstance1 = CharaContainer.GetComponent(); CharaContainer.Button.onClick.AddListener(() => { - HighlightChildImage(LiveList.content, imageInstance1); + HighlightChildImage(LiveSoundList.content, CharaimageInstance1); ListLiveSounds(live.MusicId); }); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1716607..1581c4c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -82,7 +82,7 @@ PlayerSettings: androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 + runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0