Optimize UI

This commit is contained in:
CroakFang
2022-09-27 21:20:54 +08:00
parent ead0e864ff
commit 217ea9da92
5 changed files with 3086 additions and 1081 deletions
+97 -6
View File
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 8271955219447533037}
- component: {fileID: 5050386386052281307}
- component: {fileID: 937176245766373427}
- component: {fileID: 3206038636655565637}
m_Layer: 5
m_Name: UmaContainer
m_TagString: Untagged
@@ -30,15 +31,16 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8301924667655547497}
- {fileID: 2752195846700614642}
- {fileID: 129370216671389609}
- {fileID: 8301924667655547497}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 180, y: 35}
m_SizeDelta: {x: 180, y: 55}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8271955219447533037
CanvasRenderer:
@@ -93,6 +95,20 @@ MonoBehaviour:
Name: {fileID: 857826377799910844}
Button: {fileID: 4701344421301256321}
Slider: {fileID: 0}
Image: {fileID: 2042513854733717578}
--- !u!114 &3206038636655565637
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 648541853701480401}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!1 &4970516181956112805
GameObject:
m_ObjectHideFlags: 0
@@ -257,12 +273,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 0
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_AnchoredPosition: {x: -4.8513, y: 0}
m_SizeDelta: {x: -16.0836, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3739219845069399070
CanvasRenderer:
@@ -393,7 +409,7 @@ RectTransform:
m_Children:
- {fileID: 6549944385096739170}
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -482,3 +498,78 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7277758024613498879
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 129370216671389609}
- component: {fileID: 5440685832306619784}
- component: {fileID: 2042513854733717578}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &129370216671389609
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7277758024613498879}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 70, y: -3.5}
m_SizeDelta: {x: 120, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5440685832306619784
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7277758024613498879}
m_CullTransparentMesh: 1
--- !u!114 &2042513854733717578
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7277758024613498879}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+2963 -1073
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -8,5 +8,5 @@ public class UmaUIContainer : MonoBehaviour
public TMPro.TextMeshProUGUI Name;
public Button Button;
public Slider Slider;
public Image Image;
}
+17 -1
View File
@@ -934,5 +934,21 @@ public class UmaViewerBuilder : MonoBehaviour
UI.LoadedAssetsClear();
}
public Sprite LoadCharaIcon(string id)
{
string value = $"chara/chr{id}/chr_icon_{id}";
var entry = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name.Equals(value));
string path = UmaDatabaseController.GetABPath(entry);
if (File.Exists(path))
{
AssetBundle assetBundle = AssetBundle.LoadFromFile(path);
if (assetBundle.Contains($"chr_icon_{id}"))
{
Texture2D texture = (Texture2D)assetBundle.LoadAsset($"chr_icon_{id}");
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
return sprite;
}
}
return null;
}
}
+8
View File
@@ -111,6 +111,8 @@ 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<UmaUIContainer>();
container.Name.text = container.name = chara.Id + " " + chara.Name;
var imageInstance1 = container.GetComponent<Image>();
@@ -119,6 +121,12 @@ public class UmaViewerUI : MonoBehaviour
ListCostumes(charaInstance.Id, false);
});
if (charaIcon)
{
container.Image.sprite = charaIcon;
container.Image.enabled = true;
}
container = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = chara.Id + " " + chara.Name;
var imageInstance2 = container.GetComponent<Image>();