bug fix
This commit is contained in:
@@ -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<TextAsset>(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{}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<Image>())
|
||||
{
|
||||
if (t.transform.parent != mainObject) continue;
|
||||
@@ -165,9 +164,9 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack
|
||||
|
||||
var CharaContainer = Instantiate(UmaContainerNoTMPPrefab, LiveSoundList.content).GetComponent<UmaUIContainer>();
|
||||
CharaContainer.GetComponentInChildren<Text>().text = " " + live.MusicId + " " + live.songName;
|
||||
var CharaimageInstance1 = container.GetComponent<Image>();
|
||||
var CharaimageInstance1 = CharaContainer.GetComponent<Image>();
|
||||
CharaContainer.Button.onClick.AddListener(() => {
|
||||
HighlightChildImage(LiveList.content, imageInstance1);
|
||||
HighlightChildImage(LiveSoundList.content, CharaimageInstance1);
|
||||
ListLiveSounds(live.MusicId);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user