From 846abf70f0ffeb884cd83350aa95ebe583489b0e Mon Sep 17 00:00:00 2001 From: Brook Bowers Date: Wed, 12 Jan 2022 18:51:28 -0500 Subject: [PATCH] initial commit of networked hand tracking --- .../Samples/VelNet/1.0.4/Example/PlayerMan.cs | 41 + .../VelNet/1.0.4/Example/PlayerMan.cs.meta | 11 + .../1.0.4/Example/VRPlayerPrefab.prefab | 990 +++++ .../1.0.4/Example/VRPlayerPrefab.prefab.meta | 7 + .../Samples/VelNet/1.0.4/Example/VelNetMan.cs | 27 +- .../VelNet/1.0.4/Example/VelNetSyncHand.cs | 58 + .../1.0.4/Example/VelNetSyncHand.cs.meta | 11 + .../Samples/VelNet/1.0.4/Example/test.unity | 2 +- .../VelNet/1.0.4/Example/testquest.unity | 3583 +++++++++++++++++ .../VelNet/1.0.4/Example/testquest.unity.meta | 7 + .../VelNetUnity/Runtime/VelNetManager.cs | 5 +- TestVelGameServer/Packages/manifest.json | 4 +- TestVelGameServer/Packages/packages-lock.json | 47 +- .../ProjectSettings/EditorBuildSettings.asset | 13 +- .../ProjectSettings/InputManager.asset | 624 +++ .../ProjectSettings/ProjectSettings.asset | 33 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/QualitySettings.asset | 20 +- 18 files changed, 5457 insertions(+), 30 deletions(-) create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs.meta create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab.meta create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetSyncHand.cs create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetSyncHand.cs.meta create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/testquest.unity create mode 100644 TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/testquest.unity.meta diff --git a/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs new file mode 100644 index 0000000..b531a01 --- /dev/null +++ b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerMan : MonoBehaviour +{ + //TODO: communicate tracking space? + + public VelNetSyncHand leftHand; + public VelNetSyncHand rightHand; + + public Transform head; + public Transform trackedHead; + + public Transform leftHandAnchor; + public Transform trackedLeftHandAnchor; + + public Transform rightHandAnchor; + public Transform trackedRightHandAnchor; + + private void Update() + { + if(trackedHead) //must be mine + { + head.position = trackedHead.position; + head.rotation = trackedHead.rotation; + } + + if(trackedLeftHandAnchor) + { + leftHandAnchor.position = trackedLeftHandAnchor.position; + leftHandAnchor.rotation = trackedLeftHandAnchor.rotation; + } + + if (trackedRightHandAnchor) + { + rightHandAnchor.position = trackedRightHandAnchor.position; + rightHandAnchor.rotation = trackedRightHandAnchor.rotation; + } + } +} diff --git a/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs.meta b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs.meta new file mode 100644 index 0000000..ca7953e --- /dev/null +++ b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/PlayerMan.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 22eb3a057d418c94cb84f9fdc6b3bc1e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab new file mode 100644 index 0000000..abd8249 --- /dev/null +++ b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab @@ -0,0 +1,990 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &956485485189628882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 749297529733664309} + - component: {fileID: 2292958742615076072} + - component: {fileID: 5818541414344350546} + - component: {fileID: 3384017775560023782} + m_Layer: 0 + m_Name: Left Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &749297529733664309 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956485485189628882} + 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: 6270683889218838629} + m_Father: {fileID: 7455479893378055696} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2292958742615076072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956485485189628882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59579433f8a6af5438275ce07486d855, type: 3} + m_Name: + m_EditorClassIdentifier: + networkObject: {fileID: 1210055141702294256} + serializationRateHz: 10 + hand: {fileID: 0} + toSync: {fileID: 3384017775560023782} + targets: [] + smoothness: 0.1 +--- !u!114 &5818541414344350546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956485485189628882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb7623a8f0b49cf4dbaa40aea4d4be64, type: 3} + m_Name: + m_EditorClassIdentifier: + HandType: 0 + _pointerPoseRoot: {fileID: 0} +--- !u!114 &3384017775560023782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956485485189628882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 674a40251fe8ad841b18517ac5209957, type: 3} + m_Name: + m_EditorClassIdentifier: + _skeletonType: 0 + _updateRootPose: 0 + _updateRootScale: 0 + _enablePhysicsCapsules: 0 + _applyBoneTranslations: 1 + _customBones_V2: + - {fileID: 6270683889218838997} + - {fileID: 6270683889218839035} + - {fileID: 6270683889218839007} + - {fileID: 6270683889218839005} + - {fileID: 6270683889218838995} + - {fileID: 6270683889218838993} + - {fileID: 6270683889218839033} + - {fileID: 6270683889218839039} + - {fileID: 6270683889218839037} + - {fileID: 6270683889218839025} + - {fileID: 6270683889218839031} + - {fileID: 6270683889218839029} + - {fileID: 6270683889218839015} + - {fileID: 6270683889218839013} + - {fileID: 6270683889218839003} + - {fileID: 6270683889218839017} + - {fileID: 6270683889218839023} + - {fileID: 6270683889218839021} + - {fileID: 6270683889218839011} + - {fileID: 6270683889218838633} + - {fileID: 6270683889218838989} + - {fileID: 6270683889218838967} + - {fileID: 6270683889218838913} + - {fileID: 6270683889218838943} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} +--- !u!1 &2007684774674236866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7455479893378055696} + - component: {fileID: 3980752934155110330} + m_Layer: 0 + m_Name: LeftHandAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7455479893378055696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2007684774674236866} + 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: 749297529733664309} + m_Father: {fileID: 8262255471414784711} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3980752934155110330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2007684774674236866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f1f9b0bbd93a484a987c51f1107ebe5, type: 3} + m_Name: + m_EditorClassIdentifier: + networkObject: {fileID: 1210055141702294256} + serializationRateHz: 10 + targetPosition: {x: 0, y: 0, z: 0} + targetRotation: {x: 0, y: 0, z: 0, w: 0} + smoothness: 0.1 +--- !u!1 &4288536670273191849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1926645405690521921} + - component: {fileID: 4791412272636184578} + - component: {fileID: 1054947388492256763} + - component: {fileID: 5595397688583726179} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1926645405690521921 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4288536670273191849} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.2, z: 0.3} + m_Children: [] + m_Father: {fileID: 7415496777936534226} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4791412272636184578 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4288536670273191849} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1054947388492256763 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4288536670273191849} + 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: 10303, guid: 0000000000000000f000000000000000, type: 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: 0 + 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!136 &5595397688583726179 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4288536670273191849} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4956616402311533684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3512402255783560565} + - component: {fileID: 8288445267447093230} + - component: {fileID: 5075600737676913516} + - component: {fileID: 7998315652155547491} + m_Layer: 0 + m_Name: Right Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3512402255783560565 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4956616402311533684} + 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: 8015258244566099454} + m_Father: {fileID: 86935329514893983} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8288445267447093230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4956616402311533684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59579433f8a6af5438275ce07486d855, type: 3} + m_Name: + m_EditorClassIdentifier: + networkObject: {fileID: 1210055141702294256} + serializationRateHz: 10 + hand: {fileID: 0} + toSync: {fileID: 7998315652155547491} + targets: [] + smoothness: 0.1 +--- !u!114 &5075600737676913516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4956616402311533684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb7623a8f0b49cf4dbaa40aea4d4be64, type: 3} + m_Name: + m_EditorClassIdentifier: + HandType: 1 + _pointerPoseRoot: {fileID: 0} +--- !u!114 &7998315652155547491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4956616402311533684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 674a40251fe8ad841b18517ac5209957, type: 3} + m_Name: + m_EditorClassIdentifier: + _skeletonType: 1 + _updateRootPose: 0 + _updateRootScale: 0 + _enablePhysicsCapsules: 0 + _applyBoneTranslations: 1 + _customBones_V2: + - {fileID: 8015258244566099424} + - {fileID: 8015258244566099406} + - {fileID: 8015258244566099434} + - {fileID: 8015258244566099432} + - {fileID: 8015258244566099430} + - {fileID: 8015258244566099428} + - {fileID: 8015258244566099404} + - {fileID: 8015258244566099402} + - {fileID: 8015258244566099400} + - {fileID: 8015258244566099396} + - {fileID: 8015258244566099394} + - {fileID: 8015258244566099392} + - {fileID: 8015258244566099410} + - {fileID: 8015258244566099408} + - {fileID: 8015258244566099438} + - {fileID: 8015258244566099420} + - {fileID: 8015258244566099418} + - {fileID: 8015258244566099416} + - {fileID: 8015258244566099414} + - {fileID: 8015258244566099034} + - {fileID: 8015258244566099446} + - {fileID: 8015258244566099328} + - {fileID: 8015258244566099378} + - {fileID: 8015258244566099368} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} +--- !u!1 &6527810452308992911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8262255471414784711} + - component: {fileID: 1210055141702294256} + - component: {fileID: 5057794648895309284} + - component: {fileID: 6169608247249244442} + - component: {fileID: 7488770076211636178} + m_Layer: 0 + m_Name: VRPlayerPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8262255471414784711 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527810452308992911} + 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: 7455479893378055696} + - {fileID: 7415496777936534226} + - {fileID: 86935329514893983} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1210055141702294256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527810452308992911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5515094c5c544b6b8ed7fd51a86548d4, type: 3} + m_Name: + m_EditorClassIdentifier: + ownershipLocked: 0 + networkId: + prefabName: + isSceneObject: 0 + syncedComponents: + - {fileID: 5057794648895309284} + - {fileID: 3980752934155110330} + - {fileID: 2292958742615076072} + - {fileID: 8171177894477629926} + - {fileID: 8571378120727598095} + - {fileID: 8288445267447093230} +--- !u!114 &5057794648895309284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527810452308992911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 068080cf74f24b74caef652efb5bcfdc, type: 3} + m_Name: + m_EditorClassIdentifier: + networkObject: {fileID: 1210055141702294256} + dissonanceID: + closePlayers: + maxDistance: 0 +--- !u!114 &6169608247249244442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527810452308992911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f1f9b0bbd93a484a987c51f1107ebe5, type: 3} + m_Name: + m_EditorClassIdentifier: + networkObject: {fileID: 1210055141702294256} + serializationRateHz: 10 + targetPosition: {x: 0, y: 0, z: 0} + targetRotation: {x: 0, y: 0, z: 0, w: 0} + smoothness: 0.1 +--- !u!114 &7488770076211636178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527810452308992911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 22eb3a057d418c94cb84f9fdc6b3bc1e, type: 3} + m_Name: + m_EditorClassIdentifier: + leftHand: {fileID: 2292958742615076072} + rightHand: {fileID: 8288445267447093230} + head: {fileID: 7415496777936534226} + trackedHead: {fileID: 0} + leftHandAnchor: {fileID: 7455479893378055696} + trackedLeftHandAnchor: {fileID: 0} + rightHandAnchor: {fileID: 86935329514893983} + trackedRightHandAnchor: {fileID: 0} +--- !u!1 &6598996496043343846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 86935329514893983} + - component: {fileID: 8571378120727598095} + m_Layer: 0 + m_Name: RightHandAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &86935329514893983 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6598996496043343846} + 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: 3512402255783560565} + m_Father: {fileID: 8262255471414784711} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8571378120727598095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6598996496043343846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f1f9b0bbd93a484a987c51f1107ebe5, type: 3} + m_Name: + m_EditorClassIdentifier: + networkObject: {fileID: 1210055141702294256} + serializationRateHz: 10 + targetPosition: {x: 0, y: 0, z: 0} + targetRotation: {x: 0, y: 0, z: 0, w: 0} + smoothness: 0.1 +--- !u!1 &9019499937923320283 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7415496777936534226} + - component: {fileID: 8171177894477629926} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7415496777936534226 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9019499937923320283} + 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: 1926645405690521921} + m_Father: {fileID: 8262255471414784711} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8171177894477629926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9019499937923320283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f1f9b0bbd93a484a987c51f1107ebe5, type: 3} + m_Name: + m_EditorClassIdentifier: + networkObject: {fileID: 1210055141702294256} + serializationRateHz: 10 + targetPosition: {x: 0, y: 0, z: 0} + targetRotation: {x: 0, y: 0, z: 0, w: 0} + smoothness: 0.1 +--- !u!1001 &6270683889218452347 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 749297529733664309} + m_Modifications: + - target: {fileID: 100158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_Name + value: OculusHand_L + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 442d5b4503ed83c4897ef44659446587, type: 3} +--- !u!4 &6270683889218838629 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400158, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838997 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400046, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839035 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839033 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400002, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839039 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400004, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839037 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400006, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838989 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400054, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839025 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400010, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839031 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400012, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400014, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838967 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400076, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839017 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400018, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838633 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400146, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838993 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400042, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838995 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400040, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839005 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400038, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839007 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400036, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838913 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400122, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400032, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839015 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400028, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218838943 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400100, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839013 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400030, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839011 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400024, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839021 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400022, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6270683889218839023 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400020, guid: 442d5b4503ed83c4897ef44659446587, type: 3} + m_PrefabInstance: {fileID: 6270683889218452347} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8015258244566237006 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3512402255783560565} + m_Modifications: + - target: {fileID: 100048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_Name + value: OculusHand_R + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} +--- !u!4 &8015258244566099406 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099404 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400002, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099402 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400004, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400006, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099454 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400048, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099396 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400010, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099394 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400012, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099392 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400014, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099328 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400078, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099420 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400018, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099418 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400020, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099416 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400022, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099414 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400024, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099368 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400102, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099446 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400056, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099408 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400030, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099438 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400032, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099378 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400124, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099434 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400036, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099432 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400038, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099430 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400040, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099428 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400042, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099034 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400148, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400046, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8015258244566099410 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400028, guid: 88e2e1bfe11ec6c438b0ade27eaeded1, type: 3} + m_PrefabInstance: {fileID: 8015258244566237006} + m_PrefabAsset: {fileID: 0} diff --git a/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab.meta b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab.meta new file mode 100644 index 0000000..42e3473 --- /dev/null +++ b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VRPlayerPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 060efdde91dc8a84e87a3d509269b878 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetMan.cs b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetMan.cs index d5a4aa9..6b9f7c5 100644 --- a/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetMan.cs +++ b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetMan.cs @@ -6,13 +6,36 @@ using VelNet; public class VelNetMan : MonoBehaviour { public GameObject playerPrefab; + public bool startAutomagically; + public OVRSkeleton leftHand; + public OVRSkeleton rightHand; + public Transform hmd; + public Transform leftAnchor; + public Transform rightAnchor; // Start is called before the first frame update private void Start() { - VelNetManager.OnJoinedRoom += player => + VelNetManager.OnJoinedRoom += room => { - VelNetManager.InstantiateNetworkObject(playerPrefab.name); + GameObject created = VelNetManager.InstantiateNetworkObject(playerPrefab.name); + PlayerMan playerMan = created.GetComponent(); + if (playerMan) { + playerMan.leftHand.hand = leftHand; + playerMan.rightHand.hand = rightHand; + playerMan.trackedHead = hmd; + playerMan.trackedLeftHandAnchor = leftAnchor; + playerMan.trackedRightHandAnchor = rightAnchor; + } }; + + if(startAutomagically) + { + VelNetManager.OnConnectedToServer += () => + { + VelNetManager.Login(SystemInfo.deviceUniqueIdentifier, "nopass"); + VelNetManager.Join("0"); + }; + } } } \ No newline at end of file diff --git a/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetSyncHand.cs b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetSyncHand.cs new file mode 100644 index 0000000..98e777a --- /dev/null +++ b/TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetSyncHand.cs @@ -0,0 +1,58 @@ +using System.Collections; +using System.Collections.Generic; +using System.IO; +using UnityEngine; +using VelNet; + +public class VelNetSyncHand : NetworkSerializedObject +{ + public OVRSkeleton hand; + public OVRCustomSkeleton toSync; + public Quaternion[] targets; + public float smoothness = .1f; + protected override void ReceiveState(byte[] message) + { + using MemoryStream mem = new MemoryStream(message); + using BinaryReader reader = new BinaryReader(mem); + for (int i =0; i p.name == prefabName); if (prefab == null) { Debug.LogError("Couldn't find a prefab with that name: " + prefabName); - return; + return null; } NetworkObject newObject = Instantiate(prefab); @@ -670,6 +670,7 @@ namespace VelNet // only sent to others, as I already instantiated this. Nice that it happens immediately. SendTo(MessageType.OTHERS, "7," + newObject.networkId + "," + prefabName); + return newObject.gameObject; } public static void SomebodyInstantiatedNetworkObject(string networkId, string prefabName, VelNetPlayer owner) diff --git a/TestVelGameServer/Packages/manifest.json b/TestVelGameServer/Packages/manifest.json index 0da73bc..39719bd 100644 --- a/TestVelGameServer/Packages/manifest.json +++ b/TestVelGameServer/Packages/manifest.json @@ -8,7 +8,9 @@ "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", - "edu.uga.engr.vel.velnet.dissonance": "file:S:/git_repo/VelNetDissonanceIntegration", + "com.unity.xr.management": "4.2.1", + "com.unity.xr.oculus": "1.11.2", + "edu.uga.engr.vel.velnet.dissonance": "https://github.com/velaboratory/VelNetDissonanceIntegration.git", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/TestVelGameServer/Packages/packages-lock.json b/TestVelGameServer/Packages/packages-lock.json index afe1934..66d7faa 100644 --- a/TestVelGameServer/Packages/packages-lock.json +++ b/TestVelGameServer/Packages/packages-lock.json @@ -58,6 +58,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.subsystemregistration": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.30", "depth": 0, @@ -99,6 +106,39 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.8", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.management": { + "version": "4.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.subsystems": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.7", + "com.unity.subsystemregistration": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.oculus": { + "version": "1.11.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.xr.management": "4.2.0", + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "edu.uga.engr.vel.velnet": { "version": "file:VelNetUnity", "depth": 0, @@ -106,12 +146,13 @@ "dependencies": {} }, "edu.uga.engr.vel.velnet.dissonance": { - "version": "file:S:/git_repo/VelNetDissonanceIntegration", + "version": "https://github.com/velaboratory/VelNetDissonanceIntegration.git", "depth": 0, - "source": "local", + "source": "git", "dependencies": { "edu.uga.engr.vel.velnet": "1.0.4" - } + }, + "hash": "ae1a0369bf262d85b64489395ad771d88286539c" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/TestVelGameServer/ProjectSettings/EditorBuildSettings.asset b/TestVelGameServer/ProjectSettings/EditorBuildSettings.asset index ba9b4aa..2a99afb 100644 --- a/TestVelGameServer/ProjectSettings/EditorBuildSettings.asset +++ b/TestVelGameServer/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,16 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Samples/VelNet/1.0.4/Example/test.unity guid: e4e43899246c941c78acfc59ce2f664a - m_configObjects: {} + - enabled: 0 + path: Assets/Oculus/SampleFramework/Usage/Passthrough/Scenes/PassthroughHands.unity + guid: c94e480e4a6da614693c0cd3372e2d2d + - enabled: 1 + path: Assets/Samples/VelNet/1.0.4/Example/testquest.unity + guid: 73a369d9876090d4c9c0d39a0f1a9056 + m_configObjects: + Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 851187c2a28053f4e806e95f3ff7ed7d, type: 2} + com.unity.xr.management.loader_settings: {fileID: 11400000, guid: c614bbfd853c73e4cb7fcf7b7f69a45e, type: 2} + com.unity.xr.openxr.settings4: {fileID: 11400000, guid: cacb9649257c4e246baa834e70151adf, type: 2} diff --git a/TestVelGameServer/ProjectSettings/InputManager.asset b/TestVelGameServer/ProjectSettings/InputManager.asset index 17c8f53..9803d3b 100644 --- a/TestVelGameServer/ProjectSettings/InputManager.asset +++ b/TestVelGameServer/ProjectSettings/InputManager.asset @@ -293,3 +293,627 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Primary2DAxis_Vertical + descriptiveName: Device joystick/touchpad horizontal motion + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Primary2DAxis_Horizontal + descriptiveName: Device joystick/touchpad horizontal motion + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Secondary2DAxis_Vertical + descriptiveName: Device joystick/touchpad horizontal motion. + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 17 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Secondary2DAxis_Horizontal + descriptiveName: Device joystick/touchpad horizontal motion + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 16 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Trigger + descriptiveName: Device trigger axis + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.001 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 8 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Grip + descriptiveName: Device grip axis + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.001 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 10 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_IndexTouch + descriptiveName: Device index finger proximity touch axis. + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 12 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_ThumbTouch + descriptiveName: Device thumb proximity touch axis + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 14 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_PrimaryButton + descriptiveName: Device primary button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 2 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_SecondaryButton + descriptiveName: Device secondary button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 3 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_PrimaryTouch + descriptiveName: Device primary touch + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 12 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_SecondaryTouch + descriptiveName: Device secondary button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 13 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_GripButton + descriptiveName: Device grip button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 4 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_TriggerButton + descriptiveName: Device trigger button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 14 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_MenuButton + descriptiveName: Device menu button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 6 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Primary2DAxisClick + descriptiveName: Device stick/touchpad click + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 8 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Primary2DAxisTouch + descriptiveName: Device stick/touchpad touch + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 16 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Left_Thumbrest + descriptiveName: Device thumbrest + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 18 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Primary2DAxis_Vertical + descriptiveName: Device joystick/touchpad horizontal motion + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 4 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Primary2DAxis_Horizontal + descriptiveName: Device joystick/touchpad horizontal motion + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 3 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Secondary2DAxis_Vertical + descriptiveName: Device joystick/touchpad horizontal motion. + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 19 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Secondary2DAxis_Horizontal + descriptiveName: Device joystick/touchpad horizontal motion + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 18 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Trigger + descriptiveName: Device trigger axis + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.001 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 9 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Grip + descriptiveName: Device grip axis + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.001 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 11 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_IndexTouch + descriptiveName: Device index finger proximity touch axis. + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 13 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_ThumbTouch + descriptiveName: Device thumb proximity touch axis + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 15 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_PrimaryButton + descriptiveName: Device primary button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 0 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_SecondaryButton + descriptiveName: Device secondary button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 1 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_PrimaryTouch + descriptiveName: Device primary touch + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 10 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_SecondaryTouch + descriptiveName: Device secondary button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 11 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_GripButton + descriptiveName: Device grip button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 5 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_TriggerButton + descriptiveName: Device trigger button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 15 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_MenuButton + descriptiveName: Device menu button + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 7 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Primary2DAxisClick + descriptiveName: Device stick/touchpad click + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 9 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Primary2DAxisTouch + descriptiveName: Device stick/touchpad touch + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 17 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Right_Thumbrest + descriptiveName: Device thumbrest + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 19 + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_Combined_Trigger + descriptiveName: Combined Trigger + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 2 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_DPad_Vertical + descriptiveName: Device directional pad. These values are replicated l/r + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.001 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 6 + joyNum: 0 + - serializedVersion: 3 + m_Name: XRI_DPad_Horizontal + descriptiveName: Device directional pad. These values are replicated l/r + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.001 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 5 + joyNum: 0 diff --git a/TestVelGameServer/ProjectSettings/ProjectSettings.asset b/TestVelGameServer/ProjectSettings/ProjectSettings.asset index 798752b..542a178 100644 --- a/TestVelGameServer/ProjectSettings/ProjectSettings.asset +++ b/TestVelGameServer/ProjectSettings/ProjectSettings.asset @@ -8,7 +8,7 @@ PlayerSettings: AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 + defaultScreenOrientation: 3 targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 @@ -47,7 +47,7 @@ PlayerSettings: defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 0 + m_ActiveColorSpace: 1 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 @@ -135,7 +135,17 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 11400000, guid: 851187c2a28053f4e806e95f3ff7ed7d, type: 2} + - {fileID: -332507616495366349, guid: c614bbfd853c73e4cb7fcf7b7f69a45e, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -153,6 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: + Android: com.VEL.VelNetUnity Standalone: com.VEL.VelNetUnity buildNumber: Standalone: 0 @@ -160,9 +171,9 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 - AndroidPreferredInstallLocation: 1 + AndroidPreferredInstallLocation: 0 aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 @@ -242,7 +253,7 @@ PlayerSettings: useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 2 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -410,7 +421,7 @@ PlayerSettings: m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer - m_APIs: 150000000b000000 + m_APIs: 0b000000 m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 @@ -700,7 +711,8 @@ PlayerSettings: 33: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Android: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} @@ -714,7 +726,8 @@ PlayerSettings: gcIncremental: 1 assemblyVersionValidation: 1 gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Android: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D @@ -785,7 +798,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 0 + activeInputHandler: 2 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/TestVelGameServer/ProjectSettings/ProjectVersion.txt b/TestVelGameServer/ProjectSettings/ProjectVersion.txt index 24993f7..4c9401b 100644 --- a/TestVelGameServer/ProjectSettings/ProjectVersion.txt +++ b/TestVelGameServer/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.23f1 -m_EditorVersionWithRevision: 2020.3.23f1 (c5d91304a876) +m_EditorVersion: 2020.3.25f1 +m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418) diff --git a/TestVelGameServer/ProjectSettings/QualitySettings.asset b/TestVelGameServer/ProjectSettings/QualitySettings.asset index 7b7658d..590e81b 100644 --- a/TestVelGameServer/ProjectSettings/QualitySettings.asset +++ b/TestVelGameServer/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 + skinWeights: 1 textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 @@ -40,6 +40,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Low @@ -53,7 +54,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -75,6 +76,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Medium @@ -88,7 +90,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -110,6 +112,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: High @@ -123,7 +126,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -145,6 +148,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Very High @@ -158,7 +162,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 @@ -180,6 +184,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Ultra @@ -193,7 +198,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 @@ -201,7 +206,7 @@ QualitySettings: softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 2 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -215,6 +220,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2