diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index c8e3f75..0be6ed0 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -123,6 +123,85 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &31515716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 31515717} + - component: {fileID: 31515719} + - component: {fileID: 31515718} + m_Layer: 5 + m_Name: Item Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &31515717 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31515716} + 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: 865624680} + 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: 5, y: -0.5} + m_SizeDelta: {x: -30, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &31515718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31515716} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Option A +--- !u!222 &31515719 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31515716} + m_CullTransparentMesh: 1 --- !u!1 &47763036 GameObject: m_ObjectHideFlags: 0 @@ -226,7 +305,7 @@ GameObject: - component: {fileID: 92262560} - component: {fileID: 92262559} m_Layer: 5 - m_Name: LoadVrm + m_Name: NewVrmButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -239,19 +318,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92262557} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1002299537} - m_Father: {fileID: 682378599} - m_RootOrder: 0 + m_Father: {fileID: 243749894} + 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: 30, y: -95} - m_SizeDelta: {x: 160, y: 50} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 250, y: -80} + m_SizeDelta: {x: 130, y: 35} + m_Pivot: {x: 0, y: 1} --- !u!114 &92262559 MonoBehaviour: m_ObjectHideFlags: 0 @@ -539,7 +618,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 682378599} - - {fileID: 880332618} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -595,8 +673,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 190, y: 25} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 190, y: 35} m_Pivot: {x: 0, y: 1} --- !u!114 &150812165 MonoBehaviour: @@ -886,11 +964,11 @@ RectTransform: m_Father: {fileID: 682378599} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1120, y: 0} - m_SizeDelta: {x: 410, y: 0} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 1340, y: 0} + m_SizeDelta: {x: 410, y: 140} + m_Pivot: {x: 0, y: 1} --- !u!1 &217036798 GameObject: m_ObjectHideFlags: 0 @@ -1264,6 +1342,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 241351533} m_CullTransparentMesh: 1 +--- !u!1 &243749893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 243749894} + m_Layer: 5 + m_Name: LoadVrm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &243749894 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243749893} + 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: 1732490857} + - {fileID: 1467868737} + - {fileID: 92262558} + m_Father: {fileID: 682378599} + 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: 30, y: 0} + m_SizeDelta: {x: 390, y: 140} + m_Pivot: {x: 0, y: 1} --- !u!1 &254526295 GameObject: m_ObjectHideFlags: 0 @@ -1300,7 +1416,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: 679.99994, y: -80} + m_AnchoredPosition: {x: 680, y: -80} m_SizeDelta: {x: 160, y: 35} m_Pivot: {x: 0, y: 1} --- !u!114 &254526297 @@ -1559,6 +1675,81 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &315163363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 315163364} + - component: {fileID: 315163366} + - component: {fileID: 315163365} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &315163364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 315163363} + 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: 1827539833} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.2} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &315163365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 315163363} + 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 &315163366 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 315163363} + m_CullTransparentMesh: 1 --- !u!1 &317560729 GameObject: m_ObjectHideFlags: 0 @@ -1793,6 +1984,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 364027160} m_CullTransparentMesh: 1 +--- !u!1 &367156827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 367156828} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &367156828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367156827} + 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: 865624680} + m_Father: {fileID: 1794277503} + 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} + m_SizeDelta: {x: 0, y: 28} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &367726506 GameObject: m_ObjectHideFlags: 0 @@ -2245,7 +2472,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: 0, y: -30} + m_AnchoredPosition: {x: 0, y: -25} m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &437487388 @@ -2414,8 +2641,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 285, y: -80} - m_SizeDelta: {x: 150, y: 35} + m_AnchoredPosition: {x: 285, y: -75} + m_SizeDelta: {x: 150, y: 45} m_Pivot: {x: 0, y: 1} --- !u!114 &457217077 MonoBehaviour: @@ -2594,8 +2821,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 240, y: 35} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 240, y: 45} m_Pivot: {x: 0, y: 1} --- !u!114 &589837112 MonoBehaviour: @@ -2814,17 +3041,18 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 92262558} + - {fileID: 243749894} - {fileID: 978042610} - {fileID: 214973872} - {fileID: 1187475019} + - {fileID: 1456607956} m_Father: {fileID: 110265734} 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} - m_SizeDelta: {x: 0, y: 140} + m_SizeDelta: {x: 0, y: 240} m_Pivot: {x: 0.5, y: 1} --- !u!114 &682378600 MonoBehaviour: @@ -2943,7 +3171,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 713946396} m_CullTransparentMesh: 1 ---- !u!1 &742051873 +--- !u!1 &715804442 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2951,78 +3179,153 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 742051874} - - component: {fileID: 742051876} - - component: {fileID: 742051875} + - component: {fileID: 715804443} + - component: {fileID: 715804445} + - component: {fileID: 715804444} m_Layer: 5 - m_Name: Placeholder + m_Name: Item Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &742051874 +--- !u!224 &715804443 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 742051873} + m_GameObject: {fileID: 715804442} 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: 964746795} + m_Father: {fileID: 865624680} 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.5} - m_SizeDelta: {x: -20, y: -13} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &742051875 +--- !u!114 &715804444 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 742051873} + m_GameObject: {fileID: 715804442} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 20 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: height(option) ---- !u!222 &742051876 + 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 +--- !u!222 &715804445 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 742051873} + m_GameObject: {fileID: 715804442} m_CullTransparentMesh: 1 ---- !u!1 &758154717 +--- !u!1 &742051873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 742051874} + - component: {fileID: 742051876} + - component: {fileID: 742051875} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &742051874 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742051873} + 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: 964746795} + 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.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &742051875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742051873} + 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.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + 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: 20 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: height(option) +--- !u!222 &742051876 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742051873} + m_CullTransparentMesh: 1 +--- !u!1 &758154717 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3554,7 +3857,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &880332617 +--- !u!1 &865624679 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3562,74 +3865,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 880332618} - - component: {fileID: 880332620} - - component: {fileID: 880332619} + - component: {fileID: 865624680} + - component: {fileID: 865624681} m_Layer: 5 - m_Name: VisualizerControl + m_Name: Item m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &880332618 +--- !u!224 &865624680 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 880332617} + m_GameObject: {fileID: 865624679} 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: 1456607956} - m_Father: {fileID: 110265734} - m_RootOrder: 1 + - {fileID: 715804443} + - {fileID: 2109516056} + - {fileID: 31515717} + m_Father: {fileID: 367156828} + 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: -140} - m_SizeDelta: {x: 0, y: 100} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &880332619 + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &865624681 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 880332617} + m_GameObject: {fileID: 865624679} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: + 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: 715804444} + toggleTransition: 1 + graphic: {fileID: 2109516057} + m_Group: {fileID: 0} + onValueChanged: 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 ---- !u!222 &880332620 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 880332617} - m_CullTransparentMesh: 1 + m_IsOn: 1 --- !u!1 &913329779 GameObject: m_ObjectHideFlags: 0 @@ -3747,8 +4061,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 240, y: 35} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 240, y: 45} m_Pivot: {x: 0, y: 1} --- !u!114 &922446039 MonoBehaviour: @@ -3915,7 +4229,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 1.27, z: 0.82} + m_LocalPosition: {x: 0, y: 1.35, z: 0.8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -3958,8 +4272,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 485, y: -80} - m_SizeDelta: {x: 150, y: 35} + m_AnchoredPosition: {x: 485, y: -75} + m_SizeDelta: {x: 150, y: 45} m_Pivot: {x: 0, y: 1} --- !u!114 &964746796 MonoBehaviour: @@ -4101,11 +4415,11 @@ RectTransform: m_Father: {fileID: 682378599} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 220, y: 0} - m_SizeDelta: {x: 840, y: 0} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 460, y: 0} + m_SizeDelta: {x: 840, y: 140} + m_Pivot: {x: 0, y: 1} --- !u!1 &1002299536 GameObject: m_ObjectHideFlags: 0 @@ -4165,7 +4479,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 25 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -4176,7 +4490,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Load VRM + m_Text: New VRM --- !u!222 &1002299539 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4185,6 +4499,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1002299536} m_CullTransparentMesh: 1 +--- !u!1 &1081282240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1081282241} + - component: {fileID: 1081282244} + - component: {fileID: 1081282243} + - component: {fileID: 1081282242} + m_Layer: 5 + m_Name: Template + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1081282241 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081282240} + 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: 1794277503} + - {fileID: 1509233456} + m_Father: {fileID: 1467868737} + m_RootOrder: 2 + 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: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1081282242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081282240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 367156828} + 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: 1794277503} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1509233457} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1081282243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081282240} + 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 &1081282244 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081282240} + m_CullTransparentMesh: 1 --- !u!1 &1082117798 GameObject: m_ObjectHideFlags: 0 @@ -4620,11 +5042,11 @@ RectTransform: m_Father: {fileID: 682378599} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1570, y: 0} - m_SizeDelta: {x: 330, y: 0} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: -140} + m_SizeDelta: {x: 330, y: 100} + m_Pivot: {x: 0, y: 1} --- !u!1 &1203989279 GameObject: m_ObjectHideFlags: 0 @@ -5267,8 +5689,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 190, y: -80} - m_SizeDelta: {x: 140, y: 25} + m_AnchoredPosition: {x: 190, y: -50} + m_SizeDelta: {x: 140, y: 35} m_Pivot: {x: 0, y: 1} --- !u!114 &1259961777 MonoBehaviour: @@ -5731,7 +6153,7 @@ GameObject: - component: {fileID: 1328162103} - component: {fileID: 1328162102} m_Layer: 5 - m_Name: InputDeviceText + m_Name: AvatarControlText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5753,7 +6175,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: 0, y: -30} + m_AnchoredPosition: {x: 0, y: -25} m_SizeDelta: {x: 170, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1328162102 @@ -6082,7 +6504,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1417838062} m_CullTransparentMesh: 1 ---- !u!1 &1456607955 +--- !u!1 &1441309376 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6090,21 +6512,100 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1456607956} + - component: {fileID: 1441309377} + - component: {fileID: 1441309379} + - component: {fileID: 1441309378} m_Layer: 5 - m_Name: AvatarControl + m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1456607956 +--- !u!224 &1441309377 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1456607955} + m_GameObject: {fileID: 1441309376} + 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: 1467868737} + 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: -7.5, y: -0.5} + m_SizeDelta: {x: -35, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1441309378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441309376} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Option A +--- !u!222 &1441309379 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441309376} + m_CullTransparentMesh: 1 +--- !u!1 &1456607955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1456607956} + m_Layer: 5 + m_Name: AvatarControl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1456607956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456607955} 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} @@ -6115,14 +6616,164 @@ RectTransform: - {fileID: 1103834015} - {fileID: 1265961704} - {fileID: 1699879247} - m_Father: {fileID: 880332618} - m_RootOrder: 0 + m_Father: {fileID: 682378599} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: 50} - m_SizeDelta: {x: 840, y: -100} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 400, y: -140} + m_SizeDelta: {x: 840, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!1 &1467868736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1467868737} + - component: {fileID: 1467868740} + - component: {fileID: 1467868739} + - component: {fileID: 1467868738} + m_Layer: 5 + m_Name: VrmSelectDropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1467868737 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467868736} + 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: 1441309377} + - {fileID: 1857379992} + - {fileID: 1081282241} + m_Father: {fileID: 243749894} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 240, y: 45} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1467868738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467868736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, 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: 1467868739} + m_Template: {fileID: 1081282241} + m_CaptionText: {fileID: 1441309378} + m_CaptionImage: {fileID: 0} + m_ItemText: {fileID: 31515718} + m_ItemImage: {fileID: 0} + m_Value: 0 + m_Options: + m_Options: + - m_Text: Option A + m_Image: {fileID: 0} + - m_Text: Option B + m_Image: {fileID: 0} + - m_Text: Option C + m_Image: {fileID: 0} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1587756042} + m_TargetAssemblyTypeName: VisualizeCtrlUI, Assembly-CSharp + m_MethodName: ChangeVrmFromDropdownUi + 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 + m_AlphaFadeSpeed: 0.15 +--- !u!114 &1467868739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467868736} + 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 &1467868740 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467868736} + m_CullTransparentMesh: 1 --- !u!1 &1479591954 GameObject: m_ObjectHideFlags: 0 @@ -6202,6 +6853,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1479591954} m_CullTransparentMesh: 1 +--- !u!1 &1509233455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1509233456} + - component: {fileID: 1509233459} + - component: {fileID: 1509233458} + - component: {fileID: 1509233457} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1509233456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509233455} + 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: 1827539833} + m_Father: {fileID: 1081282241} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1509233457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509233455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 315163365} + m_HandleRect: {fileID: 315163364} + m_Direction: 2 + m_Value: 0 + m_Size: 0.2 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1509233458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509233455} + 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: 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 &1509233459 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509233455} + m_CullTransparentMesh: 1 --- !u!1 &1531634633 GameObject: m_ObjectHideFlags: 0 @@ -6668,6 +7445,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: visuallizer: {fileID: 1587756039} + vrmSelectDropdown: {fileID: 1467868738} defaultTexture: {fileID: 2800000, guid: bba2c9416aea5044b8a15bc3ef252fb9, type: 3} backGroundTexture: {fileID: 759036286} backTextureSelect: {fileID: 589837112} @@ -7028,7 +7806,86 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707214355} + m_GameObject: {fileID: 1707214355} + m_CullTransparentMesh: 1 +--- !u!1 &1732490856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1732490857} + - component: {fileID: 1732490859} + - component: {fileID: 1732490858} + m_Layer: 5 + m_Name: VrmSelectText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1732490857 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732490856} + 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: 243749894} + 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: 0, y: -30} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1732490858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732490856} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: VRM Select +--- !u!222 &1732490859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732490856} m_CullTransparentMesh: 1 --- !u!1 &1754448154 GameObject: @@ -7221,6 +8078,132 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1794277502 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1794277503} + - component: {fileID: 1794277506} + - component: {fileID: 1794277505} + - component: {fileID: 1794277504} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1794277503 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1794277502} + 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: 367156828} + m_Father: {fileID: 1081282241} + 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: -18, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1794277504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1794277502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1794277505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1794277502} + 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 &1794277506 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1794277502} + m_CullTransparentMesh: 1 +--- !u!1 &1827539832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1827539833} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1827539833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827539832} + 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: 315163364} + m_Father: {fileID: 1509233456} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1832972635 GameObject: m_ObjectHideFlags: 0 @@ -7329,6 +8312,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1832972635} m_CullTransparentMesh: 1 +--- !u!1 &1857379991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857379992} + - component: {fileID: 1857379994} + - component: {fileID: 1857379993} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1857379992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857379991} + 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: 1467868737} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1857379993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857379991} + 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: 10915, guid: 0000000000000000f000000000000000, type: 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 +--- !u!222 &1857379994 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857379991} + m_CullTransparentMesh: 1 --- !u!1 &1893656760 GameObject: m_ObjectHideFlags: 0 @@ -7367,8 +8425,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 70, y: -50} - m_SizeDelta: {x: 180, y: 35} + m_AnchoredPosition: {x: 70, y: -45} + m_SizeDelta: {x: 180, y: 45} m_Pivot: {x: 0, y: 1} --- !u!114 &1893656762 MonoBehaviour: @@ -7937,6 +8995,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2021444181} m_CullTransparentMesh: 1 +--- !u!1 &2109516055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2109516056} + - component: {fileID: 2109516058} + - component: {fileID: 2109516057} + m_Layer: 5 + m_Name: Item Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2109516056 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109516055} + 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: 865624680} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2109516057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109516055} + 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: 10901, guid: 0000000000000000f000000000000000, type: 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 +--- !u!222 &2109516058 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109516055} + m_CullTransparentMesh: 1 --- !u!1 &2132884213 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CameraMove.cs b/Assets/Scripts/CameraMove.cs index f332ab0..dc74d03 100644 --- a/Assets/Scripts/CameraMove.cs +++ b/Assets/Scripts/CameraMove.cs @@ -10,7 +10,6 @@ public class CameraMove : MonoBehaviour [SerializeField] CanvasGroup controlCanvas; [SerializeField] Camera PredictionCamera; - bool isDragging = false; bool isUiShow = true; public void OnClick(BaseEventData data) diff --git a/Assets/Scripts/VisualizeCtrlUI.cs b/Assets/Scripts/VisualizeCtrlUI.cs index 29ad15a..6833321 100644 --- a/Assets/Scripts/VisualizeCtrlUI.cs +++ b/Assets/Scripts/VisualizeCtrlUI.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; using HolisticMotionCapture; @@ -13,6 +14,7 @@ public class VisualizeCtrlUI : MonoBehaviour { [SerializeField] Visuallizer visuallizer; + [SerializeField] Dropdown vrmSelectDropdown; [SerializeField] Texture defaultTexture; [SerializeField] RawImage backGroundTexture; [SerializeField] Dropdown backTextureSelect; @@ -23,9 +25,14 @@ public class VisualizeCtrlUI : MonoBehaviour [SerializeField] Toggle isUpperBodyOnlyToggle; [SerializeField] Toggle lookCameraToggle; + readonly string loadedVrmsPath = "/VrmFiles"; + string defaultVrmPath; + readonly string avatarPlayerPrefsKey = "SelectedVrmFileName"; readonly string loadedImagePath = "/LoadedImages"; readonly string defaultTextureName = "Default"; readonly string backOffName = "None"; + readonly string backImagePlayerPrefsKey = "SelectedBackgroundImageFileName"; + void Awake() { @@ -44,14 +51,65 @@ void Awake() void Start() { - backGroundTexture.texture = defaultTexture; - backGroundTexture.texture.name = defaultTextureName; - + defaultVrmPath = Application.streamingAssetsPath + "/DefaultSampleAvatar.vrm"; + CreateVrmDropdownOptions(); CreateImageOptions(); CaptureSwitched(); CreateHolisticMocapTypeOptions(); ChangeIsUpperBodyOnly(); ChangeLookCamera(); + + var lastOpenVrm = PlayerPrefs.GetString(avatarPlayerPrefsKey); + var initVrm = string.IsNullOrEmpty(lastOpenVrm) ? defaultVrmPath : lastOpenVrm; + ChangeVrmFromFileName(initVrm); + for (int i = 0; i < vrmSelectDropdown.options.Count; i++) + { + var option = vrmSelectDropdown.options[i]; + if (option.text == initVrm) + { + vrmSelectDropdown.value = i; + vrmSelectDropdown.RefreshShownValue(); + break; + } + } + + var lastOpenbackImage = PlayerPrefs.GetString(backImagePlayerPrefsKey); + var initBackImage = string.IsNullOrEmpty(lastOpenbackImage) ? defaultTextureName : lastOpenbackImage; + ChangeBackTextureFromFileName(initBackImage); + for (int i = 0; i < backTextureSelect.options.Count; i++) + { + var option = backTextureSelect.options[i]; + if (option.text == initBackImage) + { + backTextureSelect.value = i; + backTextureSelect.RefreshShownValue(); + break; + } + } + } + + void OnDestroy() + { + PlayerPrefs.SetString(avatarPlayerPrefsKey, vrmSelectDropdown.options[vrmSelectDropdown.value].text); + PlayerPrefs.SetString(backImagePlayerPrefsKey, backTextureSelect.options[backTextureSelect.value].text); + } + + void CreateVrmDropdownOptions() + { + if (!Directory.Exists(Application.persistentDataPath + loadedVrmsPath)) + { + Directory.CreateDirectory(Application.persistentDataPath + loadedVrmsPath); + } + var vrmPathes = Directory.GetFiles(Application.persistentDataPath + loadedVrmsPath, "*.vrm"); + + var vrmSelectOptions = new List(); + vrmSelectOptions.Add(Path.GetFileNameWithoutExtension(defaultVrmPath)); + foreach (var path in vrmPathes) + { + vrmSelectOptions.Add(Path.GetFileNameWithoutExtension(path)); + } + vrmSelectDropdown.ClearOptions(); + vrmSelectDropdown.AddOptions(vrmSelectOptions); } void CreateImageOptions() @@ -103,6 +161,31 @@ public void ChangeLookCamera() visuallizer.SetMainCameraLook(lookCameraToggle.isOn); } + public void ChangeVrmFromDropdownUi() + { + var filename = vrmSelectDropdown.options[vrmSelectDropdown.value].text; + ChangeVrmFromFileName(filename); + } + + private async Task ChangeVrmFromFileName(string filename) + { + var path = Application.persistentDataPath + loadedVrmsPath + "/" + filename + ".vrm"; + if (filename == Path.GetFileNameWithoutExtension(defaultVrmPath)) + { + path = defaultVrmPath; + } + await ChangeVrmFromPath(path); + } + + private async Task ChangeVrmFromPath(string path) + { + var instance = await VrmUtility.LoadAsync(path); + instance.ShowMeshes(); + var animator = instance.GetComponent(); + visuallizer.SetAnimator(animator); + Camera.main.transform.position = animator.GetBoneTransform(HumanBodyBones.Head).position + Vector3.forward * 0.8f; + } + public void VrmFileLoad() { var extensions = new[]{ @@ -118,15 +201,28 @@ public void VrmFileLoad() var extension = Path.GetExtension(path).ToLower(); if (extension != ".vrm") return; - var instance = await VrmUtility.LoadAsync(path); - instance.ShowMeshes(); - visuallizer.SetAnimator(instance.GetComponent()); + await ChangeVrmFromPath(path); + + var filename = Path.GetFileNameWithoutExtension(path) + ".vrm"; + var savePath = Application.persistentDataPath + loadedVrmsPath + "/" + filename; + File.Copy(path, savePath, true); + + var option = new Dropdown.OptionData(); + option.text = Path.GetFileNameWithoutExtension(path); + vrmSelectDropdown.options.Add(option); + vrmSelectDropdown.value = vrmSelectDropdown.options.Count - 1; + vrmSelectDropdown.RefreshShownValue(); }); } public void ChangeBackTexture() { var filename = backTextureSelect.options[backTextureSelect.value].text; + ChangeBackTextureFromFileName(filename); + } + + private void ChangeBackTextureFromFileName(string filename) + { if (filename == defaultTexture.name) { backGroundTexture.texture = defaultTexture; @@ -173,6 +269,7 @@ public void NewImageLoad() option.text = filename; backTextureSelect.options.Add(option); backTextureSelect.value = backTextureSelect.options.Count - 1; + backTextureSelect.RefreshShownValue(); }); } diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000..c2d5083 --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a14649883c679114b92df550e06dfd83 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/DefaultSampleAvatar.vrm b/Assets/StreamingAssets/DefaultSampleAvatar.vrm new file mode 100644 index 0000000..4ed141f Binary files /dev/null and b/Assets/StreamingAssets/DefaultSampleAvatar.vrm differ diff --git a/Assets/StreamingAssets/DefaultSampleAvatar.vrm.meta b/Assets/StreamingAssets/DefaultSampleAvatar.vrm.meta new file mode 100644 index 0000000..026ad4a --- /dev/null +++ b/Assets/StreamingAssets/DefaultSampleAvatar.vrm.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f56072eac551d54a9da497fcf6bf71b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/HolisticMotionCapture/CHANGELOG.md b/Packages/HolisticMotionCapture/CHANGELOG.md index 486938d..061f48f 100644 --- a/Packages/HolisticMotionCapture/CHANGELOG.md +++ b/Packages/HolisticMotionCapture/CHANGELOG.md @@ -1,3 +1,11 @@ +### [1.1.0] - 2023-02-12 + +- Add sample VRM avatar. +- Save vrm files once loaded. +- Open the previously saved VRM and background files when the application is restarted. +- Fix bug that disapper UI text when window resize. +- Fix bug that not move avatar's iris. + ### [1.0.0] - 2023-01-10 This is the first release of HolisticMotionCapture! diff --git a/Packages/HolisticMotionCapture/README.md b/Packages/HolisticMotionCapture/README.md index 5591318..b8ef568 100644 --- a/Packages/HolisticMotionCapture/README.md +++ b/Packages/HolisticMotionCapture/README.md @@ -14,17 +14,21 @@ HolisticMotionCapture can be downloaded from [release page](https://github.com/c ### For Windows -Download installer(`HolisticMotionCapture-1.0.0setup.exe` file) from [1.0.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.0.0) and execute it. +Download installer(`HolisticMotionCapture-1.1.0setup.exe` file) from [1.1.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.1.0) and execute it. ### For Mac OS -Download installer(`HolisticMotionCapture_Installer.dmg` file) from [1.0.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.0.0) and execute it. +Download installer(`HolisticMotionCapture_installer.pkg` file) from [1.1.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.1.0) and execute it. ## Usage HolisticMotionCapture application -### Load your VRM file +### Select your VRM file -Push the `Load VRM` for loading your VRM file. +- You can change to your vrm avatar from pull down. +- Images are loaded from and save to `C:/Users//AppData/LocalLow/IKEP/HolisticMotionCapture/VrmFiles` directory in Windows. +- Images are loaded from and save to `/Users//Library/Application Support/IKEP/HolisticMotionCapture/VrmFiles` directory in Mac OS. +- You can load new vrm avatar from the `New VRM` button. + - You can continue to use the vrm file is loaded once, if application is restarting. ### Image Device @@ -90,7 +94,7 @@ To the `scopedRegistries` section: To the `dependencies` section: ``` -"jp.ikep.holistic-motion-capture": "1.0.0" +"jp.ikep.holistic-motion-capture": "1.1.0" ``` Finally, the manifest file looks like below: @@ -110,7 +114,7 @@ Finally, the manifest file looks like below: } ], "dependencies": { - "jp.ikep.holistic-motion-capture": "1.0.0", + "jp.ikep.holistic-motion-capture": "1.1.0", ... } } diff --git a/Packages/HolisticMotionCapture/Scripts/HolisticMotionCapture_Face.cs b/Packages/HolisticMotionCapture/Scripts/HolisticMotionCapture_Face.cs index 51c8e3e..73ac75d 100644 --- a/Packages/HolisticMotionCapture/Scripts/HolisticMotionCapture_Face.cs +++ b/Packages/HolisticMotionCapture/Scripts/HolisticMotionCapture_Face.cs @@ -8,6 +8,7 @@ namespace HolisticMotionCapture partial class HolisticMotionCapturePipeline { VRMBlendShapeProxy proxy; + VRMLookAtHead vrmLookAtHead; int faceCounter; List face_lpfs; List> lpfedFaceBuffers; @@ -31,6 +32,7 @@ partial class HolisticMotionCapturePipeline void FaceInit() { proxy = avatar.GetComponent(); + vrmLookAtHead = avatar.GetComponent(); face_lpfs = new List(); lpfedFaceBuffers = new List>(); @@ -113,12 +115,13 @@ void FaceRender(HolisticMocapType mocapType, float faceScoreThreshold, Transform BlinkRender(); if (lookTargetWorldPosition != null) { - avatar.GetComponent().Target = lookTargetWorldPosition; + vrmLookAtHead.Target = lookTargetWorldPosition; var headTransform = avatar.GetBoneTransform(HumanBodyBones.Head); headTransform.LookAt(lookTargetWorldPosition); } else { + vrmLookAtHead.Target = null; PupilRender(); } MouthRender(); diff --git a/Packages/HolisticMotionCapture/package.json b/Packages/HolisticMotionCapture/package.json index 769ee77..ce73b6b 100644 --- a/Packages/HolisticMotionCapture/package.json +++ b/Packages/HolisticMotionCapture/package.json @@ -6,7 +6,7 @@ "name": "jp.ikep.holistic-motion-capture", "displayName": "HolisticMotionCapture", "description": "Motion capture for avatar holistic body with only a camera.", - "version": "1.0.0", + "version": "1.1.0", "unity": "2020.3", "unityRelease": "11f1", "keywords": [ @@ -23,4 +23,4 @@ }, "license": "Apache-2.0", "repository": "github:creativeIKEP/HolisticMotionCapture" -} +} \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8342f84..71423b1 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 0 16:9: 1 Others: 0 - bundleVersion: 1.0.0 + bundleVersion: 1.1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/README.md b/README.md index 5591318..b8ef568 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,21 @@ HolisticMotionCapture can be downloaded from [release page](https://github.com/c ### For Windows -Download installer(`HolisticMotionCapture-1.0.0setup.exe` file) from [1.0.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.0.0) and execute it. +Download installer(`HolisticMotionCapture-1.1.0setup.exe` file) from [1.1.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.1.0) and execute it. ### For Mac OS -Download installer(`HolisticMotionCapture_Installer.dmg` file) from [1.0.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.0.0) and execute it. +Download installer(`HolisticMotionCapture_installer.pkg` file) from [1.1.0 release page](https://github.com/creativeIKEP/HolisticMotionCapture/releases/tag/v1.1.0) and execute it. ## Usage HolisticMotionCapture application -### Load your VRM file +### Select your VRM file -Push the `Load VRM` for loading your VRM file. +- You can change to your vrm avatar from pull down. +- Images are loaded from and save to `C:/Users//AppData/LocalLow/IKEP/HolisticMotionCapture/VrmFiles` directory in Windows. +- Images are loaded from and save to `/Users//Library/Application Support/IKEP/HolisticMotionCapture/VrmFiles` directory in Mac OS. +- You can load new vrm avatar from the `New VRM` button. + - You can continue to use the vrm file is loaded once, if application is restarting. ### Image Device @@ -90,7 +94,7 @@ To the `scopedRegistries` section: To the `dependencies` section: ``` -"jp.ikep.holistic-motion-capture": "1.0.0" +"jp.ikep.holistic-motion-capture": "1.1.0" ``` Finally, the manifest file looks like below: @@ -110,7 +114,7 @@ Finally, the manifest file looks like below: } ], "dependencies": { - "jp.ikep.holistic-motion-capture": "1.0.0", + "jp.ikep.holistic-motion-capture": "1.1.0", ... } }