From 35674b67b5b3385c58fc34e93b35cdd9d92ca23c Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Thu, 7 Mar 2024 00:22:13 +0800 Subject: [PATCH] Improve asset panel --- .../Prefabs/UmaUIContainer_Assets.prefab | 4 +- .../UI/Common/utx_btn_menu_01.png.meta | 2 +- Assets/Scenes/Version2.unity | 750 +++++++++++++++++- Assets/Scripts/UI/PageManager.cs | 23 + .../Scripts/UmaDatabase/UmaDatabaseEntry.cs | 2 +- Assets/Scripts/UmaViewerUI.cs | 57 +- 6 files changed, 780 insertions(+), 58 deletions(-) diff --git a/Assets/Resources/Prefabs/UmaUIContainer_Assets.prefab b/Assets/Resources/Prefabs/UmaUIContainer_Assets.prefab index 2f2050c..6924c27 100644 --- a/Assets/Resources/Prefabs/UmaUIContainer_Assets.prefab +++ b/Assets/Resources/Prefabs/UmaUIContainer_Assets.prefab @@ -77,7 +77,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + m_PixelsPerUnitMultiplier: 3 --- !u!114 &937176245766373427 MonoBehaviour: m_ObjectHideFlags: 0 @@ -360,7 +360,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 1.7927628, y: 0, z: 0, w: 0} + m_margin: {x: 5.075676, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Resources/UI/Common/utx_btn_menu_01.png.meta b/Assets/Resources/UI/Common/utx_btn_menu_01.png.meta index 6cc0850..9c8cf6e 100644 --- a/Assets/Resources/UI/Common/utx_btn_menu_01.png.meta +++ b/Assets/Resources/UI/Common/utx_btn_menu_01.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 23, y: 0, z: 23, w: 0} + spriteBorder: {x: 23, y: 26, z: 23, w: 22} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 18ce3c6..a56c0ec 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -3002,7 +3002,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -485} + m_AnchoredPosition: {x: 141.5, y: -997.18} m_SizeDelta: {x: 283, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &93905315 @@ -20241,6 +20241,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 659037971} m_CullTransparentMesh: 1 +--- !u!1 &661486954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 661486955} + - component: {fileID: 661486958} + - component: {fileID: 661486957} + - component: {fileID: 661486956} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &661486955 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 661486954} + 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: + - {fileID: 1249866795} + m_Father: {fileID: 2126459761} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 141.5, y: -525} + m_SizeDelta: {x: 283, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &661486956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 661486954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 661486957} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: CopyAllLoadedAssetsPath + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &661486957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 661486954} + m_Enabled: 1 + 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: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9a444f34ba8719a4083a94891d66b364, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &661486958 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 661486954} + m_CullTransparentMesh: 1 --- !u!1 &665091893 GameObject: m_ObjectHideFlags: 0 @@ -25973,9 +26106,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.5, y: -152.01} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &800374507 @@ -27410,7 +27543,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &833043611 @@ -29760,6 +29893,113 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 903342983} m_CullTransparentMesh: 1 +--- !u!1 &910450303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 910450305} + - component: {fileID: 910450307} + - component: {fileID: 910450306} + - component: {fileID: 910450304} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &910450304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910450303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1404353515} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1342836620} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!224 &910450305 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910450303} + 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: + - {fileID: 1342836620} + m_Father: {fileID: 2126459761} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 141.5, y: -225} + m_SizeDelta: {x: 283, y: 450} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &910450306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910450303} + m_Enabled: 1 + 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.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &910450307 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910450303} + m_CullTransparentMesh: 1 --- !u!1 &914165053 GameObject: m_ObjectHideFlags: 0 @@ -34452,6 +34692,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1088607139} m_CullTransparentMesh: 1 +--- !u!1001 &1091101904 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2126459761} + m_Modifications: + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 283 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -475 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2451699974473359926, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: ContainerPrefab + value: + objectReference: {fileID: 648541853701480401, guid: 69086587771c25b49aca758a09c06c9b, + type: 3} + - target: {fileID: 2959287579813893925, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_Name + value: PageControl + objectReference: {fileID: 0} + - target: {fileID: 7944254173761142343, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 14d034506760e5049a12fd1cf057a8b3, type: 3} --- !u!114 &1092593580 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2451699974473359926, guid: 14d034506760e5049a12fd1cf057a8b3, @@ -39033,6 +39403,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1243726156} m_CullTransparentMesh: 1 +--- !u!1 &1249866794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1249866795} + - component: {fileID: 1249866797} + - component: {fileID: 1249866796} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1249866795 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1249866794} + 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: 661486955} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.00012207031, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1249866796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1249866794} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Copy Path + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 309c10a796fa90746889302436dac032, type: 2} + m_sharedMaterial: {fileID: 1876532955194943090, guid: 309c10a796fa90746889302436dac032, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4283265953 + m_fontColor: {r: 0.6320754, g: 0.45141858, b: 0.30113026, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1249866797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1249866794} + m_CullTransparentMesh: 1 --- !u!1 &1255010893 GameObject: m_ObjectHideFlags: 0 @@ -41684,7 +42191,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1327085890 @@ -42035,6 +42542,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1342289414} m_CullTransparentMesh: 1 +--- !u!1 &1342836619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1342836620} + - component: {fileID: 1342836623} + - component: {fileID: 1342836622} + - component: {fileID: 1342836621} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1342836620 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342836619} + 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: + - {fileID: 1404353515} + m_Father: {fileID: 910450305} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1342836621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342836619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1342836622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342836619} + m_Enabled: 1 + 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: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1342836623 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342836619} + m_CullTransparentMesh: 1 --- !u!1 &1344871615 GameObject: m_ObjectHideFlags: 0 @@ -43781,6 +44378,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400934329} m_CullTransparentMesh: 1 +--- !u!1 &1404353514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1404353515} + - component: {fileID: 1404353516} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1404353515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1404353514} + 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: 1342836620} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.000008144033} + m_SizeDelta: {x: 0, y: 450} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1404353516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1404353514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1406840790 GameObject: m_ObjectHideFlags: 0 @@ -48161,11 +48820,10 @@ MonoBehaviour: type: 3} UmaContainerSliderPrefab: {fileID: 648541853701480401, guid: 75962a0f68455494db9858ad95fb4ae8, type: 3} - UmaContainerAssetsPrefab: {fileID: 648541853701480401, guid: 69086587771c25b49aca758a09c06c9b, - type: 3} UmaContainerTogglePrefab: {fileID: 5821056583242898604, guid: ff1d9411962b540449867d8ba74f77d9, type: 3} - LoadedAssetsPanel: {fileID: 2126459761} + LoadedAssetPageCtrl: {fileID: 1913585099} + LoadedAssetScrollRect: {fileID: 910450304} UIColor1: {r: 1, g: 1, b: 1, a: 0.39215687} UIColor2: {r: 1, g: 1, b: 1, a: 1} isHeadFix: 0 @@ -56924,7 +57582,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1846143406 @@ -58455,6 +59113,24 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1909384046} m_CullTransparentMesh: 1 +--- !u!224 &1913585098 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + m_PrefabInstance: {fileID: 1091101904} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1913585099 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2451699974473359926, guid: 14d034506760e5049a12fd1cf057a8b3, + type: 3} + m_PrefabInstance: {fileID: 1091101904} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74c8e9ce85fd19f4a897a5782348dd5b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1916293856 GameObject: m_ObjectHideFlags: 0 @@ -61669,7 +62345,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &2021517960 @@ -62549,6 +63225,9 @@ MonoBehaviour: _GlobalDirtToonColor: {r: 0, g: 0, b: 0, a: 0} _GlobalRimColor: {r: 1, g: 1, b: 1, a: 0} _GlobalDirtColor: {r: 0, g: 0, b: 0, a: 0} + _Global_LightmapColor: {r: 1, g: 1, b: 1, a: 1} + _Global_LightmapDensityAddColor: {r: 0, g: 0, b: 0, a: 0} + _Global_LightmapModulateColor: {r: 1, g: 1, b: 1, a: 1} _RimColor2: {r: 0, g: 0, b: 0, a: 0} _MainParam_0: {x: 0, y: 0, z: 0, w: 0} _MainParam_1: {x: 0, y: 0, z: 0, w: 0} @@ -64941,14 +65620,17 @@ RectTransform: 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_Children: + - {fileID: 910450305} + - {fileID: 1913585098} + - {fileID: 661486955} m_Father: {fileID: 1704906816} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -315} - m_SizeDelta: {x: 283, y: 0} + m_AnchoredPosition: {x: 141.5, y: -590} + m_SizeDelta: {x: 283, y: 550} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2126459762 MonoBehaviour: @@ -65008,9 +65690,9 @@ MonoBehaviour: m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 - m_ChildControlHeight: 1 + m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 @@ -66560,9 +67242,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.5, y: -304.02} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219665895574065 @@ -67069,9 +67751,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 1 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.5, y: -50.67} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666109573094 @@ -69430,9 +70112,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.5, y: -202.68} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666841734894 @@ -70262,9 +70944,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.5, y: -101.34} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667203546886 @@ -71976,9 +72658,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.5, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667749320559 @@ -72197,9 +72879,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.5, y: -253.34999} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!1 &6878219667784581358 diff --git a/Assets/Scripts/UI/PageManager.cs b/Assets/Scripts/UI/PageManager.cs index 64ab0ba..1ddb0ae 100644 --- a/Assets/Scripts/UI/PageManager.cs +++ b/Assets/Scripts/UI/PageManager.cs @@ -22,6 +22,7 @@ public class PageManager : MonoBehaviour private int currentPage = 0; private List Entries; private List SubEntries; + public void Initialize(List entries, ScrollRect scrollRect) { ScrollRect = scrollRect; @@ -36,6 +37,28 @@ public class PageManager : MonoBehaviour LoadPage(currentPage); SearchText.interactable = true; } + else + { + Clear(); + } + } + + public void AddEntries(Entry entry) + { + if (!ScrollRect) return; + + if (SearchText) + SearchText.text = ""; + Entries.Add(entry); + totalPage = Mathf.CeilToInt(Entries.Count / (float)ShowCount); + if (currentPage == totalPage - 1) + { + LoadPage(currentPage); + } + else + { + ((Text)PageText.placeholder).text = $"{currentPage + 1} / {totalPage}"; + } } public void ResetCtrl() diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs index 2207433..32ed3df 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs @@ -17,7 +17,7 @@ public class UmaDatabaseEntry get { var path = $"{Config.Instance.MainPath}\\dat\\{Url.Substring(0, 2)}\\{Url}"; - if (!File.Exists(path) && Config.Instance.WorkMode == WorkMode.Standalone) + if (Config.Instance.WorkMode == WorkMode.Standalone && !File.Exists(path)) { DownloadAsset(this); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 1c60022..2660913 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -6,10 +6,12 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; +using System.Text; using TMPro; using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; +using static PageManager; using Debug = UnityEngine.Debug; public class UmaViewerUI : MonoBehaviour @@ -123,11 +125,11 @@ public class UmaViewerUI : MonoBehaviour public GameObject UmaContainerCostumePrefab; public GameObject UmaContainerLivePrefab; public GameObject UmaContainerSliderPrefab; - public GameObject UmaContainerAssetsPrefab; public UmaUIContainer UmaContainerTogglePrefab; - private int LoadedAssetCount = 0; - [SerializeField] private RectTransform LoadedAssetsPanel; + private Dictionary LoadedAssetEntries = new Dictionary(); + public PageManager LoadedAssetPageCtrl; + public ScrollRect LoadedAssetScrollRect; public Color UIColor1, UIColor2; @@ -156,14 +158,16 @@ public class UmaViewerUI : MonoBehaviour AnimationSlider.onValueChanged.AddListener(AnimationProgressChange); AnimationSpeedSlider.onValueChanged.AddListener(AnimationSpeedChange); } + private void Start() { WorkModeDropdown.SetValueWithoutNotify((int)Config.Instance.WorkMode); LanguageDropdown.SetValueWithoutNotify((int)Config.Instance.Language); UpdateDBButton.interactable = (Config.Instance.WorkMode == WorkMode.Standalone); + LoadedAssetsClear(); UmaAssetManager.OnLoadedBundleUpdate += LoadedAssetsAdd; UmaAssetManager.OnLoadedBundleClear += LoadedAssetsClear; - + PoseManager.LoadLocalPoseFiles(); } @@ -219,29 +223,42 @@ public class UmaViewerUI : MonoBehaviour public void LoadedAssetsAdd(UmaDatabaseEntry entry) { - if (!LoadedAssetsPanel) return; - foreach (UmaUIContainer ui in LoadedAssetsPanel.GetComponentsInChildren()) - { - if (ui.Name == Path.GetFileName(entry.Name)) return; - } - - LoadedAssetCount++; + if (!LoadedAssetPageCtrl) return; + if (LoadedAssetEntries.ContainsKey(entry.Name)) return; + var file_name = Path.GetFileName(entry.Name); string filePath = entry.FilePath; - var container = Instantiate(UmaContainerAssetsPrefab, LoadedAssetsPanel).GetComponent(); - container.Name = Path.GetFileName(entry.Name); - container.Button.onClick.AddListener(() => { Process.Start("explorer.exe", "/select," + filePath); }); - LoadedAssetsPanel.sizeDelta = new Vector2(0, LoadedAssetCount * 35); + var assetentry = new Entry() + { + Name = file_name, + FontSize = 18, + OnClick = (container) => + { + Process.Start("explorer.exe", "/select," + filePath); + } + }; + LoadedAssetEntries.Add(entry.Name, assetentry); + LoadedAssetPageCtrl.AddEntries(assetentry); } public void LoadedAssetsClear() { - if (!LoadedAssetsPanel) return; - LoadedAssetCount = 0; - foreach (UmaUIContainer ui in LoadedAssetsPanel.GetComponentsInChildren()) + LoadedAssetEntries.Clear(); + LoadedAssetPageCtrl.ResetCtrl(); + LoadedAssetPageCtrl.Initialize(LoadedAssetEntries.Values.ToList(), LoadedAssetScrollRect); + } + + public void CopyAllLoadedAssetsPath() + { + StringBuilder sb = new StringBuilder(); + foreach(var entry in LoadedAssetEntries.Keys) { - Destroy(ui.gameObject); + if (Main.AbList.TryGetValue(entry, out var asset)) + { + sb.AppendLine(asset.FilePath); + } } - LoadedAssetsPanel.sizeDelta = Vector2.zero; + GUIUtility.systemCopyBuffer = sb.ToString(); + ShowMessage($"{LoadedAssetEntries.Count} Path copied", UIMessageType.Success); } public void LoadModelPanels()