diff --git a/Assets/Scenes/LiveScene.unity b/Assets/Scenes/LiveScene.unity index 25c5bb1..65b6354 100644 --- a/Assets/Scenes/LiveScene.unity +++ b/Assets/Scenes/LiveScene.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +116,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -152,10 +151,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1107325621} m_Father: {fileID: 2146838901} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -273,9 +272,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 708791003} - 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} @@ -349,10 +348,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1451251396} m_Father: {fileID: 827083130} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -516,9 +515,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 434506153} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -553,9 +552,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 912298140} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -627,12 +626,12 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1486344647} - {fileID: 2115128460} - {fileID: 359315159} m_Father: {fileID: 702572069} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -715,10 +714,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 515633909} m_Father: {fileID: 1174860554} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -865,12 +864,12 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1872910452} - {fileID: 1998228794} - {fileID: 827083130} m_Father: {fileID: 1237872487} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -943,9 +942,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 491122963} - 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} @@ -990,6 +989,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 515633908} m_CullTransparentMesh: 1 +--- !u!1 &575291951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 575291952} + m_Layer: 5 + m_Name: RecordingInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &575291952 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575291951} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1320332851} + - {fileID: 1950769034} + m_Father: {fileID: 2146838901} + 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 &679139652 GameObject: m_ObjectHideFlags: 0 @@ -1056,11 +1092,11 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1281263664} - {fileID: 2051549436} m_Father: {fileID: 2146838901} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1093,10 +1129,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 434506153} m_Father: {fileID: 1187866529} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1131,10 +1167,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 100974465} m_Father: {fileID: 2120942182} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1326,10 +1362,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1393088461} m_Father: {fileID: 1988617879} - 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} @@ -1365,11 +1401,11 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1187866529} - {fileID: 335038830} m_Father: {fileID: 499218593} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1472,9 +1508,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 955938935} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1551,13 +1587,13 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 955938935} - {fileID: 374273518} - {fileID: 1839609385} - {fileID: 1378933079} m_Father: {fileID: 1107325621} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1659,10 +1695,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 831711797} m_Father: {fileID: 912298140} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1791,9 +1827,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1378933079} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1866,9 +1902,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1839609385} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1939,11 +1975,11 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1988617879} - {fileID: 912298140} m_Father: {fileID: 61452365} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1977,11 +2013,11 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 491122963} - {fileID: 1923247386} m_Father: {fileID: 2051549436} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2077,10 +2113,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 702572069} m_Father: {fileID: 827083130} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2164,11 +2200,11 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 499218593} - {fileID: 1348886006} m_Father: {fileID: 2051549436} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2204,9 +2240,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 679139655} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2331,6 +2367,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1281263663} m_CullTransparentMesh: 1 +--- !u!1 &1320332850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1320332851} + - component: {fileID: 1320332853} + - component: {fileID: 1320332852} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1320332851 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1320332850} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 575291952} + 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!114 &1320332852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1320332850} + 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: 0, g: 0, b: 0, a: 0.56078434} + 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: 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 &1320332853 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1320332850} + m_CullTransparentMesh: 1 --- !u!1 &1348886005 GameObject: m_ObjectHideFlags: 0 @@ -2359,9 +2470,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1237872487} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2436,10 +2547,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 993298147} m_Father: {fileID: 912298140} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2474,9 +2585,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2120942182} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2553,9 +2664,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 770940035} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2630,10 +2741,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1864848830} m_Father: {fileID: 335038830} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2669,10 +2780,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1721556090} m_Father: {fileID: 1988617879} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2825,9 +2936,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 434506153} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2982,9 +3093,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -3018,12 +3137,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1529990365} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 1, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!1 &1721556089 GameObject: @@ -3053,9 +3173,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1454500081} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3190,9 +3310,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2090217551} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3225,10 +3345,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1006231794} m_Father: {fileID: 912298140} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -3263,9 +3383,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1451251396} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -3380,9 +3500,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 499218593} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3417,9 +3537,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1174860554} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3485,7 +3605,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1950769034 RectTransform: m_ObjectHideFlags: 0 @@ -3493,12 +3613,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1950769033} - 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2146838901} - m_RootOrder: 3 + m_Father: {fileID: 575291952} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3527,12 +3647,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} - m_FontSize: 30 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 49 - m_Alignment: 2 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3577,6 +3697,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -3606,12 +3727,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975009925} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -960, y: -540, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2146838901} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1988617878 GameObject: @@ -3639,11 +3761,11 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 770940035} - {fileID: 1454500081} m_Father: {fileID: 1107325621} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -3678,9 +3800,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 499218593} - 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} @@ -3750,12 +3872,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2017920247} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 155.5308, y: 9.989714, z: -1049.1421} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2017920249 MonoBehaviour: @@ -3772,7 +3895,8 @@ MonoBehaviour: ProgressBar: {fileID: 912298141} BottonUITransform: {fileID: 1107325621} FrameRateDropDown: {fileID: 499218592} - RecordingUI: {fileID: 1950769033} + RecordingUI: {fileID: 575291951} + RecordingText: {fileID: 1950769035} LyricsText: {fileID: 1814092674} --- !u!81 &2017920250 AudioListener: @@ -3809,12 +3933,12 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2120942182} - {fileID: 1237872487} - {fileID: 1174860554} m_Father: {fileID: 679139655} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3882,10 +4006,10 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1814092677} m_Father: {fileID: 2146838901} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3920,9 +4044,9 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 434506153} - 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} @@ -3994,11 +4118,11 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 708791003} - {fileID: 1392584727} m_Father: {fileID: 2051549436} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4141,7 +4265,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4155,17 +4281,24 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2090217551} - {fileID: 679139655} - {fileID: 61452365} - - {fileID: 1950769034} + - {fileID: 575291952} - {fileID: 1975009928} m_Father: {fileID: 0} - 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_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2017920248} + - {fileID: 1529990370} + - {fileID: 2146838901} diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index dbd7770..7b3579f 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -3895,7 +3895,6 @@ GameObject: - component: {fileID: 115881385} - component: {fileID: 115881384} - component: {fileID: 115881383} - - component: {fileID: 115881387} m_Layer: 0 m_Name: Ground m_TagString: Untagged @@ -3989,27 +3988,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &115881387 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115881382} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 49bffee7ba1a7be428efd20ecf2a02bc, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &116348344 GameObject: m_ObjectHideFlags: 0 @@ -6164,7 +6142,7 @@ RectTransform: m_Father: {fileID: 255097491} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.9999999} + m_AnchorMax: {x: 1, y: 0.99999994} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -7427,7 +7405,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 181741206} m_HandleRect: {fileID: 181741205} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -27712,9 +27690,9 @@ RectTransform: - {fileID: 1871345305} m_Father: {fileID: 6878219667498913896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -152.01} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &800374507 @@ -27813,11 +27791,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 755865959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -20} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &801393422 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27874,8 +27852,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 1111410415} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI + - m_Target: {fileID: 1111410419} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro m_MethodName: set_text m_Mode: 5 m_Arguments: @@ -37388,7 +37366,7 @@ GameObject: m_Component: - component: {fileID: 1111410418} - component: {fileID: 1111410417} - - component: {fileID: 1111410415} + - component: {fileID: 1111410419} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -37396,40 +37374,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1111410415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1111410414} - 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: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 117 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: --- !u!222 &1111410417 CanvasRenderer: m_ObjectHideFlags: 0 @@ -37455,8 +37399,98 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 5, y: 0} - m_SizeDelta: {x: 535, y: 17.663551} + m_SizeDelta: {x: 575, y: 0} m_Pivot: {x: 0, y: 1} +--- !u!114 &1111410419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111410414} + 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: + 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 23 + m_fontSizeBase: 23 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -80 + 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: 5, y: 5, 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!1 &1111689041 GameObject: m_ObjectHideFlags: 0 @@ -39736,7 +39770,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1882365343} m_HandleRect: {fileID: 1882365342} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -46155,7 +46189,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 17.663551} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1362635898 MonoBehaviour: @@ -51786,7 +51820,7 @@ MonoBehaviour: SceneList: {fileID: 835845609} ScenePageCtrl: {fileID: 1045478985} MessageScrollRect: {fileID: 755865960} - MessageText: {fileID: 1111410415} + MessageText: {fileID: 1111410419} PoseManager: {fileID: 776305454} HandleManager: {fileID: 1561038520} EmotionList: {fileID: 1699478760} @@ -71333,9 +71367,9 @@ RectTransform: - {fileID: 1460100588} m_Father: {fileID: 6878219667498913896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -304.02} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219665895574065 @@ -71734,9 +71768,9 @@ RectTransform: - {fileID: 1838874680} m_Father: {fileID: 6878219667498913896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -50.67} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6878219666121841222 @@ -73891,9 +73925,9 @@ RectTransform: - {fileID: 880905949} m_Father: {fileID: 6878219667498913896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -202.68} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666841734894 @@ -74537,9 +74571,9 @@ RectTransform: - {fileID: 681146706} m_Father: {fileID: 6878219667498913896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -101.34} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667203546886 @@ -75800,9 +75834,9 @@ RectTransform: - {fileID: 1650889916} m_Father: {fileID: 6878219667498913896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667749320559 @@ -76021,9 +76055,9 @@ RectTransform: - {fileID: 1685814398} m_Father: {fileID: 6878219667498913896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -253.34999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!1 &6878219667784581358 diff --git a/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs b/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs index fb1a181..2a43fcc 100644 --- a/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs +++ b/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs @@ -5,6 +5,7 @@ using UnityEngine; public class UnityCameraVMDRecorder : MonoBehaviour { + public const string FileSavePath = "/../VMDRecords"; const float WorldScaleFix = 12.5f; const float FPSs = 0.03333f; @@ -209,8 +210,8 @@ public class UnityCameraVMDRecorder : MonoBehaviour /// 保存先の絶対ファイルパス public void SaveVMD() { - string fileName = Application.dataPath + "/../VMDRecords/" + string.Format("Camera_{0}.vmd", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")); - Directory.CreateDirectory(Application.dataPath + "/../VMDRecords"); + string fileName = $"{Application.dataPath}{FileSavePath}/{string.Format("Camera_{0}.vmd", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"))}"; + Directory.CreateDirectory(Application.dataPath + FileSavePath); if (IsRecording) { Debug.Log(targetCameraTransform.name + "VMD保存前にレコーディングをストップしてください。"); @@ -327,7 +328,7 @@ public class UnityCameraVMDRecorder : MonoBehaviour public static void SaveLiveCameraVMD(LiveEntry liveEntry,DateTime time, List frames, int MultiCameraIndex = -1) { - string directory = $"{Application.dataPath}/../VMDRecords/Live{liveEntry.MusicId}_{time.ToString("yyyy-MM-dd_HH-mm-ss")}/"; + string directory = $"{Application.dataPath}{FileSavePath}/Live{liveEntry.MusicId}_{time.ToString("yyyy-MM-dd_HH-mm-ss")}/"; Directory.CreateDirectory(directory); string fileName = $"{directory}LiveCamera_POS.vmd"; string fovFileName = $"{directory}LiveCamera_FOV.vmd"; diff --git a/Assets/Scripts/Exporters/VMDRecorder/UnityHumanoidVMDRecorder.cs b/Assets/Scripts/Exporters/VMDRecorder/UnityHumanoidVMDRecorder.cs index 9c5236a..f5ed70a 100644 --- a/Assets/Scripts/Exporters/VMDRecorder/UnityHumanoidVMDRecorder.cs +++ b/Assets/Scripts/Exporters/VMDRecorder/UnityHumanoidVMDRecorder.cs @@ -8,6 +8,7 @@ using Gallop; //初期ポーズ(T,Aポーズ)の時点でアタッチ、有効化されている必要がある public class UnityHumanoidVMDRecorder : MonoBehaviour { + public const string FileSavePath = "/../VMDRecords"; public bool UseParentOfAll = true; public bool UseCenterAsParentOfAll = true; /// @@ -33,6 +34,7 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour const float FPSs = 0.03333f; const string CenterNameString = "センター"; const string GrooveNameString = "グルーブ"; + public enum BoneNames { 全ての親, センター, 左足IK, 右足IK, 上半身, 上半身2, 首, 頭, @@ -41,8 +43,7 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour 左薬指1, 左薬指2, 左薬指3, 左小指1, 左小指2, 左小指3, 右親指1, 右親指2, 右人指1, 右人指2, 右人指3, 右中指1, 右中指2, 右中指3, 右薬指1, 右薬指2, 右薬指3, 右小指1, 右小指2, 右小指3, 左足, 右足, 左ひざ, 右ひざ, - 左足首, 右足首, None - //左つま先, 右つま先は情報付けると足首の回転、位置との矛盾が生じかねない + 左足首, 右足首, 左足先EX, 右足先EX, None } //コンストラクタにて初期化 //全てのボーンを名前で引く辞書 @@ -129,9 +130,8 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour { BoneNames.右ひざ, objs.Find(a=>a.name.Equals("Knee_R"))}, { BoneNames.左足首, objs.Find(a=>a.name.Equals("Ankle_L"))}, { BoneNames.右足首, objs.Find(a=>a.name.Equals("Ankle_R"))}, - //左つま先, 右つま先は情報付けると足首の回転、位置との矛盾が生じかねない - //{ BoneNames.左つま先, (animator.GetBoneTransform(HumanBodyBones.LeftToes))}, - //{ BoneNames.右つま先, (animator.GetBoneTransform(HumanBodyBones.RightToes))} + { BoneNames.左足先EX, objs.Find(a=>a.name.Equals("Toe_L"))}, + { BoneNames.右足先EX, objs.Find(a=>a.name.Equals("Toe_R"))} }; foreach (KeyValuePair pair in BoneDictionary) @@ -139,9 +139,14 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour transformDictionary.Add(pair.Key.ToString(), pair.Value); } - var animator = GetComponentInParent().UmaAnimator; + var characterContainer = GetComponentInParent(); + var animator = characterContainer.UmaAnimator; var state = animator.GetCurrentAnimatorStateInfo(0); - animator.Rebind(); + animator.enabled = false; + + // Set to T-Pose + characterContainer.ResetBodyPose(); + characterContainer.UpBodyReset(); BoneDictionary[BoneNames.左腕].Rotate(0, 0, -aposeDegress); BoneDictionary[BoneNames.右腕].Rotate(0, 0, aposeDegress); @@ -169,6 +174,9 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour boneGhost = new BoneGhost(BoneDictionary, UseBottomCenter); morphRecorder = new MorphRecorder(transform); + BoneDictionary[BoneNames.左腕].Rotate(0, 0, aposeDegress); + BoneDictionary[BoneNames.右腕].Rotate(0, 0, -aposeDegress); + animator.enabled = true; animator.Play(state.shortNameHash, 0, state.normalizedTime); } @@ -602,6 +610,13 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour binaryWriter.Close(); } } + if (boneGhost != null) + { + foreach(var pair in boneGhost.GhostDictionary) + { + Destroy(pair.Value.ghost.gameObject); + } + } Destroy(this); } @@ -614,15 +629,15 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour /// キーの書き込み頻度を減らして容量を減らす public void SaveVMD(string modelName, int keyReductionLevel = 3) { - string fileName = Application.dataPath + "/../VMDRecords/" + string.Format("UMA_{0}.vmd", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")); - Directory.CreateDirectory(Application.dataPath + "/../VMDRecords"); + string fileName = $"{Application.dataPath}{FileSavePath}/{string.Format("UMA_{0}.vmd", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"))}"; + Directory.CreateDirectory(Application.dataPath + FileSavePath); KeyReductionLevel = keyReductionLevel; SaveVMD(modelName, fileName); } public void SaveLiveVMD(LiveEntry liveEntry, DateTime time ,string modelName, int keyReductionLevel = 3) { - string fileName = $"{Application.dataPath}/../VMDRecords/Live{liveEntry.MusicId}_{time.ToString("yyyy-MM-dd_HH-mm-ss")}/{modelName}.vmd"; + string fileName = $"{Application.dataPath}{FileSavePath}/Live{liveEntry.MusicId}_{time.ToString("yyyy-MM-dd_HH-mm-ss")}/{modelName}.vmd"; Directory.CreateDirectory(Path.GetDirectoryName(fileName)); KeyReductionLevel = keyReductionLevel; SaveVMD(modelName, fileName); @@ -655,9 +670,11 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour { BoneNames.左足, (BoneNames.None, BoneNames.None, BoneNames.センター) }, { BoneNames.左ひざ, (BoneNames.None, BoneNames.None, BoneNames.左足) }, { BoneNames.左足首, (BoneNames.None, BoneNames.None, BoneNames.左ひざ) }, + { BoneNames.左足先EX, (BoneNames.None, BoneNames.None, BoneNames.左足首) }, { BoneNames.右足, (BoneNames.None, BoneNames.None, BoneNames.センター) }, { BoneNames.右ひざ, (BoneNames.None, BoneNames.None, BoneNames.右足) }, { BoneNames.右足首, (BoneNames.None, BoneNames.None, BoneNames.右ひざ) }, + { BoneNames.右足先EX, (BoneNames.None, BoneNames.None, BoneNames.右足首) }, { BoneNames.上半身, (BoneNames.None, BoneNames.None, BoneNames.センター) }, { BoneNames.上半身2, (BoneNames.None, BoneNames.None, BoneNames.上半身) }, { BoneNames.首, (BoneNames.上半身2, BoneNames.None, BoneNames.上半身) }, diff --git a/Assets/Scripts/LiveToolBox/LiveViewerUI.cs b/Assets/Scripts/LiveToolBox/LiveViewerUI.cs index e57248f..7fb629f 100644 --- a/Assets/Scripts/LiveToolBox/LiveViewerUI.cs +++ b/Assets/Scripts/LiveToolBox/LiveViewerUI.cs @@ -16,6 +16,8 @@ public class LiveViewerUI : MonoBehaviour public GameObject RecordingUI; + public Text RecordingText; + public Text LyricsText; public List CurrentLyrics = new List(); diff --git a/Assets/Scripts/UmaAssetManager.cs b/Assets/Scripts/UmaAssetManager.cs index 6891f5c..0824df8 100644 --- a/Assets/Scripts/UmaAssetManager.cs +++ b/Assets/Scripts/UmaAssetManager.cs @@ -72,7 +72,7 @@ public class UmaAssetManager : MonoBehaviour else { var exist = LoadAB(result[i]); - if (!exist && i % percent_num == 0) + if (!exist && percent_num > 0 && i % percent_num == 0) { OnLoadProgressChange?.Invoke(i, result.Count, null); yield return null; diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index 7179862..aa2e942 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -32,6 +32,7 @@ public class UmaContainerCharacter : UmaContainer public GameObject UpBodyBone; public Vector3 UpBodyPosition; public Quaternion UpBodyRotation; + public Dictionary InitBoneTransform; [Header("Face")] public FaceDrivenKeyTarget FaceDrivenKeyTarget; @@ -80,11 +81,7 @@ public class UmaContainerCharacter : UmaContainer public GameObject PhysicsContainer; public float BodyScale = 1; - private float dragdistance; - private Vector3 dragStartPos; - private Collider dragCollider; private BipedIK IK; - private PuppetMaster PuppetMaster; private List _humanoidBones; private UIHandleCharacterRoot handleRoot; @@ -107,7 +104,8 @@ public class UmaContainerCharacter : UmaContainer public void MergeModel() { if (!Body) return; - var bodyBones = Body.GetComponentInChildren().bones.ToDictionary(bone => bone.name, bone => bone.transform); + var bodySkinnedMeshRenderer = Body.GetComponentInChildren(); + var bodyBones = bodySkinnedMeshRenderer.bones.ToDictionary(bone => bone.name, bone => bone.transform); List emptyBones = new List(); emptyBones.Add(Body.transform.Find("Position/Hip/Tail_Ctrl")); while (Body.transform.childCount > 0) @@ -201,6 +199,12 @@ public class UmaContainerCharacter : UmaContainer } } } + + InitBoneTransform = new Dictionary(); + foreach (var bone in bodySkinnedMeshRenderer.bones) + { + InitBoneTransform[bone] = (bone.position, bone.rotation); + } } public void MergeHairModel() @@ -295,11 +299,6 @@ public class UmaContainerCharacter : UmaContainer } } - public void SetPuppetMasterMode(PuppetMaster.Mode mode) - { - PuppetMaster.mode = mode; - } - public void SetDynamicBoneEnable(bool isOn) { if (IsMini) return; @@ -338,69 +337,20 @@ public class UmaContainerCharacter : UmaContainer if (IK && !IK.enabled) { IK.enabled = true; - if (PuppetMaster.mode != PuppetMaster.Mode.Active) - { - SetPuppetMasterMode(PuppetMaster.Mode.Active); - } } var finalRotation = FaceDrivenKeyTarget.GetEyeTrackRotation(TrackTarget.transform.position); FaceDrivenKeyTarget.SetEyeTrack(finalRotation); var cam = Camera.main; - var distance = Mathf.Clamp(cam.transform.InverseTransformPoint(HeadBone.transform.position).magnitude - 0.1f, 0, 2); - var mousePos = new Vector3(Input.mousePosition.x, Input.mousePosition.y, distance); - var worldPos = cam.ScreenToWorldPoint(mousePos); - - //Hold D key to Drag Body - if (Input.GetKey(KeyCode.D)) - { - if (dragCollider && dragCollider.attachedRigidbody) - { - if (PuppetMaster) - { - PuppetMaster.pinWeight = 0.75f; - PuppetMaster.muscleWeight = 0.25f; - } - dragCollider.attachedRigidbody.isKinematic = true; - dragCollider.transform.position = Vector3.Lerp(dragCollider.transform.position, cam.ScreenToWorldPoint(new Vector3(mousePos.x, mousePos.y, dragdistance)) - dragStartPos, Time.fixedDeltaTime * 4); - //LookAt Mouse when Dragging - TrackTarget.position = Vector3.Lerp(TrackTarget.position, dragCollider.transform.position, Time.fixedDeltaTime * 3); - } - else - { - if (Physics.Raycast(cam.ScreenPointToRay(mousePos), out RaycastHit hit)) - { - dragCollider = hit.collider; - dragStartPos = (hit.point - hit.collider.transform.position); - dragdistance = cam.transform.InverseTransformPoint(hit.point).magnitude; - } - //LookAt Camera - TrackTarget.position = Vector3.Lerp(TrackTarget.position, cam.transform.position, Time.fixedDeltaTime * 3); - } - } - else - { - if (PuppetMaster) - { - PuppetMaster.pinWeight = 1; - PuppetMaster.muscleWeight = 1; - } - //LookAt Camera - TrackTarget.position = Vector3.Lerp(TrackTarget.position, cam.transform.position, Time.fixedDeltaTime * 3); - if (dragCollider && dragCollider.attachedRigidbody) dragCollider.attachedRigidbody.isKinematic = false; - dragCollider = null; - } + //LookAt Camera + TrackTarget.position = Vector3.Lerp(TrackTarget.position, cam.transform.position, Time.fixedDeltaTime * 3); } else { if (IK && IK.enabled) { IK.enabled = false; - if (PuppetMaster && PuppetMaster.mode != PuppetMaster.Mode.Kinematic) - { - SetPuppetMasterMode(PuppetMaster.Mode.Kinematic); - } } } @@ -488,11 +438,6 @@ public class UmaContainerCharacter : UmaContainer ik.solvers.lookAt.target = TrackTarget.transform; ik.solvers.lookAt.spineWeightCurve = new AnimationCurve(new Keyframe[2] { new Keyframe(0f, 1f), new Keyframe(1f, 0.3f) }); IK = ik; - - BipedRagdollCreator.Create(r, options); - PuppetMaster = PuppetMaster.SetUp(container.transform, 8, 9); - PuppetMaster.solverIterationCount = 3; - PuppetMaster.FlattenHierarchy(); } public FullBodyBipedIK CreatePoseIK() @@ -586,8 +531,9 @@ public class UmaContainerCharacter : UmaContainer foreach (Renderer r in Body.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { + m.name = m.name.Replace(" (Instance)", ""); string mainTex = "", toonMap = "", tripleMap = "", optionMap = "", zekkenNumberTex = ""; if (IsMini) @@ -729,8 +675,9 @@ public class UmaContainerCharacter : UmaContainer foreach (Renderer r in head.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { + m.name = m.name.Replace(" (Instance)", ""); //only for mini umas if (head.name.Contains("mchr")) { @@ -878,9 +825,9 @@ public class UmaContainerCharacter : UmaContainer var textures = MobHeadTextures; foreach (Renderer r in hair.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { - + m.name = m.name.Replace(" (Instance)", ""); //Glasses's shader need to change manually. if (r.name.Contains("Hair") && r.name.Contains("Alpha")) { @@ -928,8 +875,9 @@ public class UmaContainerCharacter : UmaContainer var textures = TailTextures; foreach (Renderer r in Tail.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { + m.name = m.name.Replace(" (Instance)", ""); m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name.EndsWith("diff"))); m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name.Contains("shad"))); m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name.Contains("base"))); @@ -1186,6 +1134,10 @@ public class UmaContainerCharacter : UmaContainer { LoadAnimation(posMotion); } + else + { + OverrideController["clip_p"] = null; + } if (IsMini) { @@ -1642,4 +1594,16 @@ public class UmaContainerCharacter : UmaContainer return true; } + + public void ResetBodyPose() + { + if(InitBoneTransform == null) + { + return; + } + foreach (var pair in InitBoneTransform) + { + pair.Key.SetPositionAndRotation(pair.Value.pos, pair.Value.rot); + } + } } diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index e89eec5..cc7fde1 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -150,6 +150,7 @@ public class UmaViewerBuilder : MonoBehaviour if (asset == null) { Debug.LogError("No body, can't load!"); + UmaViewerUI.Instance?.ShowMessage("No body, can't load!", UIMessageType.Error); return; } else if (genericCostume) @@ -271,7 +272,7 @@ public class UmaViewerBuilder : MonoBehaviour } } - if (tailId != 0) + if (tailId > 0) { string tailName = $"tail{tailId.ToString().PadLeft(4, '0')}_00"; string tailPath = $"3d/chara/tail/{tailName}/"; @@ -373,6 +374,7 @@ public class UmaViewerBuilder : MonoBehaviour if (asset == null) { Debug.LogError("No body, can't load!"); + UmaViewerUI.Instance?.ShowMessage("No body, can't load!", UIMessageType.Error); return; } else if (genericCostume) @@ -489,7 +491,7 @@ public class UmaViewerBuilder : MonoBehaviour } } - if (tailId != 0) + if (tailId > 0) { string tailName = $"tail{tailId.ToString().PadLeft(4, '0')}_00"; string tailPath = $"3d/chara/tail/{tailName}/"; @@ -568,6 +570,7 @@ public class UmaViewerBuilder : MonoBehaviour if (asset == null) { Debug.LogError("No body, can't load!"); + UmaViewerUI.Instance?.ShowMessage("No body, can't load!", UIMessageType.Error); return; } else if (isGeneric) @@ -636,7 +639,7 @@ public class UmaViewerBuilder : MonoBehaviour umaContainer.LoadHead(asset); } - if (tailId != 0) + if (tailId > 0) { string tailName = $"mtail{tailId.ToString().PadLeft(4, '0')}_00"; string tailPath = $"3d/chara/mini/tail/{tailName}/"; @@ -750,7 +753,6 @@ public class UmaViewerBuilder : MonoBehaviour Director.instance.InitializeTimeline(characters, UI.LiveMode); Director.instance.InitializeMusic(live.MusicId, characters); Director.instance.Play(); - LiveViewerUI.Instance.RecordingUI.SetActive(Gallop.Live.Director.instance.IsRecordVMD); }); }); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 95b2a7f..95e5840 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -42,7 +42,7 @@ public class UmaViewerUI : MonoBehaviour public ScrollRect SceneList; public PageManager ScenePageCtrl; public ScrollRect MessageScrollRect; - public Text MessageText; + public TextMeshProUGUI MessageText; public PoseManager PoseManager; public HandleManager HandleManager; @@ -625,7 +625,11 @@ public class UmaViewerUI : MonoBehaviour var list = new List(); list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath) && a.Name.Contains(chara.Id.ToString()))); list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.HeadPath) && a.Name.Contains(chara.Id.ToString()))); - list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith("3d/chara/tail"))); + var tail_path = getCharaTailPath(chara); + if (!string.IsNullOrEmpty(tail_path)) + { + list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith(tail_path))); + } list.Add(Main.AbList["3d/animator/drivenkeylocator"]); list.Add(Main.AbList[$"3d/motion/event/body/chara/chr{achara.Id}_00/anm_eve_chr{achara.Id}_00_idle01_loop"]); @@ -681,7 +685,11 @@ public class UmaViewerUI : MonoBehaviour var list = new List(); list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath) && a.Name.Contains(chara.Id.ToString()))); list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.HeadPath) && a.Name.Contains(chara.Id.ToString()))); - list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith("3d/chara/tail"))); + var tail_path = getCharaTailPath(chara); + if (!string.IsNullOrEmpty(tail_path)) + { + list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith(tail_path))); + } list.Add(Main.AbList["3d/animator/drivenkeylocator"]); var motion_path = $"3d/motion/event/body/chara/chr{chara.Id}_00/anm_eve_chr{chara.Id}_00_idle01_loop"; if (!chara.IsMob && !ModelSettings.IsHeadFix && Main.AbList.TryGetValue(motion_path, out var motion_entry)) @@ -891,6 +899,28 @@ public class UmaViewerUI : MonoBehaviour return (entry == null) ? id.ToString() : entry.GetName(); } + public string getCharaTailPath(CharaEntry chara) + { + int tailId = 0; + if (chara.IsMob) + { + tailId = 1; + } + else + { + var charaData = UmaDatabaseController.ReadCharaData(chara); + tailId = Convert.ToInt32(charaData["tail_model_id"]); + } + if (tailId <= 0) + { + return string.Empty; + } + var tailName = $"tail{tailId.ToString().PadLeft(4, '0')}_00"; + var tailPath = $"3d/chara/tail/{tailName}/"; + var tailPfb = tailPath + $"pfb_{tailName}"; + return tailPfb; + } + public static string GetCostumeName(string costumeId, string defaultname) { switch (costumeId) @@ -996,6 +1026,7 @@ public class UmaViewerUI : MonoBehaviour buttonText.text = "Saving"; recorder.SaveVMD(container.name, Config.Instance.VmdKeyReductionLevel); buttonText.text = "Record VMD"; + ShowMessage($"VMD is saved in {Path.GetFullPath(Application.dataPath + UnityHumanoidVMDRecorder.FileSavePath)}", UIMessageType.Success); } } else @@ -1092,6 +1123,7 @@ public class UmaViewerUI : MonoBehaviour _ => $"{msg}\n", }; MessageScrollRect.gameObject.SetActive(type != UIMessageType.Close); + LayoutRebuilder.ForceRebuildLayoutImmediate(MessageScrollRect.content); MessageScrollRect.verticalNormalizedPosition = 0; } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs index fbc0346..fbc568d 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs @@ -128,12 +128,15 @@ namespace Gallop.Live.Cutt double last_current_time = currentTime; if (timescaleKeys.thisList.Count > 0) { + var has_key = false; // apply timescale keys for (int i = timescaleKeys.thisList.Count - 1; i >= 0; i--) { + var scaleKey = timescaleKeys.thisList[i]; if (scaleKey.FrameSecond <= currentTime) { + has_key = true; if (scaleKey.FrameSecond <= arg.FrameSecond) { interval += (last_current_time - arg.FrameSecond) * scaleKey.Timescale * arg.playSpeed; @@ -146,6 +149,10 @@ namespace Gallop.Live.Cutt } } } + if (!has_key) + { + interval = (currentTime - arg.FrameSecond) * arg.playSpeed; // no timescale keys, use default speed + } } else { diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 4d9d44e..adaa6cf 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -1,6 +1,7 @@ using Gallop.Live.Cutt; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using UnityEngine; @@ -150,6 +151,8 @@ namespace Gallop.Live UI = GameObject.Find("LiveUI").GetComponent(); sliderControl = UI.ProgressBar.GetComponent(); + LiveViewerUI.Instance.RecordingUI.SetActive(IsRecordVMD); + LiveViewerUI.Instance.RecordingText.text = $"¡ñ Recording...\r\n VMD will be saved in {Path.GetFullPath(Application.dataPath + UnityHumanoidVMDRecorder.FileSavePath)}"; } public void InitializeTimeline(List characters, int mode)