diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f750171..02534a2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -357,7 +357,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283408159} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 51f8f979447c54247bcba0d5441e6081, type: 3} m_Name: @@ -423,7 +423,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283408159} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 51f8f979447c54247bcba0d5441e6081, type: 3} m_Name: @@ -477,7 +477,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283408159} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 51f8f979447c54247bcba0d5441e6081, type: 3} m_Name: @@ -598,7 +598,7 @@ MonoBehaviour: m_Spacing: 20 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 1 m_ChildScaleWidth: 1 m_ChildScaleHeight: 0 @@ -677,6 +677,8 @@ GameObject: - component: {fileID: 366298494} - component: {fileID: 366298496} - component: {fileID: 366298495} + - component: {fileID: 366298497} + - component: {fileID: 366298498} m_Layer: 0 m_Name: RawImage m_TagString: Untagged @@ -698,10 +700,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1918837002} 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: 137.005, y: 137.005} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 217.5, y: -272} + m_SizeDelta: {x: 435, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &366298495 MonoBehaviour: @@ -738,6 +740,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 366298493} m_CullTransparentMesh: 1 +--- !u!114 &366298497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366298493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &366298498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366298493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 1 + m_AspectRatio: 1 --- !u!1001 &462807103 PrefabInstance: m_ObjectHideFlags: 0 @@ -780,7 +816,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 224152212506828798, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_SizeDelta.x - value: 320 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224152212506828798, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_SizeDelta.y @@ -976,7 +1012,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.size - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: controls.List.Array.size @@ -988,10 +1024,14 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[1].name - value: go + value: intro objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[2].name + value: go + objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].name value: end objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -1118,6 +1158,10 @@ PrefabInstance: propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 5 @@ -1130,6 +1174,10 @@ PrefabInstance: propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 5 objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -1142,6 +1190,10 @@ PrefabInstance: propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 283408162} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 283408162} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -1154,6 +1206,10 @@ PrefabInstance: propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: onStatus @@ -1166,6 +1222,10 @@ PrefabInstance: propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: onStatus objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: onStatus + objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: OscHandler, Assembly-CSharp @@ -1178,16 +1238,24 @@ PrefabInstance: propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: OscHandler, Assembly-CSharp objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: OscHandler, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument value: reset objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: go + value: intro objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument + value: go + objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument value: end objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -1202,6 +1270,10 @@ PrefabInstance: propertyPath: actions.List.Array.data[2].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: actions.List.Array.data[3].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 5832566216023403110, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_fontAsset value: @@ -1723,7 +1795,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: c4e0a5074d2c245419fc70b96dfa3ac7, type: 3} + m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 x: 0 @@ -1842,7 +1914,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -2188,7 +2260,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -20, y: 20} - m_SizeDelta: {x: 185.742, y: 290.72498} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 1, y: 0} --- !u!114 &1255800684 MonoBehaviour: @@ -2228,7 +2300,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 1 + m_FillAmount: 0.732 m_FillClockwise: 0 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -2469,13 +2541,13 @@ VideoPlayer: m_TargetMaterialProperty: m_RenderMode: 2 m_AspectRatio: 5 - m_DataSource: 0 + m_DataSource: 1 m_TimeUpdateMode: 2 m_PlaybackSpeed: 1 m_AudioOutputMode: 2 m_TargetAudioSources: [] m_DirectAudioVolumes: [] - m_Url: + m_Url: file://../Material/Intro_v1.mp4 m_EnabledAudioTracks: m_DirectAudioMutes: m_ControlledAudioTrackCount: 0 @@ -2630,6 +2702,8 @@ GameObject: - component: {fileID: 1811530095} - component: {fileID: 1811530097} - component: {fileID: 1811530096} + - component: {fileID: 1811530098} + - component: {fileID: 1811530099} m_Layer: 0 m_Name: RawImage (1) m_TagString: Untagged @@ -2653,8 +2727,8 @@ RectTransform: 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: 214.197, y: 380.796} + m_AnchoredPosition: {x: 657.5, y: 0} + m_SizeDelta: {x: 306, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1811530096 MonoBehaviour: @@ -2691,6 +2765,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1811530094} m_CullTransparentMesh: 1 +--- !u!114 &1811530098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1811530094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1811530099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1811530094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 2 + m_AspectRatio: 0.5625 --- !u!1 &1918837001 GameObject: m_ObjectHideFlags: 0 @@ -2728,7 +2836,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 210.301, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1918837003 MonoBehaviour: @@ -2750,9 +2858,9 @@ MonoBehaviour: m_ChildAlignment: 3 m_Spacing: 5 m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 @@ -2773,9 +2881,9 @@ MonoBehaviour: m_MinHeight: -1 m_PreferredWidth: -1 m_PreferredHeight: -1 - m_FlexibleWidth: -1 + m_FlexibleWidth: 1 m_FlexibleHeight: -1 - m_LayoutPriority: 2 + m_LayoutPriority: 1 --- !u!1 &1963683446 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cb74051..b1b8caf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1920 - defaultScreenHeight: 1080 + defaultScreenWidth: 1280 + defaultScreenHeight: 720 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -105,7 +105,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0