diff --git a/Assets/OmniSDK/Prefabs/OmniCharacterController.prefab b/Assets/OmniSDK/Prefabs/OmniCharacterController.prefab index f199acb..ad724b5 100644 --- a/Assets/OmniSDK/Prefabs/OmniCharacterController.prefab +++ b/Assets/OmniSDK/Prefabs/OmniCharacterController.prefab @@ -201,6 +201,7 @@ MonoBehaviour: 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: @@ -340,6 +341,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 --- !u!114 &114000012183324438 MonoBehaviour: m_ObjectHideFlags: 0 @@ -527,6 +529,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -551,6 +554,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1000013858168224 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/OmniSDK/Scripts/OmniConnectWebRequest.cs b/Assets/OmniSDK/Scripts/OmniConnectWebRequest.cs index 99724c9..86840b3 100644 --- a/Assets/OmniSDK/Scripts/OmniConnectWebRequest.cs +++ b/Assets/OmniSDK/Scripts/OmniConnectWebRequest.cs @@ -31,7 +31,7 @@ public class OmniConnectWebRequest : MonoBehaviour { yield return web.SendWebRequest(); - if (web.isNetworkError || web.isHttpError) + if (web.isNetworkError || web.result == UnityWebRequest.Result.ProtocolError) { Debug.LogError("OmniSDK: OmniConnectWebRequest failed get request at " + url + ": " + web.error + ". Ensure that Omni Connect is installed and running on your system."); result("Error"); diff --git a/Assets/Prefabs/OmniCharacterControllerCustom.prefab b/Assets/Prefabs/OmniCharacterControllerCustom.prefab new file mode 100644 index 0000000..9f3e5e6 --- /dev/null +++ b/Assets/Prefabs/OmniCharacterControllerCustom.prefab @@ -0,0 +1,608 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8282196715002666252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8286058663750034828} + m_Layer: 8 + m_Name: CameraSetupRootOffset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8286058663750034828 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196715002666252} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8207816211317506304} + - {fileID: 8283187931819081598} + m_Father: {fileID: 8286058667719188938} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8282196715202394882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8286058666457494290} + - component: {fileID: 8252554805957133838} + - component: {fileID: 8260303113448382880} + m_Layer: 8 + m_Name: Debug_ForwardIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8286058666457494290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196715202394882} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -2, z: 0.5} + m_LocalScale: {x: 0.25, y: 0.25, z: 1} + m_Children: [] + m_Father: {fileID: 8286058665874170574} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8252554805957133838 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196715202394882} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8260303113448382880 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196715202394882} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8282196715424049992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8286058667719188938} + m_Layer: 8 + m_Name: CameraSetupParent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8286058667719188938 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196715424049992} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.13, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8286058663750034828} + m_Father: {fileID: 8286058666489491634} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8282196716039360744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8207816209442348450} + - component: {fileID: 8207661183741152360} + - component: {fileID: 8315555734280691282} + - component: {fileID: 8315555786564103682} + - component: {fileID: 8315555731422423944} + m_Layer: 5 + m_Name: DebugText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8207816209442348450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716039360744} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -2.81} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_Children: [] + m_Father: {fileID: 8207816211317506304} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1000, y: 500} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8207661183741152360 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716039360744} + m_CullTransparentMesh: 0 +--- !u!114 &8315555734280691282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716039360744} + 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: 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: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Omni X: 1.0000 + + Omni Y: 1.0000 + + Omni Yaw: 500 + + Step Count: + 13249225902 + + Calibrated: ' +--- !u!114 &8315555786564103682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716039360744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.44117647, g: 0.44117647, b: 0.44117647, a: 0.5} + m_EffectDistance: {x: 2, y: 2} + m_UseGraphicAlpha: 1 +--- !u!114 &8315555731422423944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716039360744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 4, y: -2} + m_UseGraphicAlpha: 1 +--- !u!1 &8282196716230501382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8207816211317506304} + - component: {fileID: 8208807427742221174} + - component: {fileID: 8315555731721977050} + - component: {fileID: 8315555734328406526} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8207816211317506304 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716230501382} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 12.04} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8207816209442348450} + m_Father: {fileID: 8286058663750034828} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 394, y: 477} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &8208807427742221174 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716230501382} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &8315555731721977050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716230501382} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 1 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &8315555734328406526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196716230501382} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &8282196717500353514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8286058666489491634} + - component: {fileID: 8235978919226875554} + - component: {fileID: 8291059057222094192} + - component: {fileID: 8315555786796086378} + - component: {fileID: 8315555733631290256} + m_Layer: 8 + m_Name: OmniCharacterControllerCustom + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8286058666489491634 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196717500353514} + m_LocalRotation: {x: -0, y: 0.023920063, z: -0, w: 0.9997139} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8286058665874170574} + - {fileID: 8286058667719188938} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 2.741, z: 0} +--- !u!54 &8235978919226875554 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196717500353514} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!143 &8291059057222094192 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196717500353514} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 1.8 + m_Radius: 0.5 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8315555786796086378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196717500353514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b4816de52c8590048a0c0dc7a647cbb2, type: 3} + m_Name: + m_EditorClassIdentifier: + maxSpeed: 7 + strafeSpeedMultiplier: 1 + backwardsSpeedMultiplier: 0.4 + gravityMultiplier: 0.8 + couplingPercentage: 1 + developerMode: 0 + hidInput: {x: 0, y: 0} + currentOmniYaw: 0 + currentStepCount: 0 + omniOffset: 0 + angleBetweenOmniAndCamera: 0 + omniFound: 0 + cameraReference: {fileID: 8286058665297449828} + dummyObject: {fileID: 8286058665874170574} +--- !u!114 &8315555733631290256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196717500353514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee798ae13c81b874cb4936d55d659261, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8282196718755145694 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8286058665874170574} + m_Layer: 8 + m_Name: ForwardIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8286058665874170574 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282196718755145694} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0.6300001, z: 0} + m_LocalScale: {x: 0.19953951, y: 0.21250719, z: 2.0859916} + m_Children: + - {fileID: 8286058666457494290} + m_Father: {fileID: 8286058666489491634} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8283187931819447122 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8286058663750034828} + m_Modifications: + - target: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_Name + value: '[CameraRig]' + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalPosition.y + value: -1.09 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 11417168, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: index + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11417168, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: modelOverride + value: vr_glove + objectReference: {fileID: 0} + - target: {fileID: 11417306, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: index + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417306, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + propertyPath: modelOverride + value: '{system}vr_glove' + objectReference: {fileID: 0} + - target: {fileID: 4750165665577805220, guid: 4d293c8e162f3874b982baadd71153d2, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5795630119822265612, guid: 4d293c8e162f3874b982baadd71153d2, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} +--- !u!4 &8283187931819081598 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, + type: 3} + m_PrefabInstance: {fileID: 8283187931819447122} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8286058665297449828 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4000013889601590, guid: 4d293c8e162f3874b982baadd71153d2, + type: 3} + m_PrefabInstance: {fileID: 8283187931819447122} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/OmniCharacterControllerCustom.prefab.meta b/Assets/Prefabs/OmniCharacterControllerCustom.prefab.meta new file mode 100644 index 0000000..cc0f8e8 --- /dev/null +++ b/Assets/Prefabs/OmniCharacterControllerCustom.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 77171f0eab0f77a43877bed150dca753 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index b2d9ae9..40b13ba 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -26,12 +26,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 866662310} - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: -0.3699999, z: 0} + m_LocalRotation: {x: -0, y: 0.9997139, z: -0, w: 0.023920063} + m_LocalPosition: {x: 0, y: -0.932, z: 0} m_LocalScale: {x: 0.127872, y: 0.127872, z: 0.127872} m_Children: [] - m_Father: {fileID: 3827260016698053497} - m_RootOrder: 3 + m_Father: {fileID: 5717443222745791202} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!33 &866662314 MeshFilter: @@ -664,121 +664,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: body: {fileID: 2949611238048620088} ---- !u!54 &2923504239445864912 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - serializedVersion: 2 - m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!136 &567479351034177329 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 1.65 - m_Height: 0 - m_Direction: 1 - m_Center: {x: 0, y: 0.01, z: 0} ---- !u!114 &2552885260119797580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1c56a27abb4b87b419b7fa61804fd6f8, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 0} ---- !u!114 &4563765638380076028 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d6c86531c866cd5409820556c3fc2c4e, type: 3} - m_Name: - m_EditorClassIdentifier: - selectedMovement: 4 - nomDuJoueur: ---- !u!114 &5514558263413064935 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 21b58e0dd1248034c871465fc721b43c, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 0} ---- !u!114 &6715782188142404965 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d6c19446783f148a1933e20dd05b52, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 0} + movePress: + actionPath: + needsReinit: 0 + moveVal: + actionPath: + needsReinit: 0 + _speed: 0 constSpeed: 0 constRotation: 0 constUpForce: 0 ---- !u!114 &8110960371752871077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3db9d02d190fcb46a9646c275a560e4, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 0} - constSpeed: 0 - constRotation: 0 - constUpForce: 0 ---- !u!114 &8261473563288267383 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827260016697770625} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 32e5e814edc24cf41999243fa65b4488, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 0} + sensitivity: 0 --- !u!1 &4216049522789318228 GameObject: m_ObjectHideFlags: 0 @@ -806,7 +702,7 @@ Transform: m_LocalPosition: {x: 9.918372, y: 0.49708378, z: 7.3539944} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3827260016698053497} + - {fileID: 5717443222745791202} - {fileID: 3224832258464791432} - {fileID: 3119409764465405126} - {fileID: 3228749051654165582} @@ -981,6 +877,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} +--- !u!4 &3228749051654165582 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, + type: 3} + m_PrefabInstance: {fileID: 3224832256724492204} + m_PrefabAsset: {fileID: 0} --- !u!114 &3266769659237790072 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114000013141257940, guid: 1b474618c4fc5f54e8a8b803c8352c7d, @@ -993,12 +895,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a7614f10832d041bccff167d2a460f, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &3228749051654165582 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, - type: 3} - m_PrefabInstance: {fileID: 3224832256724492204} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3224832256823326679 PrefabInstance: m_ObjectHideFlags: 0 @@ -1434,6 +1330,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} +--- !u!4 &3224832258464791432 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 3224832258464915726} + m_PrefabAsset: {fileID: 0} --- !u!114 &3224832258475577946 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11400020, guid: ce816f2e6abb0504092c23ed9b970dfd, @@ -1452,6 +1354,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3224832258464915726} m_PrefabAsset: {fileID: 0} +--- !u!4 &3224832258464740994 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 481164, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 3224832258464915726} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3228805174263641156 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471613377008970, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 3224832258464915726} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3224832258464819110 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100008, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 3224832258464915726} + m_PrefabAsset: {fileID: 0} --- !u!114 &3224832258475577924 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11400010, guid: ce816f2e6abb0504092c23ed9b970dfd, @@ -1470,30 +1390,6 @@ CharacterController: type: 3} m_PrefabInstance: {fileID: 3224832258464915726} m_PrefabAsset: {fileID: 0} ---- !u!4 &3224832258464791432 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, - type: 3} - m_PrefabInstance: {fileID: 3224832258464915726} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3224832258464819110 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100008, guid: ce816f2e6abb0504092c23ed9b970dfd, - type: 3} - m_PrefabInstance: {fileID: 3224832258464915726} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3228805174263641156 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4471613377008970, guid: ce816f2e6abb0504092c23ed9b970dfd, - type: 3} - m_PrefabInstance: {fileID: 3224832258464915726} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3224832258464740994 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 481164, guid: ce816f2e6abb0504092c23ed9b970dfd, - type: 3} - m_PrefabInstance: {fileID: 3224832258464915726} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3224832258796056233 PrefabInstance: m_ObjectHideFlags: 0 @@ -1561,90 +1457,88 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3224832258796056233} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3827260016697655125 +--- !u!1001 &4442112897960446544 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 8406466218123916952} m_Modifications: - - target: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + - target: {fileID: 8282196717500353514, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} propertyPath: m_Name - value: '[CameraRig]' + value: OmniCharacterControllerCustom objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalPosition.x - value: 1.218103 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalPosition.y - value: 1.641916 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalPosition.z - value: -2.294073 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + - target: {fileID: 8283187931817264160, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} - - target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} + - target: {fileID: 8283187931818296740, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 0} - - target: {fileID: 4750165665577805220, guid: 4d293c8e162f3874b982baadd71153d2, + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, type: 3} - propertyPath: m_IsActive + propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 5795630119822265612, guid: 4d293c8e162f3874b982baadd71153d2, + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, type: 3} - propertyPath: m_IsActive + propertyPath: m_LocalPosition.x + value: 1.2181034 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.5760002 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.294073 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9999467 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.010331771 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.184 + objectReference: {fileID: 0} + - target: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} ---- !u!4 &3827260016698053497 stripped + m_SourcePrefab: {fileID: 100100000, guid: 77171f0eab0f77a43877bed150dca753, type: 3} +--- !u!4 &5717443222745791202 stripped Transform: - m_CorrespondingSourceObject: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, + m_CorrespondingSourceObject: {fileID: 8286058666489491634, guid: 77171f0eab0f77a43877bed150dca753, type: 3} - m_PrefabInstance: {fileID: 3827260016697655125} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3827260016697770625 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, - type: 3} - m_PrefabInstance: {fileID: 3827260016697655125} + m_PrefabInstance: {fileID: 4442112897960446544} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index 71d9a89..76cf6b1 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -1859,6 +1859,41 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb03ebc0c542b4d4695036c9a9536009, type: 3} +--- !u!21 &426050434 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sprites/Default + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1001 &426466536 PrefabInstance: m_ObjectHideFlags: 0 @@ -2602,30 +2637,6 @@ Transform: m_Father: {fileID: 620812430} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &564428794 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3827260016697770625, guid: cdbac44d9cb15a04684f19dd29e2f2db, - type: 3} - m_PrefabInstance: {fileID: 3224832256689880466} - m_PrefabAsset: {fileID: 0} ---- !u!143 &564428807 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 564428794} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Height: 0.02 - m_Radius: 1.65 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &581484868 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 86594c8235f09dc48b820e30fe7afcaf, @@ -5103,6 +5114,41 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1186200390} m_PrefabAsset: {fileID: 0} +--- !u!21 &1188726143 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sprites/Default + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1001 &1216353526 PrefabInstance: m_ObjectHideFlags: 0 @@ -5497,170 +5543,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} ---- !u!43 &1265610944 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 8 - localAABB: - m_Center: {x: 0, y: 0.01, z: 0} - m_Extent: {x: 1.65, y: 0, z: 1.275} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 8 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 4 - - stream: 0 - offset: 28 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 288 - _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0.01, z: 0} - m_Extent: {x: 1.65, y: 0, z: 1.275} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1302143259 GameObject: m_ObjectHideFlags: 0 @@ -6004,6 +5886,170 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!43 &1398365012 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 8 + localAABB: + m_Center: {x: 0, y: 0.01, z: 0} + m_Extent: {x: 1.65, y: 0, z: 1.275} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 8 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 28 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 288 + _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0.01, z: 0} + m_Extent: {x: 1.65, y: 0, z: 1.275} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1407977405 PrefabInstance: m_ObjectHideFlags: 0 @@ -6997,41 +7043,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} ---- !u!21 &1556288553 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Sprites/Default - m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - PixelSnap: 0 - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &1577174064 GameObject: m_ObjectHideFlags: 0 @@ -7097,6 +7108,170 @@ Transform: m_Father: {fileID: 1471131253} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1587924556 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 8 + localAABB: + m_Center: {x: 0, y: 0.01, z: 0} + m_Extent: {x: 1.65, y: 0, z: 1.275} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 8 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 28 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 288 + _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0.01, z: 0} + m_Extent: {x: 1.65, y: 0, z: 1.275} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!4 &1616291831 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, @@ -10705,12 +10880,17 @@ PrefabInstance: - target: {fileID: 567479351034177329, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} propertyPath: m_Height - value: 1 + value: 1.07 objectReference: {fileID: 0} - target: {fileID: 567479351034177329, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} propertyPath: m_Radius - value: 0.28708956 + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 567479351034177329, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_Enabled + value: 1 objectReference: {fileID: 0} - target: {fileID: 567479351034177329, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} @@ -10737,16 +10917,71 @@ PrefabInstance: propertyPath: m_Constraints value: 112 objectReference: {fileID: 0} + - target: {fileID: 3119409764465405126, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3224832257380790144, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3224832257896867138, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3224832258464791432, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3228749051654165582, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3560371174872971450, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3827260016697770625, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827260016698053497, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3827260016698053497, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.218 + objectReference: {fileID: 0} + - target: {fileID: 3827260016698053497, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.432 + objectReference: {fileID: 0} - target: {fileID: 3827260016698730915, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1265610944} + objectReference: {fileID: 1398365012} - target: {fileID: 3827260016699795495, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1556288553} + objectReference: {fileID: 426050434} + - target: {fileID: 3827260016709005507, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4216049522789318228, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} propertyPath: m_Name @@ -10757,6 +10992,86 @@ PrefabInstance: propertyPath: selectedMovement value: 0 objectReference: {fileID: 0} + - target: {fileID: 5716833384660471796, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1587924556} + - target: {fileID: 5716833384661536368, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1188726143} + - target: {fileID: 5717443222745791202, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6715782188142404965, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: body + value: + objectReference: {fileID: 0} + - target: {fileID: 6715782188142404965, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6715782188142404965, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constUpForce + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6715782188142404965, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constRotation + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: body + value: + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: _speed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: sensitivity + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constUpForce + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constRotation + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: moveVal.actionPath + value: /actions/default/in/movement + objectReference: {fileID: 0} + - target: {fileID: 8261473563288267383, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: movePress.actionPath + value: /actions/default/in/Teleport + objectReference: {fileID: 0} - target: {fileID: 8406466218123916952, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scripts/Movements/OmniMovement.cs b/Assets/Scripts/Movements/OmniMovement.cs index e9a1ab6..8760efa 100644 --- a/Assets/Scripts/Movements/OmniMovement.cs +++ b/Assets/Scripts/Movements/OmniMovement.cs @@ -2,22 +2,68 @@ using System.Collections; using System.Collections.Generic; using Assets.Scripts.Movements; using UnityEngine; +using Valve.VR; public class OmniMovement : MonoBehaviour, IScriptDeMovement { [Header("References")] [SerializeField] private Rigidbody body; - // Start is called before the first frame update + [SerializeField] private SteamVR_Action_Boolean movePress = null; + [SerializeField] private SteamVR_Action_Vector2 moveVal = null; + //[SerializeField] private PlayerController ctrl = null; + + [Header("Configuration")] + + [SerializeField] private float _speed; + [SerializeField] private int constSpeed; + [SerializeField] private int constRotation; + [SerializeField] private int constUpForce; + [SerializeField] private float sensitivity; + + void Start() { - + _speed = 0; } - // Update is called once per frame - void Update() + private void Update() { - + + + /*float moveHorizontal = Input.GetAxis("Horizontal"); + transform.Rotate(0.0f, moveHorizontal * constSpeed * 2, 0.0f);*/ + } + + private void FixedUpdate() + { + + if (movePress.state) + { + Debug.Log("(" + moveVal.axis.x + ", " + moveVal.axis.y + ")"); + float valY = getY(); + if (valY != 0) { + + transform.Translate(0, 0, valY * constSpeed / 20); + } + float valX = getX(); + if (valX != 0) + { + transform.Rotate(0.0f, valX * constRotation * 2, 0.0f); + } + + } + + + } + + float getX() + { + return (moveVal.axis.x > sensitivity || moveVal.axis.x < -sensitivity) ? moveVal.axis.x:0; + } + float getY() + { + return (moveVal.axis.y > sensitivity || moveVal.axis.y < -sensitivity) ? moveVal.axis.y : 0; } public void BeforeDisable() diff --git a/Assets/SteamVR/Prefabs/[CameraRig].prefab b/Assets/SteamVR/Prefabs/[CameraRig].prefab index f39a334..47d2631 100644 --- a/Assets/SteamVR/Prefabs/[CameraRig].prefab +++ b/Assets/SteamVR/Prefabs/[CameraRig].prefab @@ -98,6 +98,8 @@ Transform: - {fileID: 458974} - {fileID: 402434} - {fileID: 4000013889601590} + - {fileID: 1423639704069846491} + - {fileID: 339145851136914632} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -204,8 +206,7 @@ Transform: 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: 5792630360701763742} + m_Children: [] m_Father: {fileID: 458974} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -319,8 +320,7 @@ Transform: 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: 4748556512202149936} + m_Children: [] m_Father: {fileID: 402434} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -438,12 +438,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c30a2316e98e1dc4b97e432a1301f85c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &4749176650604081268 +--- !u!1001 &340820737175098508 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 478542} + m_TransformParent: {fileID: 420908} m_Modifications: - target: {fileID: 1000010184414672, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} propertyPath: m_Name @@ -451,11 +451,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4000011683143748, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} propertyPath: m_RootOrder - value: 0 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4000011683143748, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.27642667 objectReference: {fileID: 0} - target: {fileID: 4000011683143748, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} propertyPath: m_LocalPosition.y @@ -463,7 +463,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4000011683143748, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.5184625 objectReference: {fileID: 0} - target: {fileID: 4000011683143748, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} propertyPath: m_LocalRotation.w @@ -493,20 +493,25 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114000011652895316, guid: 5dc81ef5cae96304586abbc6e4b5beb8, + type: 3} + propertyPath: skeletonAction.actionPath + value: /actions/default/in/SkeletonRightHand + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} ---- !u!4 &4748556512202149936 stripped +--- !u!4 &339145851136914632 stripped Transform: m_CorrespondingSourceObject: {fileID: 4000011683143748, guid: 5dc81ef5cae96304586abbc6e4b5beb8, type: 3} - m_PrefabInstance: {fileID: 4749176650604081268} + m_PrefabInstance: {fileID: 340820737175098508} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5795494328880372750 +--- !u!1001 &1427638028545337675 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 482514} + m_TransformParent: {fileID: 420908} m_Modifications: - target: {fileID: 1000013597184258, guid: 057574477c20401448aba7c848873712, type: 3} propertyPath: m_Name @@ -514,11 +519,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4000013477813392, guid: 057574477c20401448aba7c848873712, type: 3} propertyPath: m_RootOrder - value: 0 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4000013477813392, guid: 057574477c20401448aba7c848873712, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.5675945 objectReference: {fileID: 0} - target: {fileID: 4000013477813392, guid: 057574477c20401448aba7c848873712, type: 3} propertyPath: m_LocalPosition.y @@ -526,7 +531,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4000013477813392, guid: 057574477c20401448aba7c848873712, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.6384628 objectReference: {fileID: 0} - target: {fileID: 4000013477813392, guid: 057574477c20401448aba7c848873712, type: 3} propertyPath: m_LocalRotation.w @@ -556,11 +561,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114000010158459022, guid: 057574477c20401448aba7c848873712, + type: 3} + propertyPath: skeletonAction.actionPath + value: /actions/default/in/SkeletonLeftHand + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 057574477c20401448aba7c848873712, type: 3} ---- !u!4 &5792630360701763742 stripped +--- !u!4 &1423639704069846491 stripped Transform: m_CorrespondingSourceObject: {fileID: 4000013477813392, guid: 057574477c20401448aba7c848873712, type: 3} - m_PrefabInstance: {fileID: 5795494328880372750} + m_PrefabInstance: {fileID: 1427638028545337675} m_PrefabAsset: {fileID: 0} diff --git a/Assets/SteamVR/Prefabs/controller.prefab b/Assets/SteamVR/Prefabs/controller.prefab index 62db635..b366241 100644 --- a/Assets/SteamVR/Prefabs/controller.prefab +++ b/Assets/SteamVR/Prefabs/controller.prefab @@ -1,25 +1,15 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1000011460529826} - m_IsPrefabParent: 1 --- !u!1 &1000011460529826 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 4: {fileID: 4000012279006706} - - 114: {fileID: 114000014106095768} + - component: {fileID: 4000012279006706} + - component: {fileID: 114000014106095768} m_Layer: 0 m_Name: controller m_TagString: Untagged @@ -29,22 +19,24 @@ GameObject: m_IsActive: 1 --- !u!4 &4000012279006706 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000011460529826} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114000014106095768 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000011460529826} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs b/Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs index 3058191..84cd63e 100644 --- a/Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs +++ b/Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs @@ -105,11 +105,11 @@ namespace Valve.VR } } - public virtual SteamVR_Action_Single NewAction + public virtual SteamVR_Action_Vector2 movement { get { - return SteamVR_Actions.default_NewAction; + return SteamVR_Actions.default_movement; } } diff --git a/Assets/SteamVR_Input/SteamVR_Input_Actions.cs b/Assets/SteamVR_Input/SteamVR_Input_Actions.cs index 0d4ffed..8755e28 100644 --- a/Assets/SteamVR_Input/SteamVR_Input_Actions.cs +++ b/Assets/SteamVR_Input/SteamVR_Input_Actions.cs @@ -39,7 +39,7 @@ namespace Valve.VR private static SteamVR_Action_Boolean p_default_SnapTurnRight; - private static SteamVR_Action_Single p_default_NewAction; + private static SteamVR_Action_Vector2 p_default_movement; private static SteamVR_Action_Vibration p_default_Haptic; @@ -145,11 +145,11 @@ namespace Valve.VR } } - public static SteamVR_Action_Single default_NewAction + public static SteamVR_Action_Vector2 default_movement { get { - return SteamVR_Actions.p_default_NewAction.GetCopy(); + return SteamVR_Actions.p_default_movement.GetCopy(); } } @@ -231,7 +231,7 @@ namespace Valve.VR SteamVR_Actions.default_HeadsetOnHead, SteamVR_Actions.default_SnapTurnLeft, SteamVR_Actions.default_SnapTurnRight, - SteamVR_Actions.default_NewAction, + SteamVR_Actions.default_movement, SteamVR_Actions.default_Haptic, SteamVR_Actions.platformer_Move, SteamVR_Actions.platformer_Jump, @@ -252,7 +252,7 @@ namespace Valve.VR SteamVR_Actions.default_HeadsetOnHead, SteamVR_Actions.default_SnapTurnLeft, SteamVR_Actions.default_SnapTurnRight, - SteamVR_Actions.default_NewAction, + SteamVR_Actions.default_movement, SteamVR_Actions.platformer_Move, SteamVR_Actions.platformer_Jump, SteamVR_Actions.buggy_Steering, @@ -280,9 +280,9 @@ namespace Valve.VR SteamVR_Actions.buggy_Reset}; Valve.VR.SteamVR_Input.actionsSingle = new Valve.VR.SteamVR_Action_Single[] { SteamVR_Actions.default_Squeeze, - SteamVR_Actions.default_NewAction, SteamVR_Actions.buggy_Throttle}; Valve.VR.SteamVR_Input.actionsVector2 = new Valve.VR.SteamVR_Action_Vector2[] { + SteamVR_Actions.default_movement, SteamVR_Actions.platformer_Move, SteamVR_Actions.buggy_Steering}; Valve.VR.SteamVR_Input.actionsVector3 = new Valve.VR.SteamVR_Action_Vector3[0]; @@ -298,7 +298,7 @@ namespace Valve.VR SteamVR_Actions.default_HeadsetOnHead, SteamVR_Actions.default_SnapTurnLeft, SteamVR_Actions.default_SnapTurnRight, - SteamVR_Actions.default_NewAction, + SteamVR_Actions.default_movement, SteamVR_Actions.platformer_Move, SteamVR_Actions.platformer_Jump, SteamVR_Actions.buggy_Steering, @@ -320,7 +320,7 @@ namespace Valve.VR SteamVR_Actions.p_default_HeadsetOnHead = ((SteamVR_Action_Boolean)(SteamVR_Action.Create("/actions/default/in/HeadsetOnHead"))); SteamVR_Actions.p_default_SnapTurnLeft = ((SteamVR_Action_Boolean)(SteamVR_Action.Create("/actions/default/in/SnapTurnLeft"))); SteamVR_Actions.p_default_SnapTurnRight = ((SteamVR_Action_Boolean)(SteamVR_Action.Create("/actions/default/in/SnapTurnRight"))); - SteamVR_Actions.p_default_NewAction = ((SteamVR_Action_Single)(SteamVR_Action.Create("/actions/default/in/NewAction"))); + SteamVR_Actions.p_default_movement = ((SteamVR_Action_Vector2)(SteamVR_Action.Create("/actions/default/in/movement"))); SteamVR_Actions.p_default_Haptic = ((SteamVR_Action_Vibration)(SteamVR_Action.Create("/actions/default/out/Haptic"))); SteamVR_Actions.p_platformer_Move = ((SteamVR_Action_Vector2)(SteamVR_Action.Create("/actions/platformer/in/Move"))); SteamVR_Actions.p_platformer_Jump = ((SteamVR_Action_Boolean)(SteamVR_Action.Create("/actions/platformer/in/Jump"))); diff --git a/Assets/SteamVR_Resources/Resources/SteamVR_Settings.asset b/Assets/SteamVR_Resources/Resources/SteamVR_Settings.asset index 7b3c3a3..3cd0b5d 100644 --- a/Assets/SteamVR_Resources/Resources/SteamVR_Settings.asset +++ b/Assets/SteamVR_Resources/Resources/SteamVR_Settings.asset @@ -24,8 +24,8 @@ MonoBehaviour: autoEnableVR: 1 legacyMixedRealityCamera: 1 mixedRealityCameraPose: - actionPath: /actions//in/ExternalCamera - needsReinit: 1 + actionPath: /actions/mixedreality/in/ExternalCamera + needsReinit: 0 mixedRealityCameraInputSource: 11 mixedRealityActionSetAutoEnable: 1 previewHandLeft: {fileID: 0} diff --git a/Assets/StreamingAssets/SteamVR/actions.json b/Assets/StreamingAssets/SteamVR/actions.json index 5157a3f..1571981 100644 --- a/Assets/StreamingAssets/SteamVR/actions.json +++ b/Assets/StreamingAssets/SteamVR/actions.json @@ -50,8 +50,9 @@ "type": "boolean" }, { - "name": "/actions/default/in/NewAction", - "type": "vector1" + "name": "/actions/default/in/movement", + "type": "vector2", + "requirement": "mandatory" }, { "name": "/actions/default/out/Haptic", diff --git a/Assets/StreamingAssets/SteamVR/bindings_vive_controller.json b/Assets/StreamingAssets/SteamVR/bindings_vive_controller.json index 4732d00..4a6536a 100644 --- a/Assets/StreamingAssets/SteamVR/bindings_vive_controller.json +++ b/Assets/StreamingAssets/SteamVR/bindings_vive_controller.json @@ -1,4 +1,7 @@ { + "action_manifest_version" : 0, + "alias_info" : {}, + "app_key" : "application.generated.unity.linkevolutionvr.exe", "bindings" : { "/actions/buggy" : { "sources" : [ @@ -96,151 +99,169 @@ "path" : "/user/hand/right/input/skeleton/right" } ], - "sources": [ - { - "inputs": { - "click": { - "output": "/actions/default/in/interactui" - } + "sources" : [ + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/interactui" + } + }, + "mode" : "button", + "path" : "/user/hand/left/input/trigger" }, - "mode": "button", - "path": "/user/hand/left/input/trigger" - }, - { - "inputs": { - "click": { - "output": "/actions/default/in/grabgrip" - } + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/grabgrip" + } + }, + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.05", + "click_deactivate_threshold" : "0", + "force_input" : "force" + }, + "path" : "/user/hand/left/input/grip" }, - "mode": "button", - "parameters": { - "click_activate_threshold": "0.05", - "click_deactivate_threshold": "0", - "force_input": "force" + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/grabpinch" + } + }, + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.75", + "click_deactivate_threshold" : "0.7", + "force_input" : "value" + }, + "path" : "/user/hand/left/input/trigger" }, - "path": "/user/hand/left/input/grip" - }, - { - "inputs": { - "click": { - "output": "/actions/default/in/grabpinch" - } + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/interactui" + } + }, + "mode" : "button", + "path" : "/user/hand/right/input/trigger" }, - "mode": "button", - "parameters": { - "click_activate_threshold": "0.75", - "click_deactivate_threshold": "0.7", - "force_input": "value" + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/grabpinch" + } + }, + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.75", + "click_deactivate_threshold" : "0.7" + }, + "path" : "/user/hand/right/input/trigger" }, - "path": "/user/hand/left/input/trigger" - }, - { - "inputs": { - "click": { - "output": "/actions/default/in/interactui" - } + { + "inputs" : { + "center" : { + "output" : "/actions/default/in/teleport" + }, + "east" : { + "output" : "/actions/default/in/snapturnright" + }, + "north" : { + "output" : "/actions/default/in/teleport" + }, + "south" : { + "output" : "/actions/default/in/teleport" + }, + "west" : { + "output" : "/actions/default/in/snapturnleft" + } + }, + "mode" : "dpad", + "parameters" : { + "deadzone_pct" : "90", + "overlap_pct" : "15", + "sub_mode" : "click" + }, + "path" : "/user/hand/left/input/trackpad" }, - "mode": "button", - "path": "/user/hand/right/input/trigger" - }, - { - "inputs": { - "click": { - "output": "/actions/default/in/grabpinch" - } + { + "inputs" : { + "center" : { + "output" : "/actions/default/in/teleport" + }, + "east" : { + "output" : "/actions/default/in/snapturnright" + }, + "north" : { + "output" : "/actions/default/in/teleport" + }, + "south" : { + "output" : "/actions/default/in/teleport" + }, + "west" : { + "output" : "/actions/default/in/snapturnleft" + } + }, + "mode" : "dpad", + "parameters" : { + "deadzone_pct" : "90", + "overlap_pct" : "15", + "sub_mode" : "click" + }, + "path" : "/user/hand/right/input/trackpad" }, - "mode": "button", - "parameters": { - "click_activate_threshold": "0.75", - "click_deactivate_threshold": "0.7" + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/grabgrip" + } + }, + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.05", + "click_deactivate_threshold" : "0", + "force_input" : "force" + }, + "path" : "/user/hand/right/input/grip" }, - "path": "/user/hand/right/input/trigger" - }, - { - "inputs": { - "center": { - "output": "/actions/default/in/teleport" - }, - "east": { - "output": "/actions/default/in/snapturnright" - }, - "north": { - "output": "/actions/default/in/teleport" - }, - "south": { - "output": "/actions/default/in/teleport" - }, - "west": { - "output": "/actions/default/in/snapturnleft" - } + { + "inputs" : { + "pull" : { + "output" : "/actions/default/in/squeeze" + } + }, + "mode" : "trigger", + "path" : "/user/hand/left/input/trigger" }, - "mode": "dpad", - "parameters": { - "deadzone_pct": "90", - "overlap_pct": "15", - "sub_mode": "click" + { + "inputs" : { + "pull" : { + "output" : "/actions/default/in/squeeze" + } + }, + "mode" : "trigger", + "path" : "/user/hand/right/input/trigger" }, - "path": "/user/hand/left/input/trackpad" - }, - { - "inputs": { - "center": { - "output": "/actions/default/in/teleport" - }, - "east": { - "output": "/actions/default/in/snapturnright" - }, - "north": { - "output": "/actions/default/in/teleport" - }, - "south": { - "output": "/actions/default/in/teleport" - }, - "west": { - "output": "/actions/default/in/snapturnleft" - } + { + "inputs" : { + "position" : { + "output" : "/actions/default/in/movement" + } + }, + "mode" : "trackpad", + "path" : "/user/hand/left/input/trackpad" }, - "mode": "dpad", - "parameters": { - "deadzone_pct": "90", - "overlap_pct": "15", - "sub_mode": "click" - }, - "path": "/user/hand/right/input/trackpad" - }, - { - "inputs": { - "click": { - "output": "/actions/default/in/grabgrip" - } - }, - "mode": "button", - "parameters": { - "click_activate_threshold": "0.05", - "click_deactivate_threshold": "0", - "force_input": "force" - }, - "path": "/user/hand/right/input/grip" - }, - { - "inputs": { - "pull": { - "output": "/actions/default/in/squeeze" - } - }, - "mode": "trigger", - "path": "/user/hand/left/input/trigger" - }, - { - "inputs": { - "pull": { - "output": "/actions/default/in/squeeze" - } - }, - "mode": "trigger", - "path": "/user/hand/right/input/trigger" - } - ] + { + "inputs" : { + "position" : { + "output" : "/actions/default/in/movement" + } + }, + "mode" : "trackpad", + "path" : "/user/hand/right/input/trackpad" + } + ] }, "/actions/platformer" : { "sources" : [ @@ -283,7 +304,10 @@ ] } }, + "category" : "steamvr_input", "controller_type" : "vive_controller", "description" : "", - "name" : "vive_controller" + "name" : "vive_controller_2", + "options" : {}, + "simulated_actions" : [] } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index eb48066..dc28f06 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -94,7 +94,7 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.subsystemregistration": "1.0.5" + "com.unity.subsystemregistration": "1.0.6" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index baba073..dff6a27 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -147,6 +147,7 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: Android: com.Yugioh.LinkEvolutionVR + Standalone: com.Yugioh.LinkEvolutionVR buildNumber: Standalone: 0 iPhone: 0 @@ -694,7 +695,8 @@ PlayerSettings: gcIncremental: 0 assemblyVersionValidation: 1 gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template3D diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4f99ef7..825d1fc 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,32 +6,32 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6b231e16082f0f273422242d1221acf53a31f6fe - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c75191b1a011a20293f373f26083de6ae2136ebf32f flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b11001e1c1a20293f373f26083de6ae2136ebf32f flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7315001214651f3c34312a210910edf22631e6e824a7f234362820 flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7315001214651f1b2e313d2c3e3cf0f23d3cedf578fce9332b25 flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c731500121465181b2e313d2c3e3cf0f23d3cedf578fce9332b25 flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c73150012146501293c35633c133af6f9 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c731500121465032a35242c2a1136cbee1931e6e33aeca92f31352d1b flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-7: value: 2242470311464668190b0d2f261110231f1a08262968153120391136acf53a31f6fe flags: 0 + RecentlyUsedScenePath-8: + value: 224247031146467400000511340810231512162f3f67093d23202936f1f4073be7e933a7f234362820 + flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c72111f193f2b212d68252320092a flags: 0 diff --git a/unityProject.vrmanifest b/unityProject.vrmanifest index 50ce788..62b651b 100644 --- a/unityProject.vrmanifest +++ b/unityProject.vrmanifest @@ -5,7 +5,7 @@ "app_key": "application.generated.unity.linkevolutionvr.exe", "launch_type": "url", "url": "steam://launch/", - "action_manifest_path": "E:\\Workplace\\MTI860_VR_Multi_Controller\\Assets\\StreamingAssets\\SteamVR\\actions.json", + "action_manifest_path": "D:\\Membres\\Jimmey Lim\\MTI860_VR_Multi_Controller\\Assets\\StreamingAssets\\SteamVR\\actions.json", "strings": { "en_us": { "name": "LinkEvolutionVR [Testing]"