From f10381209f54847a3a4a8fac866c2be942c8d1a1 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Wed, 28 Sep 2022 19:15:17 +0800 Subject: [PATCH] Optimize UI --- Assets/Prefabs/UmaContainer.prefab | 2 +- Assets/Scripts/UmaViewerMain.cs | 2 ++ Assets/Scripts/UmaViewerUI.cs | 23 ++++++++++++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Assets/Prefabs/UmaContainer.prefab b/Assets/Prefabs/UmaContainer.prefab index e68dd19..3e40760 100644 --- a/Assets/Prefabs/UmaContainer.prefab +++ b/Assets/Prefabs/UmaContainer.prefab @@ -609,7 +609,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 270, y: 270} + m_SizeDelta: {x: 260, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5440685832306619784 CanvasRenderer: diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index d0e9e17..6cab1ed 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -47,6 +47,7 @@ public class UmaViewerMain : MonoBehaviour Characters.Add(new CharaEntry() { Name = (string)item["charaNameEnglish"], + Icon = UmaViewerBuilder.Instance.LoadCharaIcon((string)item["charaId"]), Id = (int)item["charaId"] }); } @@ -99,6 +100,7 @@ public class UmaViewerMain : MonoBehaviour public class CharaEntry { public string Name; + public Sprite Icon; public int Id; } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 555c721..a552970 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -111,7 +111,6 @@ public class UmaViewerUI : MonoBehaviour foreach (var chara in Main.Characters.OrderBy(c => c.Id)) { var charaInstance = chara; - var charaIcon = UmaViewerBuilder.Instance.LoadCharaIcon(charaInstance.Id.ToString()); container = Instantiate(UmaContainerPrefab, CharactersList.content).GetComponent(); container.Name.text = container.name = chara.Id + " " + chara.Name; @@ -121,9 +120,9 @@ public class UmaViewerUI : MonoBehaviour ListCostumes(charaInstance.Id, false); }); - if (charaIcon) + if (chara.Icon) { - container.Image.sprite = charaIcon; + container.Image.sprite = chara.Icon; container.Image.enabled = true; } @@ -134,6 +133,12 @@ public class UmaViewerUI : MonoBehaviour HighlightChildImage(AnimationSetList.content, imageInstance2); ListAnimations(charaInstance.Id, false); }); + + if (chara.Icon) + { + container.Image.sprite = chara.Icon; + container.Image.enabled = true; + } } } @@ -202,6 +207,12 @@ public class UmaViewerUI : MonoBehaviour ListCostumes(charaInstance.Id, true); }); + if (chara.Icon) + { + container.Image.sprite = chara.Icon; + container.Image.enabled = true; + } + container = Instantiate(UmaContainerPrefab, MiniAnimationSetList.content).GetComponent(); container.Name.text = container.name = chara.Id + " " + chara.Name; var imageInstance2 = container.GetComponent(); @@ -209,6 +220,12 @@ public class UmaViewerUI : MonoBehaviour HighlightChildImage(MiniAnimationSetList.content, imageInstance2); ListAnimations(charaInstance.Id, true); }); + + if (chara.Icon) + { + container.Image.sprite = chara.Icon; + container.Image.enabled = true; + } } }