Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Fix error on invalid resource item.

Browse Source
This commit is contained in:
PopSlime
2023-11-13 00:36:30 +08:00
parent 4ca5809597
commit 2778725b91
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs
View File

@@ -57,20 +57,20 @@ namespace Cryville.Crtr.Browsing {
get { get {
var item = items[index]; var item = items[index];
ChartMeta meta = null; ChartMeta meta = null;
AsyncDelivery<Texture2D> cover = null;
var metaFile = new FileInfo(Path.Combine(item.FullName, ".umgc")); var metaFile = new FileInfo(Path.Combine(item.FullName, ".umgc"));
if (metaFile.Exists) { if (metaFile.Exists) {
using (var reader = new StreamReader(metaFile.FullName)) { using (var reader = new StreamReader(metaFile.FullName)) {
meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd()); meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
} }
} if (meta.cover != null && meta.cover != "") {
AsyncDelivery<Texture2D> cover = null; var coverFile = item.GetFiles(meta.cover);
if (meta.cover != null && meta.cover != "") { if (coverFile.Length > 0) {
var coverFile = item.GetFiles(meta.cover); cover = new AsyncDelivery<Texture2D>();
if (coverFile.Length > 0) { var task = new LoadTextureTask(PlatformConfig.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver);
cover = new AsyncDelivery<Texture2D>(); cover.CancelSource = task.Cancel;
var task = new LoadTextureTask(PlatformConfig.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver); Game.NetworkTaskWorker.SubmitNetworkTask(task);
cover.CancelSource = task.Cancel; }
Game.NetworkTaskWorker.SubmitNetworkTask(task);
} }
} }
return new ChartDetail { return new ChartDetail {

18
Assets/Cryville/Crtr/Browsing/UI/DetailPanel.cs
View File

@@ -43,12 +43,18 @@ namespace Cryville.Crtr.Browsing.UI {
m_cover.sprite = m_coverPlaceholder; m_cover.sprite = m_coverPlaceholder;
if (data.Cover != null) data.Cover.Destination = DisplayCover; if (data.Cover != null) data.Cover.Destination = DisplayCover;
var meta = data.Meta; var meta = data.Meta;
m_title.text = string.Format("{0}\n{1}", meta.song.name, meta.name); if (meta != null) {
m_desc.text = string.Format( m_title.text = string.Format("{0}\n{1}", meta.song.name, meta.name);
"Music artist: {0}\nCharter: {1}\nLength: {2}\nNote Count: {3}", m_desc.text = string.Format(
meta.song.author, meta.author, "Music artist: {0}\nCharter: {1}\nLength: {2}\nNote Count: {3}",
TimeSpan.FromSeconds(meta.length).ToString(3), meta.note_count meta.song.author, meta.author,
); TimeSpan.FromSeconds(meta.length).ToString(3), meta.note_count
);
}
else {
m_title.text = "<color=#ff0000>Invalid resource</color>";
m_desc.text = string.Empty;
}
} }
private void DisplayCover(bool succeeded, Texture2D tex) { private void DisplayCover(bool succeeded, Texture2D tex) {
if (succeeded) { if (succeeded) {