From 6d90d0dfdf36ecd70f9622278c7cf93ac8757b2b Mon Sep 17 00:00:00 2001 From: "1605296300@qq.com" Date: Fri, 9 Sep 2022 13:20:32 +0800 Subject: [PATCH] add Lyrics support --- Assets/Scenes/Version2.unity | 458 +++++++++++++++++---- Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 6 + Assets/Scripts/UmaViewerBuilder.cs | 50 ++- Assets/Scripts/UmaViewerUI.cs | 19 +- 4 files changed, 427 insertions(+), 106 deletions(-) diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 70f820d..a85fda2 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -1332,6 +1332,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114362110} m_CullTransparentMesh: 1 +--- !u!1 &123935076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 123935077} + - component: {fileID: 123935078} + - component: {fileID: 123935079} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &123935077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123935076} + 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: 1584955489} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &123935078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123935076} + m_CullTransparentMesh: 1 +--- !u!114 &123935079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123935076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 37 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 117 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &127647251 GameObject: m_ObjectHideFlags: 0 @@ -2238,6 +2317,7 @@ RectTransform: - {fileID: 1339030790} - {fileID: 755403585} - {fileID: 829429200} + - {fileID: 1584955489} m_Father: {fileID: 1300114664} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2414,7 +2494,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: -10} + m_AnchoredPosition: {x: -0.000061035156, y: -6} m_SizeDelta: {x: 0, y: 25} m_Pivot: {x: 0.5, y: 1} --- !u!222 &255869797 @@ -2454,8 +2534,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2472,8 +2552,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 16 + m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -9543,6 +9623,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 893956224} m_CullTransparentMesh: 1 +--- !u!1 &916764975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 916764976} + - component: {fileID: 916764979} + - component: {fileID: 916764978} + - component: {fileID: 916764977} + m_Layer: 5 + m_Name: LyricsButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &916764976 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 916764975} + 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: 1111938551} + m_Father: {fileID: 1209823365} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -35, y: 24.6} + m_SizeDelta: {x: 60, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &916764977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 916764975} + 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: 916764978} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: ToggleUIPanel + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1584955487} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &916764978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 916764975} + 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: 10905, 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 &916764979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 916764975} + m_CullTransparentMesh: 1 --- !u!1 &926505643 GameObject: m_ObjectHideFlags: 0 @@ -10749,6 +10962,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1104495874} m_CullTransparentMesh: 1 +--- !u!1 &1111938550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1111938551} + - component: {fileID: 1111938553} + - component: {fileID: 1111938552} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1111938551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111938550} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_Children: [] + m_Father: {fileID: 916764976} + m_RootOrder: 0 + 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: 0.000045776367, y: 0} + m_SizeDelta: {x: 120, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1111938552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111938550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 58 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 58 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: L +--- !u!222 &1111938553 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111938550} + m_CullTransparentMesh: 1 --- !u!1 &1113721204 GameObject: m_ObjectHideFlags: 0 @@ -10784,7 +11076,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: -40, y: 25} + m_SizeDelta: {x: -20, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1113721206 CanvasRenderer: @@ -10814,7 +11106,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00/00:00 + m_text: 00:00:00 / 00:00:00 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -10823,8 +11115,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -11604,6 +11896,7 @@ RectTransform: - {fileID: 1113721205} - {fileID: 2083721900} - {fileID: 2108171286} + - {fileID: 916764976} m_Father: {fileID: 1704906816} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14335,6 +14628,7 @@ MonoBehaviour: AudioPlayButton: {fileID: 2108171289} TitleText: {fileID: 255869798} ProgressText: {fileID: 1113721207} + LyricsText: {fileID: 123935079} SSWidth: {fileID: 0} SSHeight: {fileID: 0} TogglablePanels: @@ -14603,6 +14897,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576308332} m_CullTransparentMesh: 1 +--- !u!1 &1584955487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584955489} + - component: {fileID: 1584955488} + m_Layer: 5 + m_Name: Lyrics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &1584955488 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584955487} + m_CullTransparentMesh: 1 +--- !u!224 &1584955489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584955487} + 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: 123935077} + m_Father: {fileID: 242004464} + m_RootOrder: 9 + 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.5, y: 0.5} --- !u!1 &1590756439 GameObject: m_ObjectHideFlags: 0 @@ -15542,15 +15881,15 @@ RectTransform: m_GameObject: {fileID: 1671462945} 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_LocalScale: {x: 0.4, y: 0.4, z: 1} m_Children: [] m_Father: {fileID: 2108171286} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.000045776367, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 120, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1671462947 MonoBehaviour: @@ -15561,86 +15900,31 @@ MonoBehaviour: m_GameObject: {fileID: 1671462945} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: '>' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - 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: 1 - 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} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 58 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 58 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u25B6" --- !u!222 &1671462948 CanvasRenderer: m_ObjectHideFlags: 0 @@ -16049,7 +16333,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -19510,8 +19794,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 24.6} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 35, y: 24.6} + m_SizeDelta: {x: 60, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2108171287 MonoBehaviour: diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 06b2137..81ffe53 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -17,6 +17,12 @@ public class UmaCharaData public string tail_model_id; } +public class UmaLyricsData +{ + public float time; + public string text; +} + public enum UmaFileType { _3d_cutt, diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index d7cc0e2..d2a7da4 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -28,6 +28,7 @@ public class UmaViewerBuilder : MonoBehaviour public UmaContainer CurrentOtherContainer; public List CurrentAudioSources = new List(); + public List CurrentLyrics = new List(); public AnimatorOverrideController OverrideController; @@ -381,20 +382,7 @@ public class UmaViewerBuilder : MonoBehaviour } } - string lyricsVar = $"live/musicscores/m{songid}/m{songid}_lyrics"; - UmaDatabaseEntry lyricsAsset = Main.AbList.FirstOrDefault(a => a.Name.Contains(nameVar)); - if(lyricsAsset != null) - { - string filePath = GetABPath(lyricsAsset); - if (File.Exists(filePath)) - { - AssetBundle bundle = AssetBundle.LoadFromFile(filePath); - Main.LoadedBundles.Add(lyricsAsset.Name, bundle); - UI.LoadedAssetsAdd(lyricsAsset); - TextAsset asset = bundle.LoadAsset(Path.GetFileName(lyricsVar)); - Debug.Log(asset.text); - } - } + LoadLiveLyrics(songid); } private void AddAudioSource(AudioClip clip) @@ -435,7 +423,7 @@ public class UmaViewerBuilder : MonoBehaviour int sampleRate = stream.WaveFormat.SampleRate; AudioClip clip = AudioClip.Create( - Path.GetFileName(awb.Name).Replace(".awb", wave.WaveId.ToString()), + Path.GetFileNameWithoutExtension(awb.Name)+"_"+wave.WaveId.ToString(), (int)(stream.Length / channels / bytesPerSample), channels, sampleRate, @@ -447,8 +435,37 @@ public class UmaViewerBuilder : MonoBehaviour return clips; } - + public void LoadLiveLyrics(int songid) + { + if (CurrentLyrics.Count > 0) CurrentLyrics.Clear(); + + string lyricsVar = $"live/musicscores/m{songid}/m{songid}_lyrics"; + UmaDatabaseEntry lyricsAsset = Main.AbList.FirstOrDefault(a => a.Name.Contains(lyricsVar)); + if (lyricsAsset != null) + { + string filePath = GetABPath(lyricsAsset); + if (File.Exists(filePath)) + { + UI.LoadedAssetsAdd(lyricsAsset); + AssetBundle bundle = AssetBundle.LoadFromFile(filePath); + Main.LoadedBundles.Add(lyricsAsset.Name, bundle); + TextAsset asset = bundle.LoadAsset(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() + { + time = float.Parse(words[0])/1000, + text = words[1].Replace("[COMMA]",",") + }; + CurrentLyrics.Add(lyricsData); + } + } + } + } + private void RecursiveLoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false) { if (!string.IsNullOrEmpty(entry.Prerequisites)) @@ -504,7 +521,6 @@ public class UmaViewerBuilder : MonoBehaviour bbb.wrapMode = WrapMode.Loop; CurrentUMAContainer.OverrideController["clip"] = bbb; CurrentUMAContainer.UmaAnimator.Play("clip", 0, 0); - } if (!CurrentLiveContainer) diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index dee976c..6f540bd 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -39,6 +39,7 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack public Button AudioPlayButton; public TextMeshProUGUI TitleText; public TextMeshProUGUI ProgressText; + public Text LyricsText; //settings public TMP_InputField SSWidth, SSHeight; @@ -277,8 +278,8 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack foreach (var entry in Main.AbList.Where(a => a.Name.Contains(nameVar) && a.Name.EndsWith("awb"))) { var container = Instantiate(UmaContainerPrefab, LiveCharaSoundList.content).GetComponent(); - string[] split = entry.Name.Split('_'); - string name = split[split.Length - 2] + getCharaName(split[split.Length - 2]) + " " + split[split.Length - 1].Replace(".awb",""); + string[] split = Path.GetFileNameWithoutExtension(entry.Name).Split('_'); + string name = split[split.Length - 2] + getCharaName(split[split.Length - 2]) + " " + split[split.Length - 1]; container.Name.text = name; container.Button.onClick.AddListener(() => { HighlightChildImage(LiveCharaSoundList.content, container.GetComponent()); @@ -475,6 +476,7 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack TitleText.text = MianSource.clip.name; ProgressText.text = string.Format("{0} / {1}", ToTimeFormat(MianSource.time), ToTimeFormat(MianSource.clip.length)); AudioSlider.SetValueWithoutNotify(MianSource.time/ MianSource.clip.length); + LyricsText.text = GetCurrentLyrics(MianSource.time); } } } @@ -484,6 +486,7 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack TitleText.text = "No Audio"; ProgressText.text = "00:00:00 / 00:00:00"; AudioSlider.SetValueWithoutNotify(0); + LyricsText.text = ""; } public static string ToTimeFormat(float time) @@ -495,4 +498,16 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack seconds = seconds % 3600 % 60; return string.Format("{0:D2}:{1:D2}:{2:D2}", hour, minute, seconds); } + + public string GetCurrentLyrics(float time) + { + for(int i = Builder.CurrentLyrics.Count-1; i >=0; i--) + { + if(Builder.CurrentLyrics[i].time< time) + { + return Builder.CurrentLyrics[i].text; + } + } + return ""; + } }