diff --git a/Assets/Gothic-Core/Scripts/Domain/Vobs/VobInitializerDomain.cs b/Assets/Gothic-Core/Scripts/Domain/Vobs/VobInitializerDomain.cs
index 19cfd848f..b9c272e8a 100644
--- a/Assets/Gothic-Core/Scripts/Domain/Vobs/VobInitializerDomain.cs
+++ b/Assets/Gothic-Core/Scripts/Domain/Vobs/VobInitializerDomain.cs
@@ -802,7 +802,7 @@ private static void SnapDigSpotToLoader(GameObject go)
///
/// Child vobs are created inside their parent's GO without a VobLoader of their own. Their adapters
- /// (VRVobContainer, VRVobContainerPhysicsChest, door lock picking, VRFocus) call
+ /// (VRVobContainer, HvrPhysicsChest, door lock picking, VRFocus) call
/// GetComponentInParent<VobLoader>() and got the PARENT's vob (often an unnamed zCVob) -
/// InvalidCastExceptions, "No door or container found for ><", doors/chests that don't work (G2 Xardas' tower).
///
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/HVR - Player.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/HVR - Player.prefab
index 2a31bd4b2..860bf49bb 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/HVR - Player.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/HVR - Player.prefab
@@ -709,90 +709,6 @@ PrefabInstance:
propertyPath: RaycastLayermask.m_Bits
value: 9438272
objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 4104050421938227924}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 4104050421938227924}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnReleased
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 5592562468148006618}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Components.Player.VRPlayerWeaponInteraction, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Components.Player.VRPlayerWeaponInteraction, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRPlayerItemAdapter, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 2034389217661245426, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
@@ -825,10 +741,6 @@ PrefabInstance:
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 9da7c4efedc95434385f95fd36a71279, type: 2}
- - target: {fileID: 2573056120201010472, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: 'm_Materials.Array.data[1]'
- value:
- objectReference: {fileID: 2100000, guid: 9da7c4efedc95434385f95fd36a71279, type: 2}
- target: {fileID: 2623048716060499684, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
@@ -905,34 +817,6 @@ PrefabInstance:
propertyPath: SFXGrab
value:
objectReference: {fileID: 0}
- - target: {fileID: 2980805439611176150, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2980805439611176150, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2980805439611176150, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 5592562468148006618}
- - target: {fileID: 2980805439611176150, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 2980805439611176150, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 2980805439611176150, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRPlayerItemAdapter, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 2980805439611176150, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 3063419232759952031, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
propertyPath: Tags.Tags
value:
@@ -941,122 +825,6 @@ PrefabInstance:
propertyPath: Tags._data
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.size
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3760600358070659426}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 9202099228209387433}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 3760600358070659426}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnReleased
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 9202099228209387433}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 3367897735511474143, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 3367897735596539136, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
propertyPath: SocketContainer
value:
@@ -1093,34 +861,6 @@ PrefabInstance:
propertyPath: SFXGrab
value:
objectReference: {fileID: 0}
- - target: {fileID: 3964033594404211023, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3964033594404211023, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3964033594404211023, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 5592562468148006618}
- - target: {fileID: 3964033594404211023, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3964033594404211023, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 3964033594404211023, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRPlayerItemAdapter, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 3964033594404211023, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 4653310549361533989, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
propertyPath: m_IsActive
value: 0
@@ -1205,90 +945,6 @@ PrefabInstance:
propertyPath: RaycastLayermask.m_Bits
value: 5243968
objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 4104050421938227924}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 4104050421938227924}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnReleased
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 5592562468148006618}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Components.Player.VRPlayerWeaponInteraction, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Components.Player.VRPlayerWeaponInteraction, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRPlayerItemAdapter, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 7340868166416387179, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
propertyPath: m_LocalRotation.w
value: 0
@@ -1499,24 +1155,51 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 2923976313076319325, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: -1
addedObject: {fileID: 3523100539866759593}
+ - targetCorrespondingSourceObject: {fileID: 2923976313076319325, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 201725255711756182}
- targetCorrespondingSourceObject: {fileID: 2923976313507361695, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: -1
addedObject: {fileID: 3789326534228044634}
+ - targetCorrespondingSourceObject: {fileID: 3367897735596539146, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 265470885364990989}
- targetCorrespondingSourceObject: {fileID: 3367897735511474145, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: 1
addedObject: {fileID: 6510255065976159289}
+ - targetCorrespondingSourceObject: {fileID: 3367897735511474145, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 6830298057528518834}
- targetCorrespondingSourceObject: {fileID: 703588620095445913, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: -1
addedObject: {fileID: 851891696609758034}
- targetCorrespondingSourceObject: {fileID: 2641012728304036569, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: 1
addedObject: {fileID: 1678881631422854599}
+ - targetCorrespondingSourceObject: {fileID: 2641012728304036569, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 8030036349999634828}
- targetCorrespondingSourceObject: {fileID: 887448239260712835, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: 1
addedObject: {fileID: 757337884793384726}
+ - targetCorrespondingSourceObject: {fileID: 887448239260712835, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 7010009710009411731}
+ - targetCorrespondingSourceObject: {fileID: 8237771281066642269, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2406662486614375646}
+ - targetCorrespondingSourceObject: {fileID: 3327876949398026377, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 8462357697535986096}
- targetCorrespondingSourceObject: {fileID: 8886962481680141934, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: -1
addedObject: {fileID: 4516976911541839521}
+ - targetCorrespondingSourceObject: {fileID: 8653842037556556660, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1976198550646775587}
+ - targetCorrespondingSourceObject: {fileID: 3309422083963978583, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 9213565482220769279}
- targetCorrespondingSourceObject: {fileID: 6718914276336705915, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
insertIndex: -1
addedObject: {fileID: 3489498994974388381}
@@ -1537,7 +1220,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1685099869530008038, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
m_PrefabInstance: {fileID: 1779900574691844023}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
+ m_GameObject: {fileID: 6965913448549182659}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce026d01d1f538044a048be125f5a85e, type: 3}
@@ -1626,63 +1309,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 9202099228209387433}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 3760600358070659426}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutIntoHolster
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 9202099228209387433}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- - m_Target: {fileID: 3760600358070659426}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutOutOfHolster
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -1726,6 +1359,18 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
DebugScale: 0
+--- !u!114 &7010009710009411731
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1505226319018549300}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!4 &1672321467721471303 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1118649348335930096, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
@@ -1905,9 +1550,6 @@ MonoBehaviour:
MouseSensitivityX: 1
IsGrounded: 0
_actualVelocity: 0
- MenuHandler: {fileID: 2192772470500779476}
- Cinema: {fileID: 8331837288116874071}
- _characterControllerSwimDiveStepHeight: 1
--- !u!114 &6929123780788603430
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1975,25 +1617,6 @@ MonoBehaviour:
UseWASD: 0
IsMouseDown: 0
MouseAxis: {x: 0, y: 0}
- IsMenuActivated: 0
- MenuState:
- Active: 0
- JustActivated: 0
- JustDeactivated: 0
- Value: 0
- IsMenuButtonEnabled: 1
- BothGripsActivatedState:
- Active: 0
- JustActivated: 0
- JustDeactivated: 0
- Value: 0
- IsBothGripsActivated: 0
- IsBothGripsActive: 0
- BothGripsActiveState:
- Active: 0
- JustActivated: 0
- JustDeactivated: 0
- Value: 0
--- !u!82 &4890979928761266796
AudioSource:
m_ObjectHideFlags: 0
@@ -2123,8 +1746,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4722222ff5b643658bd19ac210dbf94b, type: 3}
m_Name:
m_EditorClassIdentifier:
- _playerController: {fileID: 1958783043908878430}
- _playerInputs: {fileID: 6929123780788603430}
_waterBobAmplitude: 0.001
_waterBobFrequency: 2.5
_swimStartDiveVerticalVelocity: -1
@@ -2167,8 +1788,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 94f83c78c0664d83b28cbaed370379c1, type: 3}
m_Name:
m_EditorClassIdentifier:
- _playerController: {fileID: 1958783043908878430}
- _playerInputs: {fileID: 6929123780788603430}
_leftHandModel: {fileID: 2989725703437136398}
_rightHandModel: {fileID: 3179937809927698473}
_leftHandRigidbody: {fileID: 7701449421344543976}
@@ -2202,6 +1821,22 @@ MonoBehaviour:
- {fileID: 4383562423631724883}
_onTopMaterial: {fileID: 2100000, guid: 0733e67100959404abf850e406e5cb05, type: 2}
_onTopRenderQueue: 3950
+--- !u!114 &201725255711756182
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3469872688444955626}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ae71b0be15a534849b5249a3e671a43f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Adapters.Player.VRPlayer
+ MenuHandler: {fileID: 2192772470500779476}
+ Cinema: {fileID: 8331837288116874071}
+ SwimDiveStepHeight: 1
+ IsMenuButtonEnabled: 1
--- !u!114 &3699890743539135334 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3164866306463935697, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
@@ -2213,6 +1848,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bccf1e5bfe81ea449669046dd363b91, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &3845537509841100000 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3309422083963978583, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ m_PrefabInstance: {fileID: 1779900574691844023}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &9213565482220769279
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3845537509841100000}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4fc5f324acfcbc3428010a9db3c9422e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrGrabberBridge
--- !u!1 &3895146393672982614 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3367897735511474145, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
@@ -2232,63 +1884,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 9202099228209387433}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 3760600358070659426}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutIntoHolster
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 9202099228209387433}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- - m_Target: {fileID: 3760600358070659426}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutOutOfHolster
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -2331,17 +1933,63 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
DebugScale: 0
+--- !u!114 &6830298057528518834
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3895146393672982614}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!114 &3895146393690940081 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3367897735596539142, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
m_PrefabInstance: {fileID: 1779900574691844023}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
+ m_GameObject: {fileID: 3895146393690940093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6953a3149e8e4d1468962577608f0002, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &3895146393690940093 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3367897735596539146, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ m_PrefabInstance: {fileID: 1779900574691844023}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &265470885364990989
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3895146393690940093}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
+--- !u!1 &3935447129917564734 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3327876949398026377, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ m_PrefabInstance: {fileID: 1779900574691844023}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &8462357697535986096
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3935447129917564734}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4fc5f324acfcbc3428010a9db3c9422e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrGrabberBridge
--- !u!137 &4253138355794772639 stripped
SkinnedMeshRenderer:
m_CorrespondingSourceObject: {fileID: 2573056120201010472, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
@@ -2366,63 +2014,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 9202099228209387433}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 3760600358070659426}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutIntoHolster
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 9202099228209387433}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- - m_Target: {fileID: 3760600358070659426}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutOutOfHolster
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -2466,6 +2064,18 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
DebugScale: 0
+--- !u!114 &8030036349999634828
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4329570237425759598}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!137 &4383562423631724883 stripped
SkinnedMeshRenderer:
m_CorrespondingSourceObject: {fileID: 2623048716060499684, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
@@ -2545,12 +2155,29 @@ Rigidbody:
m_CorrespondingSourceObject: {fileID: 8653842037556556662, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
m_PrefabInstance: {fileID: 1779900574691844023}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &6965913448549182659 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8653842037556556660, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ m_PrefabInstance: {fileID: 1779900574691844023}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1976198550646775587
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6965913448549182659}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4fc5f324acfcbc3428010a9db3c9422e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrGrabberBridge
--- !u!114 &6965913448549182662 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8653842037556556657, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
m_PrefabInstance: {fileID: 1779900574691844023}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
+ m_GameObject: {fileID: 6965913448549182659}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de1e5b754bd6d9241a88e889575193b2, type: 3}
@@ -2630,12 +2257,29 @@ Rigidbody:
m_CorrespondingSourceObject: {fileID: 8237771281066642271, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
m_PrefabInstance: {fileID: 1779900574691844023}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &7701449421344543978 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8237771281066642269, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
+ m_PrefabInstance: {fileID: 1779900574691844023}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &2406662486614375646
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7701449421344543978}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4fc5f324acfcbc3428010a9db3c9422e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrGrabberBridge
--- !u!114 &7701449421344543983 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8237771281066642264, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
m_PrefabInstance: {fileID: 1779900574691844023}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
+ m_GameObject: {fileID: 7701449421344543978}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de1e5b754bd6d9241a88e889575193b2, type: 3}
@@ -2687,7 +2331,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7204430235297583144, guid: c43ac1b5fbd2fc24ea40fb28bae6be3e, type: 3}
m_PrefabInstance: {fileID: 1779900574691844023}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
+ m_GameObject: {fileID: 7701449421344543978}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce026d01d1f538044a048be125f5a85e, type: 3}
@@ -3457,6 +3101,22 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3389792897302281518, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: _additionalSockets.Array.size
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389792897302281518, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: '_additionalSockets.Array.data[0]'
+ value:
+ objectReference: {fileID: 1505226319018549300}
+ - target: {fileID: 3389792897302281518, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: '_additionalSockets.Array.data[1]'
+ value:
+ objectReference: {fileID: 4329570237425759598}
+ - target: {fileID: 3389792897302281518, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: '_additionalSockets.Array.data[2]'
+ value:
+ objectReference: {fileID: 3895146393672982614}
- target: {fileID: 6429825415842413170, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
propertyPath: m_Name
value: BackPack
@@ -3465,62 +3125,22 @@ PrefabInstance:
propertyPath: Socket
value:
objectReference: {fileID: 3895146393690940081}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
+ - target: {fileID: 7245954016319570917, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: _holsterSockets.Array.size
+ value: 3
objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ - target: {fileID: 7245954016319570917, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: '_holsterSockets.Array.data[0]'
value:
- objectReference: {fileID: 3760600358070659426}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ objectReference: {fileID: 1505226319018549300}
+ - target: {fileID: 7245954016319570917, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: '_holsterSockets.Array.data[1]'
value:
- objectReference: {fileID: 3760600358070659426}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBackpackGrabbedToShoulder
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBackpackReleasedFromShoulder
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 6847336371662012770, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
+ objectReference: {fileID: 4329570237425759598}
+ - target: {fileID: 7245954016319570917, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
+ propertyPath: '_holsterSockets.Array.data[2]'
+ value:
+ objectReference: {fileID: 3895146393672982614}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -3537,17 +3157,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ebc937e678155e4d86feeb9248cca97, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!114 &3760600358070659426 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 7245954016319570917, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- m_PrefabInstance: {fileID: 5818257988439845511}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0e87e25baf014b28a5aaa89ab1e7c31f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!114 &4505433718888639186 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7942131790731640917, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
@@ -3580,17 +3189,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3447029125977450136, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
m_PrefabInstance: {fileID: 5818257988439845511}
m_PrefabAsset: {fileID: 0}
---- !u!114 &9202099228209387433 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 3389792897302281518, guid: 9887ca19e46b4d547b2ad40c47c756b9, type: 3}
- m_PrefabInstance: {fileID: 5818257988439845511}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d33b9b45f9124f6b8afdb52a10613db0, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1001 &6171425951156898325
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack.prefab
index 07854330c..3c8964429 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack.prefab
@@ -1244,6 +1244,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d33b9b45f9124f6b8afdb52a10613db0, type: 3}
m_Name:
m_EditorClassIdentifier:
+ _additionalSockets: []
--- !u!1 &8611331733936325895
GameObject:
m_ObjectHideFlags: 0
@@ -1293,15 +1294,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6401121504383089494, guid: 4293d805a850fb84885c55f47b7299bd, type: 3}
propertyPath: m_text
- value: ''
+ value:
objectReference: {fileID: 0}
- target: {fileID: 6401121504383089494, guid: 4293d805a850fb84885c55f47b7299bd, type: 3}
propertyPath: m_fontAsset
- value:
+ value:
objectReference: {fileID: 11400000, guid: ed34b05229166f3469c21b7208879736, type: 2}
- target: {fileID: 6401121504383089494, guid: 4293d805a850fb84885c55f47b7299bd, type: 3}
propertyPath: m_sharedMaterial
- value:
+ value:
objectReference: {fileID: 5152873236376385906, guid: ed34b05229166f3469c21b7208879736, type: 2}
- target: {fileID: 6401121504383089494, guid: 4293d805a850fb84885c55f47b7299bd, type: 3}
propertyPath: m_VerticalAlignment
@@ -1476,54 +1477,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -8.42
objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnReleased
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory, Assembly-CSharp
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory, Assembly-CSharp
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 5745926728969230625, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
propertyPath: m_Name
value: LargeInventorySlot (1)
@@ -1535,13 +1488,33 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 5745926728969230625, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2684062889524706141}
m_SourcePrefab: {fileID: 100100000, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
--- !u!4 &1092358407863461626 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 279963425429311615, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
m_PrefabInstance: {fileID: 921680395576817285}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &4861590189747613604 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5745926728969230625, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
+ m_PrefabInstance: {fileID: 921680395576817285}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &2684062889524706141
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4861590189747613604}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1001 &1005704614264749958
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1594,30 +1567,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (5)
@@ -1632,6 +1581,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
m_PrefabInstance: {fileID: 1005704614264749958}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &6675445855591365778 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 1005704614264749958}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1389077964738786662
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1684,30 +1638,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (9)
@@ -1722,6 +1652,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
m_PrefabInstance: {fileID: 1389077964738786662}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &4760857495613421170 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 1389077964738786662}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1530620310586974029
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1944,30 +1879,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (1)
@@ -1982,6 +1893,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
m_PrefabInstance: {fileID: 1687738458635627183}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &5060643589338769851 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 1687738458635627183}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &2058406356030869475
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2034,30 +1950,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (7)
@@ -2072,6 +1964,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
m_PrefabInstance: {fileID: 2058406356030869475}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &5604698998649162999 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 2058406356030869475}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &2426361580239670146
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2298,30 +2195,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (4)
@@ -2336,6 +2209,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
m_PrefabInstance: {fileID: 2803095436446461417}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &8624835105962077949 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 2803095436446461417}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &3540224607268887998
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2392,54 +2270,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -8.42
objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnReleased
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory, Assembly-CSharp
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory, Assembly-CSharp
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 4130146776124590184, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 5745926728969230625, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
propertyPath: m_Name
value: LargeInventorySlot
@@ -2451,13 +2281,33 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 5745926728969230625, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2341765446252910576}
m_SourcePrefab: {fileID: 100100000, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
--- !u!4 &3657985873771433409 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 279963425429311615, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
m_PrefabInstance: {fileID: 3540224607268887998}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &9123385126480888991 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5745926728969230625, guid: 9c8562e025362a940aa6d5640a2299a3, type: 3}
+ m_PrefabInstance: {fileID: 3540224607268887998}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &2341765446252910576
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9123385126480888991}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1001 &3809279864917086369
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2510,30 +2360,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (2)
@@ -2548,6 +2374,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
m_PrefabInstance: {fileID: 3809279864917086369}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &7316746845000471477 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 3809279864917086369}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &5194386894083015225
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2600,30 +2431,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (3)
@@ -2633,6 +2440,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+--- !u!1 &1819774192277225773 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 5194386894083015225}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &6343286390695634847 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
@@ -2732,6 +2544,15 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: -2445633797789926738, guid: 6cb8512e2712dc24ab93173e96e1a2bf, type: 3}
insertIndex: -1
addedObject: {fileID: 7245954016319570917}
+ - targetCorrespondingSourceObject: {fileID: -2445633797789926738, guid: 6cb8512e2712dc24ab93173e96e1a2bf, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 9172675630291073396}
+ - targetCorrespondingSourceObject: {fileID: -2445633797789926738, guid: 6cb8512e2712dc24ab93173e96e1a2bf, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 6751980293987059883}
+ - targetCorrespondingSourceObject: {fileID: -2445633797789926738, guid: 6cb8512e2712dc24ab93173e96e1a2bf, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 7637540381203976400}
m_SourcePrefab: {fileID: 100100000, guid: 6cb8512e2712dc24ab93173e96e1a2bf, type: 3}
--- !u!1 &510075797823002552 stripped
GameObject:
@@ -2745,10 +2566,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 510075797823002552}
- serializedVersion: 4
+ serializedVersion: 5
m_Mass: 1
- m_Drag: 0
- m_AngularDrag: 0.05
+ m_LinearDamping: 0
+ m_AngularDamping: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -2984,7 +2805,54 @@ MonoBehaviour:
m_EditorClassIdentifier:
_categoryText: {fileID: 2564309041635058493}
_pagerText: {fileID: 5783876815826470689}
- _socketContainer: {fileID: 7942131790731640917}
+ _holsterSockets: []
+ _inventorySockets:
+ - {fileID: 5060643589338769851}
+ - {fileID: 7316746845000471477}
+ - {fileID: 1819774192277225773}
+ - {fileID: 8624835105962077949}
+ - {fileID: 6675445855591365778}
+ - {fileID: 1134907965030801990}
+ - {fileID: 5604698998649162999}
+ - {fileID: 922373524700368431}
+ - {fileID: 4760857495613421170}
+ - {fileID: 3572143840313904494}
+--- !u!114 &9172675630291073396
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 510075797823002552}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &6751980293987059883
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 510075797823002552}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
+--- !u!114 &7637540381203976400
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 510075797823002552}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3698197d5ce58d542a61ce69122e3160, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketContainerBridge
--- !u!4 &3447029125977450136 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8560556203703700366, guid: 6cb8512e2712dc24ab93173e96e1a2bf, type: 3}
@@ -3047,30 +2915,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (8)
@@ -3080,6 +2924,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+--- !u!1 &922373524700368431 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 6745236048955395387}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &5587329364365519005 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
@@ -3137,30 +2986,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- target: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
propertyPath: m_Name
value: BackpackInventorySlot (6)
@@ -3170,6 +2995,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+--- !u!1 &1134907965030801990 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
+ m_PrefabInstance: {fileID: 6815926870810616146}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &5658424827838203124 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 2dd29fe4a7e819740af535267b7cc113, type: 3}
@@ -3243,46 +3073,6 @@ PrefabInstance:
propertyPath: Size
value: 0.3
objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 7245954016319570917}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnItemPutIntoBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnReleased
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: OnItemPutOutOfBackpack
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 3389792897302281518}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnBeforeGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: Released.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory, Gothic.VR
- objectReference: {fileID: 0}
- - target: {fileID: 3711332657821201227, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
- propertyPath: BeforeGrabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Vob.Container.VRVobContainerSocketInventory, Gothic.VR
- objectReference: {fileID: 0}
- target: {fileID: 4434190707277561806, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
propertyPath: Target
value:
@@ -3333,6 +3123,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5274205726842812995, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
m_PrefabInstance: {fileID: 6973195385822662266}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &3572143840313904494 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5861164055357080340, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
+ m_PrefabInstance: {fileID: 6973195385822662266}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &8130138916144720860 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1157928709923595686, guid: 8301813fbd70d3b47b2ab9ec26c3615e, type: 3}
@@ -3692,7 +3487,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6401121504383089494, guid: 4293d805a850fb84885c55f47b7299bd, type: 3}
propertyPath: m_text
- value: ''
+ value:
objectReference: {fileID: 0}
- target: {fileID: 6401121504383089494, guid: 4293d805a850fb84885c55f47b7299bd, type: 3}
propertyPath: m_fontSize
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackInventorySlot.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackInventorySlot.prefab
index 566d7b1bf..6b4fee0f5 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackInventorySlot.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackInventorySlot.prefab
@@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 4434190707277561806}
- component: {fileID: 7810595717036477131}
- component: {fileID: 8782956222347397959}
+ - component: {fileID: 1881403388789157283}
m_Layer: 0
m_Name: VRBackpackInventorySlot
m_TagString: Untagged
@@ -51,63 +52,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
- Assembly-CSharp
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutOutOfBackpack
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
- Assembly-CSharp
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutIntoBackpack
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -219,6 +170,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &1881403388789157283
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5861164055357080340}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &7098095399602562181
GameObject:
m_ObjectHideFlags: 0
@@ -280,6 +243,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -301,7 +266,9 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackLargeInventorySlot.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackLargeInventorySlot.prefab
index e1815ce5c..24dd48465 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackLargeInventorySlot.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackLargeInventorySlot.prefab
@@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 1109714354293663205}
- component: {fileID: 4434190707277561806}
- component: {fileID: 8782956222347397959}
+ - component: {fileID: 3068390016136051502}
m_Layer: 0
m_Name: VRBackpackLargeInventorySlot
m_TagString: Untagged
@@ -51,63 +52,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
- Assembly-CSharp
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutOutOfBackpack
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
- Assembly-CSharp
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
- m_MethodName: OnItemPutIntoBackpack
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -119,7 +70,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -220,6 +170,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &3068390016136051502
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5861164055357080340}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1001 &3062234451954866645
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem.prefab
index b701fdb9e..ccbf13ffa 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem.prefab
@@ -16,6 +16,8 @@ GameObject:
- component: {fileID: 8543334853728962911}
- component: {fileID: 8461469363836242350}
- component: {fileID: 2018021949967966991}
+ - component: {fileID: 5746501746354695612}
+ - component: {fileID: 6145980801324581266}
m_Layer: 6
m_Name: oCItem
m_TagString: GothicVob
@@ -46,10 +48,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
- serializedVersion: 4
+ serializedVersion: 5
m_Mass: 2.5
- m_Drag: 0
- m_AngularDrag: 0.05
+ m_LinearDamping: 0
+ m_AngularDamping: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -166,64 +168,16 @@ MonoBehaviour:
m_Calls: []
Grabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 8543334853728962911}
- m_TargetAssemblyTypeName: Gothic.HVR.Components.HVROCItem, Assembly-CSharp
- m_MethodName: OnGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 8543334853728962911}
- m_TargetAssemblyTypeName: Gothic.HVR.Components.HVRoCItem, Assembly-CSharp
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 6759220176799969513}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 6759220176799969513}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -309,6 +263,30 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_injectionStrategy: 2
+--- !u!114 &5746501746354695612
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6503575194566409312}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &6145980801324581266
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6503575194566409312}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1001 &2283517946604736509
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem/LockPick.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem/LockPick.prefab
index 8b50348a1..321b61843 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem/LockPick.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem/LockPick.prefab
@@ -161,9 +161,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b286a6d3f574029ae48428e93591d28, type: 3}
m_Name:
m_EditorClassIdentifier:
- IsSocketed: 0
IsInsideLock: 0
- ActiveDoorLock: {fileID: 0}
+ ActiveContainerDoorPicking: {fileID: 0}
HoldingHand: {fileID: 0}
--- !u!4 &6888142504213485964 stripped
Transform:
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobBed.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobBed.prefab
index e05e3d41e..26c42099d 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobBed.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobBed.prefab
@@ -13,6 +13,8 @@ GameObject:
- component: {fileID: 2854363553026066547}
- component: {fileID: 6907302684280751333}
- component: {fileID: 2225125317086924068}
+ - component: {fileID: 6622844009418538601}
+ - component: {fileID: 2985694541242234038}
m_Layer: 6
m_Name: BIP01.*|ZM.*
m_TagString: Untagged
@@ -152,34 +154,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -224,6 +202,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dc7b9870e5ee6804aa346c39e83f17c7, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Adapters.Vob.VRMobInteraction
+--- !u!114 &6622844009418538601
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &2985694541242234038
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobContainer.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobContainer.prefab
index d27fbccbc..2592d8fd0 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobContainer.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobContainer.prefab
@@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 3492144785080063237}
- component: {fileID: 7889487273161906977}
- component: {fileID: 7785860572896069705}
+ - component: {fileID: 1468309271852763067}
m_Layer: 0
m_Name: ItemSocket (1)
m_TagString: Untagged
@@ -51,39 +52,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -95,7 +70,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -195,6 +169,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &1468309271852763067
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 251161015644863541}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &1058267453060700974
GameObject:
m_ObjectHideFlags: 0
@@ -209,6 +195,7 @@ GameObject:
- component: {fileID: 6214475728348187998}
- component: {fileID: 8532409929422760468}
- component: {fileID: 7916747858208428323}
+ - component: {fileID: 521888360392017761}
m_Layer: 0
m_Name: ItemSocket (11)
m_TagString: Untagged
@@ -246,39 +233,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -290,7 +251,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -390,6 +350,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &521888360392017761
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1058267453060700974}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &1378983584142208125
GameObject:
m_ObjectHideFlags: 0
@@ -404,6 +376,7 @@ GameObject:
- component: {fileID: 1875918564020284620}
- component: {fileID: 9153324367550496876}
- component: {fileID: 5755579173600781048}
+ - component: {fileID: 8487832477624126045}
m_Layer: 0
m_Name: ItemSocket (5)
m_TagString: Untagged
@@ -441,39 +414,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -485,7 +432,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -585,6 +531,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &8487832477624126045
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1378983584142208125}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &1404770959867932707
GameObject:
m_ObjectHideFlags: 0
@@ -646,6 +604,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -667,9 +627,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &2214792497711643535
GameObject:
@@ -732,6 +694,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -753,9 +717,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &2987689210569271698
GameObject:
@@ -837,7 +803,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
_rootGO: {fileID: 6503575194566409312}
_audioSource: {fileID: 1934416043258242669}
- _hvrPhysicsDoor: {fileID: 6797639264981372780}
--- !u!135 &1304255910539477860
SphereCollider:
m_ObjectHideFlags: 0
@@ -870,6 +835,7 @@ GameObject:
- component: {fileID: 7540743326042314200}
- component: {fileID: 923689649037191229}
- component: {fileID: 2596048974797699402}
+ - component: {fileID: 4022459671801958678}
m_Layer: 0
m_Name: Inventory
m_TagString: Untagged
@@ -943,6 +909,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d33b9b45f9124f6b8afdb52a10613db0, type: 3}
m_Name:
m_EditorClassIdentifier:
+ _additionalSockets: []
+--- !u!114 &4022459671801958678
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3405583761693813258}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3698197d5ce58d542a61ce69122e3160, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketContainerBridge
--- !u!1 &3425223447465731592
GameObject:
m_ObjectHideFlags: 0
@@ -1004,6 +983,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -1025,9 +1006,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &3676950170103165385
GameObject:
@@ -1043,6 +1026,7 @@ GameObject:
- component: {fileID: 6457455381913810790}
- component: {fileID: 4667297139685793446}
- component: {fileID: 1904934727426696998}
+ - component: {fileID: 4386314002942822306}
m_Layer: 0
m_Name: ItemSocket (4)
m_TagString: Untagged
@@ -1080,39 +1064,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -1124,7 +1082,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -1224,6 +1181,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &4386314002942822306
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3676950170103165385}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &3808700244132799788
GameObject:
m_ObjectHideFlags: 0
@@ -1238,6 +1207,7 @@ GameObject:
- component: {fileID: 2559447240399077539}
- component: {fileID: 2099805584684839997}
- component: {fileID: 5825525148917267618}
+ - component: {fileID: 5243031492779952397}
m_Layer: 0
m_Name: ItemSocket (10)
m_TagString: Untagged
@@ -1275,39 +1245,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -1319,7 +1263,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -1419,6 +1362,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &5243031492779952397
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3808700244132799788}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &3951947908768828885
GameObject:
m_ObjectHideFlags: 0
@@ -1480,6 +1435,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -1501,9 +1458,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &4098042481361422127
GameObject:
@@ -1566,6 +1525,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -1587,9 +1548,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &4112695746748433750
GameObject:
@@ -1652,6 +1615,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -1673,9 +1638,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &4312441289917667731
GameObject:
@@ -1820,6 +1787,7 @@ GameObject:
- component: {fileID: 5785087856397484637}
- component: {fileID: 2720868678405414166}
- component: {fileID: 2783188317653191907}
+ - component: {fileID: 4313482169820223075}
m_Layer: 0
m_Name: ItemSocket (6)
m_TagString: Untagged
@@ -1857,39 +1825,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -1901,7 +1843,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -2001,6 +1942,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &4313482169820223075
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4544068122292998800}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &5161994242912671296
GameObject:
m_ObjectHideFlags: 0
@@ -2062,6 +2015,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -2083,9 +2038,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &5871940868660505720
GameObject:
@@ -2148,6 +2105,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -2169,9 +2128,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &5980433150175133251
GameObject:
@@ -2188,6 +2149,9 @@ GameObject:
- component: {fileID: 7136319683539270999}
- component: {fileID: 6573836035492029965}
- component: {fileID: 6797639264981372780}
+ - component: {fileID: 172510743831141755}
+ - component: {fileID: 8269181727875358990}
+ - component: {fileID: 1469359342129423611}
m_Layer: 11
m_Name: BIP01 CHEST_.*_1
m_TagString: Untagged
@@ -2218,10 +2182,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5980433150175133251}
- serializedVersion: 4
+ serializedVersion: 5
m_Mass: 1
- m_Drag: 0
- m_AngularDrag: 0.05
+ m_LinearDamping: 0
+ m_AngularDamping: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -2354,34 +2318,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 5337214664733562970}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 5337214664733562970}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -2491,6 +2431,42 @@ MonoBehaviour:
_rootGo: {fileID: 6503575194566409312}
_socketContainer: {fileID: 923689649037191229}
_collectorCollider: {fileID: 9145350332021062103}
+--- !u!114 &172510743831141755
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5980433150175133251}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &8269181727875358990
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5980433150175133251}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
+--- !u!114 &1469359342129423611
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5980433150175133251}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9fca5660b7d87044b9f6309422813386, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrHingeBridge
--- !u!1 &6389233531767616918
GameObject:
m_ObjectHideFlags: 0
@@ -2552,6 +2528,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -2573,9 +2551,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &6503575194566409312
GameObject:
@@ -2699,6 +2679,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -2720,9 +2702,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &6719234714038604469
GameObject:
@@ -2738,6 +2722,7 @@ GameObject:
- component: {fileID: 158729719686616005}
- component: {fileID: 7916741380795831998}
- component: {fileID: 5298672618290999715}
+ - component: {fileID: 7297648640871248928}
m_Layer: 0
m_Name: ItemSocket (0)
m_TagString: Untagged
@@ -2775,39 +2760,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -2819,7 +2778,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -2919,6 +2877,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &7297648640871248928
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6719234714038604469}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &6822371266024915418
GameObject:
m_ObjectHideFlags: 0
@@ -2933,6 +2903,7 @@ GameObject:
- component: {fileID: 4704764476294233102}
- component: {fileID: 598568339332800422}
- component: {fileID: 2564368200858102714}
+ - component: {fileID: 6827862672640001227}
m_Layer: 0
m_Name: ItemSocket (7)
m_TagString: Untagged
@@ -2970,39 +2941,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -3014,7 +2959,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -3114,6 +3058,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &6827862672640001227
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6822371266024915418}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &6842481923038689323
GameObject:
m_ObjectHideFlags: 0
@@ -3175,6 +3131,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -3196,9 +3154,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &7330976607743722592
GameObject:
@@ -3214,6 +3174,7 @@ GameObject:
- component: {fileID: 5927022531090099218}
- component: {fileID: 1469796680986704926}
- component: {fileID: 2037134406786832725}
+ - component: {fileID: 491441172845085459}
m_Layer: 0
m_Name: ItemSocket (8)
m_TagString: Untagged
@@ -3251,39 +3212,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -3295,7 +3230,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -3395,6 +3329,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &491441172845085459
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7330976607743722592}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &8017589019207168410
GameObject:
m_ObjectHideFlags: 0
@@ -3409,6 +3355,7 @@ GameObject:
- component: {fileID: 372745028345143667}
- component: {fileID: 2809123207245500460}
- component: {fileID: 1543325685525774575}
+ - component: {fileID: 6878980199702300609}
m_Layer: 0
m_Name: ItemSocket (3)
m_TagString: Untagged
@@ -3446,39 +3393,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -3490,7 +3411,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -3590,6 +3510,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &6878980199702300609
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8017589019207168410}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &8321360292962761766
GameObject:
m_ObjectHideFlags: 0
@@ -3604,6 +3536,7 @@ GameObject:
- component: {fileID: 3576335141605442734}
- component: {fileID: 1273249311594439381}
- component: {fileID: 8938383412123691392}
+ - component: {fileID: 4791134024498380442}
m_Layer: 0
m_Name: ItemSocket (9)
m_TagString: Untagged
@@ -3641,39 +3574,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -3685,7 +3592,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -3785,6 +3691,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &4791134024498380442
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8321360292962761766}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &8517697476932975960
GameObject:
m_ObjectHideFlags: 0
@@ -3851,7 +3769,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 3118550354282009099}
GrabBags: []
- _allowGrabbing: 0
SocketContainer: {fileID: 923689649037191229}
GrabbleMustBeHeld: 0
--- !u!114 &3118550354282009099
@@ -3914,6 +3831,7 @@ GameObject:
- component: {fileID: 7577847198649703145}
- component: {fileID: 3895740475241616462}
- component: {fileID: 9057796826089372788}
+ - component: {fileID: 1082262625873351403}
m_Layer: 0
m_Name: ItemSocket (2)
m_TagString: Untagged
@@ -3951,39 +3869,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnBeforeGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls: []
Released:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2596048974797699402}
- m_TargetAssemblyTypeName: Gothic.VR.Components.VobContainer.VRVobContainerSocketInventory,
- Gothic.VR
- m_MethodName: OnReleased
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
@@ -3995,7 +3887,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
- _allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
@@ -4095,6 +3986,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
+--- !u!114 &1082262625873351403
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8739208446635805306}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &8984571792552414776
GameObject:
m_ObjectHideFlags: 0
@@ -4156,6 +4059,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
+ m_ForceMeshLod: -1
+ m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -4177,9 +4082,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
+ m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1001 &6500207459066028785
PrefabInstance:
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobDoor.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobDoor.prefab
index 538cbe85e..8d82277d7 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobDoor.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobDoor.prefab
@@ -15,6 +15,9 @@ GameObject:
- component: {fileID: 258546060515477993}
- component: {fileID: 6106660089090848833}
- component: {fileID: 2964456439257095392}
+ - component: {fileID: 1447025355381534221}
+ - component: {fileID: 7842253579892008169}
+ - component: {fileID: 87455771706928418}
m_Layer: 6
m_Name: BIP01 DOORANGLE
m_TagString: Untagged
@@ -45,10 +48,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 980716176992391296}
- serializedVersion: 4
+ serializedVersion: 5
m_Mass: 10
- m_Drag: 0
- m_AngularDrag: 0.05
+ m_LinearDamping: 0
+ m_AngularDamping: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -181,34 +184,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2934795001242935560}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2934795001242935560}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -315,6 +294,42 @@ MonoBehaviour:
PreviousClosed: 0
VerboseLogging: 0
Locked: 0
+--- !u!114 &1447025355381534221
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 980716176992391296}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &7842253579892008169
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 980716176992391296}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
+--- !u!114 &87455771706928418
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 980716176992391296}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9fca5660b7d87044b9f6309422813386, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrHingeBridge
--- !u!1 &1222579370199367537
GameObject:
m_ObjectHideFlags: 0
@@ -523,7 +538,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
_rootGO: {fileID: 6503575194566409312}
_audioSource: {fileID: 4670513280573296585}
- _hvrPhysicsDoor: {fileID: 2964456439257095392}
--- !u!135 &827370569709809547
SphereCollider:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobFire.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobFire.prefab
index 792acacd9..4d5cc6937 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobFire.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobFire.prefab
@@ -13,6 +13,8 @@ GameObject:
- component: {fileID: 2854363553026066547}
- component: {fileID: 6907302684280751333}
- component: {fileID: 2520659641626351288}
+ - component: {fileID: 7062935307805374239}
+ - component: {fileID: 8587772998141430396}
m_Layer: 6
m_Name: ZM_.*LIGHTER
m_TagString: Untagged
@@ -152,34 +154,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -224,6 +202,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dc7b9870e5ee6804aa346c39e83f17c7, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Adapters.Vob.VRMobInteraction
+--- !u!114 &7062935307805374239
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &8587772998141430396
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter.prefab
index f899e974e..1cf05cd15 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter.prefab
@@ -13,6 +13,8 @@ GameObject:
- component: {fileID: 2854363553026066547}
- component: {fileID: 6907302684280751333}
- component: {fileID: 3676752456108531535}
+ - component: {fileID: 3911890553226910476}
+ - component: {fileID: 3096177028477653256}
m_Layer: 6
m_Name: BIP01.*|ZM.*
m_TagString: Untagged
@@ -152,34 +154,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -224,6 +202,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dc7b9870e5ee6804aa346c39e83f17c7, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Adapters.Vob.VRMobInteraction
+--- !u!114 &3911890553226910476
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &3096177028477653256
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter/Seat.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter/Seat.prefab
index aab913851..cde097fbe 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter/Seat.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobInter/Seat.prefab
@@ -56,26 +56,6 @@ PrefabInstance:
propertyPath: Rigidbody
value:
objectReference: {fileID: 492138702362873769}
- - target: {fileID: 6907302684280751333, guid: 6cbff20e63c6e794fa758a47d703f2df, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6907302684280751333, guid: 6cbff20e63c6e794fa758a47d703f2df, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 1502701034376819458}
- - target: {fileID: 6907302684280751333, guid: 6cbff20e63c6e794fa758a47d703f2df, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 6907302684280751333, guid: 6cbff20e63c6e794fa758a47d703f2df, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnGrabbed
- objectReference: {fileID: 0}
- - target: {fileID: 6907302684280751333, guid: 6cbff20e63c6e794fa758a47d703f2df, type: 3}
- propertyPath: Grabbed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: Gothic.VR.Adapters.Player.VRSeat, Gothic.VR
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -136,5 +116,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 89204bc4f3825b04bbeaa10da0266f6e, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Adapters.Player.VRSeat
- _canvasFade: {fileID: 0}
_fadeSpeed: 6
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobLadder.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobLadder.prefab
index ef90fe157..68afdcac8 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobLadder.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobLadder.prefab
@@ -12,6 +12,8 @@ GameObject:
- component: {fileID: 2279246351159797278}
- component: {fileID: 229708145539930019}
- component: {fileID: 2893514479669655516}
+ - component: {fileID: 5158607502795523759}
+ - component: {fileID: 1622434811052915792}
m_Layer: 0
m_Name: BIP01 LADDER
m_TagString: Untagged
@@ -150,34 +152,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 252428407596682482}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 252428407596682482}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -210,6 +188,30 @@ MonoBehaviour:
HandGrabbers: []
Stabbers: []
Stabbable: {fileID: 0}
+--- !u!114 &5158607502795523759
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3766033816963121094}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &1622434811052915792
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3766033816963121094}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobSwitch.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobSwitch.prefab
index 7cfcd2362..970b6a006 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobSwitch.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobSwitch.prefab
@@ -91,6 +91,8 @@ GameObject:
- component: {fileID: 6429894365401520520}
- component: {fileID: 2478502802283214804}
- component: {fileID: 6762376611792587169}
+ - component: {fileID: 5867362459497893582}
+ - component: {fileID: 7548610693852835858}
m_Layer: 6
m_Name: BIP01.*
m_TagString: Untagged
@@ -230,34 +232,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 6429894365401520520}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 6429894365401520520}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -302,6 +280,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dc7b9870e5ee6804aa346c39e83f17c7, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Adapters.Vob.VRMobInteraction
+--- !u!114 &5867362459497893582
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8788472130516112289}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &7548610693852835858
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8788472130516112289}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1001 &7374455095753343057
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobWheel.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobWheel.prefab
index c997fdda2..86bbe44de 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobWheel.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCMobWheel.prefab
@@ -13,6 +13,8 @@ GameObject:
- component: {fileID: 2854363553026066547}
- component: {fileID: 6907302684280751333}
- component: {fileID: 8384191140399634538}
+ - component: {fileID: 5498683309141561368}
+ - component: {fileID: 3429509007387962835}
m_Layer: 6
m_Name: .*
m_TagString: Untagged
@@ -152,34 +154,10 @@ MonoBehaviour:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 2854363553026066547}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -224,6 +202,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dc7b9870e5ee6804aa346c39e83f17c7, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Adapters.Vob.VRMobInteraction
+--- !u!114 &5498683309141561368
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &3429509007387962835
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5926234300762413270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCNpc.prefab b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCNpc.prefab
index 3ea4fa907..302eae8b5 100644
--- a/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCNpc.prefab
+++ b/Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCNpc.prefab
@@ -125,7 +125,6 @@ MonoBehaviour:
DebugPauseAtPlayAnimation: 0
DebugPauseAtStopAnimation: 0
DebugPlayAnimation:
- RootBone: {fileID: 8679908380237941234}
--- !u!114 &7657019000195239257
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -311,6 +310,8 @@ GameObject:
- component: {fileID: 8720130747125307888}
- component: {fileID: 957202922675155714}
- component: {fileID: 8095166574519349901}
+ - component: {fileID: 8068816277696156100}
+ - component: {fileID: 7853705596767096919}
m_Layer: 10
m_Name: RootMotionCollider
m_TagString: Untagged
@@ -471,78 +472,16 @@ MonoBehaviour:
m_Calls: []
Grabbed:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 4148423720954529152}
- m_TargetAssemblyTypeName: Gothic.HVR.Components.HVRoCNpc, Assembly-CSharp
- m_MethodName: OnGrabbed
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Released:
m_PersistentCalls:
m_Calls: []
HoverEnter:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 383060561904739675}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverEnter
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- - m_Target: {fileID: 3776598624381708510}
- m_TargetAssemblyTypeName: Gothic.Core.Adapters.UI.StatusBars.StatusBarAdapter,
- Gothic.Core
- m_MethodName: EnableBar
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
HoverExit:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 383060561904739675}
- m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
- m_MethodName: OnHoverExit
- m_Mode: 0
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- - m_Target: {fileID: 3776598624381708510}
- m_TargetAssemblyTypeName: Gothic.Core.Adapters.UI.StatusBars.StatusBarAdapter,
- Gothic.Core
- m_MethodName: DisableBar
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
@@ -575,6 +514,30 @@ MonoBehaviour:
HandGrabbers: []
Stabbers: []
Stabbable: {fileID: 0}
+--- !u!114 &8068816277696156100
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3647559741746323219}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
+--- !u!114 &7853705596767096919
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3647559741746323219}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1 &3748409399599174953
GameObject:
m_ObjectHideFlags: 0
@@ -877,17 +840,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ce7e724ba52cae47a499f87c612cd47, type: 3}
---- !u!114 &3776598624381708510 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 1174396645238234420, guid: 6ce7e724ba52cae47a499f87c612cd47, type: 3}
- m_PrefabInstance: {fileID: 2604602267262121450}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: e6c728d9fa1f409bad98a31897d804e1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!224 &6204853864044937825 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8230739814078363531, guid: 6ce7e724ba52cae47a499f87c612cd47, type: 3}
diff --git a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides.meta b/Assets/Gothic-VR/Scripts/Adapters/HVROverrides.meta
deleted file mode 100644
index 014cc8ec9..000000000
--- a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 9769f62ce70e4bdbb907c1dacfc8b6b3
-timeCreated: 1730258998
\ No newline at end of file
diff --git a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRPlayerController.cs b/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRPlayerController.cs
deleted file mode 100644
index 3a6e12e06..000000000
--- a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRPlayerController.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-#if GOTHIC_HVR_INSTALLED
-using Gothic.Core;
-using Gothic.Core.Adapters.UI.Menus;
-using Gothic.Core.Const;
-using Gothic.Core.Services;
-using Gothic.Core.Services.Config;
-using Gothic.VR.Adapters.UI;
-using Gothic.VR.Interaction.Backends.Hvr;
-using Gothic.VR.Interaction.Models;
-using HurricaneVR.Framework.Core.Player;
-using MyBox;
-using Reflex.Attributes;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-namespace Gothic.VR.Adapters.HVROverrides
-{
- public class VRPlayerController : HVRPlayerController
- {
- [Inject] private readonly ConfigService _configService;
- [Inject] private readonly GameStateService _gameStateService;
-
- public VRPlayerInputs VrInputs => (VRPlayerInputs)Inputs;
-
- [Separator("Gothic - Settings")]
- public MenuHandler MenuHandler;
- public VRCinema Cinema;
-
- [SerializeField] private float _characterControllerSwimDiveStepHeight = 1f; // 1m means walking out of water in Xardas' old tower in G1.
-
- // For resetting values when stop swimming.
- private float _defaultCharacterControllerStepHeight;
-
- protected override void Start()
- {
- base.Start();
- GlobalEventDispatcher.PlayerPrefUpdated.AddListener(OnPlayerPrefsUpdated);
-
- _defaultCharacterControllerStepHeight = CharacterController.stepOffset;
-
- // Enabled later via button press or other events
- MenuHandler?.gameObject.SetActive(false);
- }
-
- protected override void Update()
- {
- base.Update();
-
- if (VrInputs.IsMenuActivated && IsGameScene() && (Cinema == null || !Cinema.IsBlockingInput))
- {
- _gameStateService.InGameAndAlive = true;
- MenuHandler.ToggleVisibility();
- }
- }
-
- private void OnDestroy()
- {
- GlobalEventDispatcher.PlayerPrefUpdated.RemoveListener(OnPlayerPrefsUpdated);
- }
-
- ///
- /// Used in game scenes where you play the game (world.unity, ...)
- ///
- public void SetNormalControls(bool useDefaultValues = false)
- {
- // We have our player created before Gothic inis are loaded. We therefore need to set some default values.
- if (useDefaultValues)
- {
- ApplyComfortSettings(VrSitStand.PlayerHeight, VrMoveDirection.Camera, VrTurnType.Snap, 45f, 90f);
- return;
- }
-
- var gothicIni = _configService.Gothic;
- var sitStand = (VrSitStand)gothicIni.GetInt(VRConstants.IniNames.SitStand, (int)VrSitStand.PlayerHeight);
- var moveDirection =
- (VrMoveDirection)gothicIni.GetInt(VRConstants.IniNames.MoveDirection, (int)VrMoveDirection.Camera);
- var turnType = (VrTurnType)gothicIni.GetInt(VRConstants.IniNames.RotationType, (int)VrTurnType.Snap);
-
- var snapSetting = gothicIni.GetInt(VRConstants.IniNames.SnapRotationAmount, VRConstants.SnapRotationDefaultValue);
- // e.g., 20° = 5° + 3*5°
- var snapDegrees = VRConstants.SnapRotationAmountSettingTickAmount + VRConstants.SnapRotationAmountSettingTickAmount * snapSetting;
-
- var smoothSetting = gothicIni.GetFloat(VRConstants.IniNames.SmoothRotationSpeed, VRConstants.SmoothRotationDefaultValue);
- // e.g., 50 = 5 + 90 * 0.5f
- var smoothSpeed = VRConstants.SmoothRotationMinSpeed + VRConstants.SmoothRotationMaxAdditionalSpeed * smoothSetting;
-
- ApplyComfortSettings(sitStand, moveDirection, turnType, snapDegrees, smoothSpeed);
- }
-
- public void ApplyComfortSettings(VrSitStand sitStand, VrMoveDirection moveDirection, VrTurnType turnType,
- float snapDegrees, float smoothSpeed)
- {
- CameraRig.SetSitStandMode(sitStand.ToHvr());
- DirectionStyle = moveDirection.ToHvr();
- RotationType = turnType.ToHvr();
- SnapAmount = snapDegrees;
- SmoothTurnSpeed = smoothSpeed;
- }
-
- ///
- /// Disable certain actions to keep player stuck in current position.
- ///
- public void SetLockedControls()
- {
- // HINT: Disable physics
- // We can't disable physics as it would prevent HVRTeleport.Teleport() from finishing (as it checks for Player.IsGrounded every frame).
- // Therefore, we need to ground the player always on a plane and disable movement only.
-
- MovementEnabled = false;
- RotationEnabled = false;
- Teleporter.enabled = false;
- }
-
- public void SetUnlockedControls()
- {
- MovementEnabled = true;
- RotationEnabled = true;
- Teleporter.enabled = true;
- }
-
- public void SetWalkingControls()
- {
- ChangeGrabbing(true);
-
- CanCrouch = true;
- CanJump = true;
- Teleporter.enabled = true;
- CharacterController.stepOffset = _defaultCharacterControllerStepHeight;
-
- // Disable vertical walking controls
- }
-
- public void SetWaterWalkingControls()
- {
- ChangeGrabbing(true);
-
- CanCrouch = false;
- CanJump = false;
- Teleporter.enabled = false;
- CharacterController.stepOffset = _characterControllerSwimDiveStepHeight;
- }
-
- public void SetSwimmingControls()
- {
- // Disable grabbing of objects (as in G1)
- ChangeGrabbing(false);
-
- CanCrouch = false;
- CanJump = false;
- Teleporter.enabled = false;
- CharacterController.stepOffset = _characterControllerSwimDiveStepHeight;
-
- // Disable vertical walking controls
- }
-
- public void SetDivingControls()
- {
- // Disable grabbing of objects (as in G1)
- ChangeGrabbing(false);
-
- CanCrouch = false;
- CanJump = false;
- Teleporter.enabled = false;
- CharacterController.stepOffset = _characterControllerSwimDiveStepHeight;
-
- // Enable vertical walking controls
- }
-
- private void ChangeGrabbing(bool enable)
- {
- LeftHand.AllowGrabbing = enable;
- LeftHand.ForceGrabber.AllowGrabbing = enable;
- LeftHand.AllowHovering = enable;
- LeftHand.ForceGrabber.AllowHovering = enable;
-
- RightHand.AllowGrabbing = enable;
- RightHand.ForceGrabber.AllowGrabbing = enable;
- RightHand.AllowHovering = enable;
- RightHand.ForceGrabber.AllowHovering = enable;
-
- // Disable hand animations. Basically open the hand fully if disabled=true
- if (LeftHand.HandAnimator && LeftHand.HandAnimator.CurrentPoser)
- {
- if (LeftHand.HandAnimator.CurrentPoser.PrimaryPose != null)
- {
- LeftHand.HandAnimator.CurrentPoser.PrimaryPose.Disabled = !enable;
- }
-
- if (LeftHand.HandAnimator.CurrentPoser.Blends != null)
- {
- LeftHand.HandAnimator.CurrentPoser.Blends.ForEach(i => i.Disabled = !enable);
- }
- }
-
- if (RightHand.HandAnimator && RightHand.HandAnimator.CurrentPoser)
- {
- if (RightHand.HandAnimator.CurrentPoser.PrimaryPose != null)
- {
- RightHand.HandAnimator.CurrentPoser.PrimaryPose.Disabled = !enable;
- }
-
- if (RightHand.HandAnimator.CurrentPoser.Blends != null)
- {
- RightHand.HandAnimator.CurrentPoser.Blends.ForEach(i => i.Disabled = !enable);
- }
- }
- }
-
- private void OnPlayerPrefsUpdated(string preferenceKey, object value)
- {
- // Just update everything.
- if (preferenceKey == VRConstants.IniNames.MoveDirection ||
- preferenceKey == VRConstants.IniNames.RotationType ||
- preferenceKey == VRConstants.IniNames.SnapRotationAmount ||
- preferenceKey == VRConstants.IniNames.SmoothRotationSpeed ||
- preferenceKey == VRConstants.IniNames.SitStand)
- {
- SetNormalControls();
- }
- }
-
- ///
- /// Game scenes are all the ones where we play. Aka !=MainMenu, !=Loadings, !=Logo videos, ...
- ///
- private bool IsGameScene()
- {
- var activeSceneName = SceneManager.GetActiveScene().name;
-
- return activeSceneName switch
- {
- Constants.SceneBootstrap => false,
- Constants.ScenePlayer => false,
- Constants.SceneGameVersion => false,
- Constants.ScenePreCaching => false,
- Constants.SceneLogo => false,
- Constants.SceneMainMenu => false,
- Constants.SceneLoading => false,
- _ => true
- };
- }
-
- // protected override void HandleHorizontalMovement()
- // {
- // if (_playerAi.WalkMode == (int)VmGothicEnums.WalkMode.Swim)
- // {
- //
- // }
- // else if (_playerAi.WalkMode == (int)VmGothicEnums.WalkMode.Dive)
- // {
- //
- // }
- // else
- // {
- // base.HandleHorizontalMovement();
- // }
- // }
- //
- // protected override void HandleVerticalMovement()
- // {
- // if (_playerAi.WalkMode == (int)VmGothicEnums.WalkMode.Swim)
- // {
- //
- // }
- // else if (_playerAi.WalkMode == (int)VmGothicEnums.WalkMode.Dive)
- // {
- //
- // }
- // else
- // {
- // base.HandleVerticalMovement();
- // }
- // }
- }
-}
-#endif
diff --git a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRPlayerInputs.cs b/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRPlayerInputs.cs
deleted file mode 100644
index ef0d43864..000000000
--- a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRPlayerInputs.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-#if GOTHIC_HVR_INSTALLED
-using HurricaneVR.Framework.ControllerInput;
-using HurricaneVR.Framework.Shared;
-using MyBox;
-using UnityEngine.InputSystem;
-
-namespace Gothic.VR.Adapters.HVROverrides
-{
- public class VRPlayerInputs : HVRPlayerInputs
- {
- [Separator("Gothic - Settings")]
- public bool IsMenuActivated;
- public HVRButtonState MenuState;
- public bool IsMenuButtonEnabled = true;
-
- // Just Pressed
- public HVRButtonState BothGripsActivatedState;
- public bool IsBothGripsActivated;
-
- // Pressed
- public bool IsBothGripsActive;
- public HVRButtonState BothGripsActiveState;
-
-
- protected override void UpdateInput()
- {
- base.UpdateInput();
-
- if (!UpdateInputs)
- {
- return;
- }
-
- IsMenuActivated = GetMenuActivated();
- ResetState(ref MenuState);
- SetState(ref MenuState, IsMenuActivated);
-
- // Just Pressed
- IsBothGripsActivated = GetBothGripsActivated();
- ResetState(ref BothGripsActivatedState);
- SetState(ref BothGripsActivatedState, IsBothGripsActivated);
-
-
- // Pressed
- IsBothGripsActive = GetBothGripsActive();
- ResetState(ref BothGripsActiveState);
- SetState(ref BothGripsActiveState, IsBothGripsActive);
- }
-
- private bool GetMenuActivated()
- {
- if (!IsMenuButtonEnabled)
- {
- return false;
- }
- // If HVRSimulator is Active
- if (UseWASD)
- {
- return Keyboard.current[Key.Escape].wasPressedThisFrame;
- }
-
- return HVRController.GetButtonState(HVRHandSide.Left, HVRButtons.Secondary).JustActivated;
- }
-
- private bool GetBothGripsActivated()
- {
- if (UseWASD)
- {
- return Keyboard.current[Key.T].wasPressedThisFrame;
- }
- else
- {
- var leftButtonState = HVRController.GetButtonState(HVRHandSide.Left, HVRButtons.Grip);
- var rightButtonState = HVRController.GetButtonState(HVRHandSide.Right, HVRButtons.Grip);
-
- return leftButtonState.JustActivated && leftButtonState.Active ||
- rightButtonState.JustActivated && rightButtonState.Active;
- }
- }
-
- private bool GetBothGripsActive()
- {
- if (UseWASD)
- {
- return Keyboard.current[Key.T].isPressed;
- }
- else
- {
- return HVRController.GetButtonState(HVRHandSide.Left, HVRButtons.Grip).Active
- && HVRController.GetButtonState(HVRHandSide.Right, HVRButtons.Grip).Active;
- }
- }
-
- protected override bool GetIsJumpActivated()
- {
- // If HVRSimulator is active
- if (UseWASD)
- {
- return Keyboard.current[Key.Space].wasPressedThisFrame;
- }
-
- return RightController.PrimaryButtonState.JustActivated;
- }
-
- protected override bool GetCrouch()
- {
- // If HVRSimulator is active
- if (UseWASD)
- {
- return Keyboard.current[Key.Z].wasPressedThisFrame || Keyboard.current[Key.X].wasPressedThisFrame;
- }
- else
- {
- return base.GetCrouch();
- }
- }
-
- protected override bool GetSprinting()
- {
- // If HVRSimulator is active
- if (UseWASD)
- {
- return Keyboard.current[Key.LeftShift].wasPressedThisFrame;
- }
- else
- {
- return base.GetSprinting();
- }
- }
-
- }
-}
-#endif
-
diff --git a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRShoulderSocket.cs b/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRShoulderSocket.cs
deleted file mode 100644
index d102d805f..000000000
--- a/Assets/Gothic-VR/Scripts/Adapters/HVROverrides/VRShoulderSocket.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using HurricaneVR.Framework.Core.Utils;
-
-namespace Gothic.VR.Adapters.HVROverrides
-{
- ///
- /// Overwritten only to ensure, that our use "parent" as "*(Loader)" element with VobContainer.
- /// Class name is used for VRBackpack.OnBackpackReleasedFromShoulder() only.
- ///
- public class VRShoulderSocket : VRSocket
- {
-
- }
-}
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Marvin/VRNpcMarvinAdapter.cs b/Assets/Gothic-VR/Scripts/Adapters/Marvin/VRNpcMarvinAdapter.cs
index 41644acdb..c277c5173 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Marvin/VRNpcMarvinAdapter.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Marvin/VRNpcMarvinAdapter.cs
@@ -3,8 +3,8 @@
using Gothic.Core.Models.Container;
using Gothic.Core.Services.Player;
using Gothic.Core.Extensions;
-using HurricaneVR.Framework.Core;
-using HurricaneVR.Framework.Core.Grabbers;
+using Gothic.VR.Interaction.Components;
+using Gothic.VR.Interaction.Models;
using Reflex.Attributes;
using UnityEngine;
using ZenKit.Daedalus;
@@ -17,13 +17,30 @@ public class VRNpcMarvinAdapter : MonoBehaviour
[Inject] private PlayerService _playerService;
private NpcContainer _npcData;
+ private VrInteractable _interactable;
private void Awake()
{
_npcData = GetComponentInParent().Npc.GetUserData();
}
- public void OnGrabbed(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ ///
+ /// Subscribed in Start (not Awake), so that VRNpc (dialog/loot) always handles a grab first.
+ ///
+ private void Start()
+ {
+ _interactable = VrInteractable.Find(this);
+ if (_interactable != null)
+ _interactable.Grabbed += OnGrabbed;
+ }
+
+ private void OnDestroy()
+ {
+ if (_interactable != null)
+ _interactable.Grabbed -= OnGrabbed;
+ }
+
+ private void OnGrabbed(VrGrabArgs args)
{
// Safety return, until we have proper Marvin feature handling implemented (active = true/false)
return;
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/Debugging/VRHandVelocityDebugger.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/Debugging/VRHandVelocityDebugger.cs
index dc6af8cb8..5da6befc7 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Player/Debugging/VRHandVelocityDebugger.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/Debugging/VRHandVelocityDebugger.cs
@@ -1,15 +1,15 @@
-using System;
-using Gothic.VR.Adapters.HVROverrides;
using Gothic.Core.Extensions;
-using HurricaneVR.Framework.Core.Player;
+using Gothic.VR.Interaction.Models;
+using Gothic.VR.Interaction.Ports;
+using Reflex.Attributes;
using UnityEngine;
namespace Gothic.VR.Adapters.Player.Debugging
{
public class VRHandVelocityDebugger : MonoBehaviour
{
- [SerializeField] private VRPlayerController _playerController;
- [SerializeField] private VRPlayerInputs _playerInputs;
+ [Inject] private readonly IVrInput _vrInput;
+
[SerializeField] private GameObject _leftHandModel;
[SerializeField] private GameObject _rightHandModel;
[SerializeField] private Rigidbody _leftHandRigidbody;
@@ -20,9 +20,12 @@ public class VRHandVelocityDebugger : MonoBehaviour
private LineRenderer _lineRendererRight1;
private LineRenderer _lineRendererRight2;
private LineRenderer _lineRendererRight3;
+ private IVrRig _rig;
private void Start()
{
+ _rig = GetComponent();
+
// Add a LineRenderer component
_lineRendererLeft = _leftHandModel.AddComponent();
_lineRendererRight1 = _rightHandModel.AddComponent();
@@ -65,16 +68,16 @@ private void Start()
private void Update()
{
var rightPosition = _rightHandModel.transform.position;
- var rawVelocity = _playerInputs.RightController.Velocity;
+ var rawVelocity = _vrInput.GetControllerVelocity(VrHandSide.Right);
_lineRendererRight1.SetPosition(0, rightPosition);
_lineRendererRight1.SetPosition(1, rightPosition + rawVelocity * 10);
_lineRendererRight2.SetPosition(0, rightPosition);
- _lineRendererRight2.SetPosition(1, rightPosition + _playerController.transform.TransformDirection(rawVelocity) * 10);
+ _lineRendererRight2.SetPosition(1, rightPosition + _rig.Root.TransformDirection(rawVelocity) * 10);
_lineRendererRight3.SetPosition(0, rightPosition);
- _lineRendererRight3.SetPosition(1, rightPosition + _playerController.CameraRig.transform.TransformDirection(rawVelocity) * 10);
+ _lineRendererRight3.SetPosition(1, rightPosition + _rig.TrackingSpace.TransformDirection(rawVelocity) * 10);
}
}
}
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRBackpack.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/VRBackpack.cs
index fc5275e31..e94e0bca6 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Player/VRBackpack.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRBackpack.cs
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
-using Assets.HurricaneVR.Framework.Shared.Utilities;
using Gothic.Core;
using Gothic.Core.Adapters.Vob;
using Gothic.Core.Manager;
@@ -13,12 +12,10 @@
using Gothic.Core.Services.Vm;
using Gothic.Core.Services.Vobs;
using Gothic.Core.Services.World;
-using Gothic.VR.Adapters.HVROverrides;
+using Gothic.VR.Interaction.Components;
+using Gothic.VR.Interaction.Models;
+using Gothic.VR.Interaction.Ports;
using Gothic.VR.Services;
-using HurricaneVR.Framework.Core;
-using HurricaneVR.Framework.Core.Grabbers;
-using HurricaneVR.Framework.Core.Sockets;
-using HurricaneVR.Framework.Core.Utils;
using Reflex.Attributes;
using TMPro;
using UnityEngine;
@@ -26,12 +23,25 @@
namespace Gothic.VR.Adapters.Player
{
- [RequireComponent(typeof(HVRSocketable))]
+ ///
+ /// The player's backpack (inventory pages) and holsters. The backpack itself is a VrInteractable with an
+ /// IVrSocketContainer for its slots. Items put into holsters or slots are added to the hero's inventory.
+ ///
public class VRBackpack : MonoBehaviour
{
[SerializeField] private TMP_Text _categoryText;
[SerializeField] private TMP_Text _pagerText;
- [SerializeField] private HVRSocketContainer _socketContainer;
+
+ [Tooltip("Hip and shoulder holsters (IVrSocket). Items inside count as inventory.")]
+ [SerializeField] private GameObject[] _holsterSockets;
+
+ [Tooltip("Backpack slots (IVrSocket) which add/remove items to/from the inventory when used.")]
+ [SerializeField] private GameObject[] _inventorySockets;
+
+ private VrInteractable _interactable;
+ private IVrSocketContainer _socketContainer;
+ private readonly List _holsters = new();
+ private readonly List _slots = new();
private bool _isZenKitBootstrapped;
private int _currentPage = 1;
@@ -49,30 +59,87 @@ public class VRBackpack : MonoBehaviour
[Inject] private readonly VRWeaponService _vrWeaponService;
+ private void Awake()
+ {
+ _interactable = GetComponent();
+ _socketContainer = GetComponent();
+ CollectSockets(_holsterSockets, _holsters);
+ CollectSockets(_inventorySockets, _slots);
+
+ _interactable.Grabbed += OnBackpackGrabbedToShoulder;
+ _interactable.Released += OnBackpackReleasedFromShoulder;
+
+ foreach (var holster in _holsters)
+ {
+ holster.Grabbed += OnItemPutIntoHolster;
+ holster.Released += OnItemPutOutOfHolster;
+ }
+
+ foreach (var slot in _slots)
+ {
+ slot.Grabbed += OnItemPutIntoBackpack;
+ slot.Released += OnItemPutOutOfBackpack;
+ }
+ }
+
private void Start()
{
GlobalEventDispatcher.ZenKitBootstrapped.AddListener(Init);
}
- private void Init()
+ private void OnDestroy()
{
- var socketable = GetComponent();
+ if (_interactable != null)
+ {
+ _interactable.Grabbed -= OnBackpackGrabbedToShoulder;
+ _interactable.Released -= OnBackpackReleasedFromShoulder;
+ }
- socketable.UnsocketedClip = _audioService.CreateAudioClip(_audioService.InvOpen.File);
- socketable.SocketedClip = _audioService.CreateAudioClip(_audioService.InvClose.File);
+ foreach (var holster in _holsters)
+ {
+ holster.Grabbed -= OnItemPutIntoHolster;
+ holster.Released -= OnItemPutOutOfHolster;
+ }
+
+ foreach (var slot in _slots)
+ {
+ slot.Grabbed -= OnItemPutIntoBackpack;
+ slot.Released -= OnItemPutOutOfBackpack;
+ }
+ }
+
+ private static void CollectSockets(GameObject[] socketGos, List result)
+ {
+ if (socketGos == null)
+ return;
+
+ foreach (var socketGo in socketGos)
+ {
+ if (socketGo != null && socketGo.TryGetComponent(out IVrSocket socket))
+ result.Add(socket);
+ }
+ }
+
+ private void Init()
+ {
+ _interactable.SetSocketSounds(
+ socketed: _audioService.CreateAudioClip(_audioService.InvClose.File),
+ unsocketed: _audioService.CreateAudioClip(_audioService.InvOpen.File));
_isZenKitBootstrapped = true;
}
- public void OnBackpackGrabbedToShoulder(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ private void OnBackpackGrabbedToShoulder(VrGrabArgs args)
{
// Nothing to do for now.
// We could potentially remove the meshes inside Backpack or simply hide it from rendering later.
}
-
- public void OnBackpackReleasedFromShoulder(HVRGrabberBase grabber, HVRGrabbable grabbable)
+
+ private void OnBackpackReleasedFromShoulder(VrGrabArgs args)
{
- if (grabber is not VRShoulderSocket && grabber is not HVRShoulderSocket)
+ if (args.Kind != VrGrabberKind.Socket || args.GrabberGo == null)
+ return;
+ if (!args.GrabberGo.TryGetComponent(out IVrSocket socket) || !socket.IsShoulder)
return;
UpdateInventoryView();
@@ -82,21 +149,21 @@ public void OnBackpackReleasedFromShoulder(HVRGrabberBase grabber, HVRGrabbable
/// When putting into holster, culling is already deactivated.
/// We simply need to tell the game: add inventory amount.
///
- public void OnItemPutIntoHolster(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ private void OnItemPutIntoHolster(VrGrabArgs args)
{
- var vobLoader = grabbable.GetComponentInParent();
+ var vobLoader = args.Interactable.GetComponentInParent();
var vobContainer = vobLoader.Container;
_playerService.AddItem(vobContainer.Vob.Name, Mathf.Max(1, vobContainer.VobAs().Amount));
}
- public void OnItemPutIntoBackpack(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ private void OnItemPutIntoBackpack(VrGrabArgs args)
{
if (_tempIgnoreSocketing)
return;
-
- var vobLoader = grabbable.GetComponentInParent(true);
+
+ var vobLoader = args.Interactable.GetComponentInParent(true);
var vobContainer = vobLoader.Container;
_vobMeshCullingService.RemoveCullingEntry(vobContainer);
@@ -111,9 +178,9 @@ public void OnItemPutIntoBackpack(HVRGrabberBase grabber, HVRGrabbable grabbable
/// When putting out of holster, culling is already deactivated.
/// We simply need to tell the game: substract inventory amount.
///
- public void OnItemPutOutOfHolster(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ private void OnItemPutOutOfHolster(VrGrabArgs args)
{
- var vobLoader = grabbable.GetComponentInParent();
+ var vobLoader = args.Interactable.GetComponentInParent();
if (vobLoader == null)
return;
var vobContainer = vobLoader.Container;
@@ -121,12 +188,12 @@ public void OnItemPutOutOfHolster(HVRGrabberBase grabber, HVRGrabbable grabbable
_playerService.RemoveItem(vobContainer.Vob.Name, Mathf.Max(1, vobContainer.VobAs().Amount));
}
- public void OnItemPutOutOfBackpack(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ private void OnItemPutOutOfBackpack(VrGrabArgs args)
{
if (_tempIgnoreSocketing)
return;
- var vobLoader = grabbable.GetComponentInParent();
+ var vobLoader = args.Interactable.GetComponentInParent();
var vobContainer = vobLoader.Container;
_vobMeshCullingService.AddCullingEntry(vobContainer);
@@ -234,15 +301,15 @@ private void ClearSockets()
foreach (var socket in _socketContainer.Sockets)
{
// Nothing inside socket
- if (!socket.IsGrabbing)
+ if (!socket.IsOccupied)
continue;
// Destroy VobLoader GO after releasing it from slot (proper event handling)
- var heldRoot = socket.HeldObject.transform.parent.gameObject;
+ var heldRoot = socket.Held.transform.parent.gameObject;
socket.ForceRelease();
heldRoot.SetActive(false); // Disable it, as it would be with scale 1 in front of our camera for 1 second.
- // We need to wait until next frame to ensure HVR has removed the item from socket.
- this.ExecuteNextUpdate(() => Destroy(heldRoot));
+ // We need to wait until next frame to ensure the socket has removed the item.
+ StartCoroutine(DestroyNextFrame(heldRoot));
}
}
@@ -263,10 +330,16 @@ private void RefillSockets(List inventory)
});
vobContainer.Go.GetComponentInChildren().isKinematic = false; // Get rid of isKinematic warnings as the Grab is done "physically".
- _socketContainer.TryAddGrabbable(vobContainer.Go.GetComponentInChildren());
+ _socketContainer.TryAdd(vobContainer.Go.GetComponentInChildren());
}
}
+ private static IEnumerator DestroyNextFrame(GameObject go)
+ {
+ yield return null;
+ Destroy(go);
+ }
+
private void SubtractItemFromHand(List inventory, GameObject handItem)
{
if (handItem == null)
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayer.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayer.cs
new file mode 100644
index 000000000..5e5c9f80d
--- /dev/null
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayer.cs
@@ -0,0 +1,104 @@
+#if GOTHIC_HVR_INSTALLED
+using Gothic.Core.Adapters.UI.Menus;
+using Gothic.Core.Const;
+using Gothic.Core.Services;
+using Gothic.VR.Adapters.UI;
+using Gothic.VR.Interaction.Models;
+using Gothic.VR.Interaction.Ports;
+using Reflex.Attributes;
+using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
+
+namespace Gothic.VR.Adapters.Player
+{
+ ///
+ /// Gothic side of the VR player prefab, next to the backend's IVrRig. Opens the in-game menu and provides the
+ /// Gothic-specific inputs derived from IVrInput.
+ ///
+ public class VRPlayer : MonoBehaviour
+ {
+ [Inject] private readonly IVrInput _vrInput;
+ [Inject] private readonly GameStateService _gameStateService;
+
+ [Tooltip("In-game menu (skills, notepad, ...). Toggled with the menu button in game scenes.")]
+ public MenuHandler MenuHandler;
+
+ [Tooltip("Plays videos in front of the player.")]
+ public VRCinema Cinema;
+
+ [Tooltip("Step height while in water. 1m means walking out of water in Xardas' old tower in G1.")]
+ public float SwimDiveStepHeight = 1f;
+
+ [Tooltip("Disabled during dialogs, videos, ...")]
+ public bool IsMenuButtonEnabled = true;
+
+ ///
+ /// The menu button was pressed this frame (and isn't disabled).
+ ///
+ public bool IsMenuActivated
+ {
+ get
+ {
+ if (!IsMenuButtonEnabled)
+ return false;
+
+ if (_vrInput.IsSimulator)
+ return Keyboard.current[Key.Escape].wasPressedThisFrame;
+
+ return _vrInput.GetButton(VrHandSide.Left, VrButton.Secondary).IsJustActivated;
+ }
+ }
+
+ ///
+ /// Both grips are held.
+ ///
+ public bool IsBothGripsActive
+ {
+ get
+ {
+ if (_vrInput.IsSimulator)
+ return Keyboard.current[Key.T].isPressed;
+
+ return _vrInput.GetButton(VrHandSide.Left, VrButton.Grip).IsActive
+ && _vrInput.GetButton(VrHandSide.Right, VrButton.Grip).IsActive;
+ }
+ }
+
+ private void Start()
+ {
+ // Enabled later via button press or other events
+ MenuHandler?.gameObject.SetActive(false);
+ }
+
+ private void Update()
+ {
+ if (IsMenuActivated && IsGameScene() && (Cinema == null || !Cinema.IsBlockingInput))
+ {
+ _gameStateService.InGameAndAlive = true;
+ MenuHandler.ToggleVisibility();
+ }
+ }
+
+ ///
+ /// Game scenes are all the ones where we play. Aka !=MainMenu, !=Loadings, !=Logo videos, ...
+ ///
+ private bool IsGameScene()
+ {
+ var activeSceneName = SceneManager.GetActiveScene().name;
+
+ return activeSceneName switch
+ {
+ Constants.SceneBootstrap => false,
+ Constants.ScenePlayer => false,
+ Constants.SceneGameVersion => false,
+ Constants.ScenePreCaching => false,
+ Constants.SceneLogo => false,
+ Constants.SceneMainMenu => false,
+ Constants.SceneLoading => false,
+ _ => true
+ };
+ }
+ }
+}
+#endif
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayer.cs.meta b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayer.cs.meta
new file mode 100644
index 000000000..f4cc091f9
--- /dev/null
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ae71b0be15a534849b5249a3e671a43f
\ No newline at end of file
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerItemAdapter.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerItemAdapter.cs
index 856c3113a..ec77eb34d 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerItemAdapter.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerItemAdapter.cs
@@ -1,21 +1,42 @@
#if GOTHIC_HVR_INSTALLED
using Gothic.Core.Manager;
-using HurricaneVR.Framework.Core;
-using HurricaneVR.Framework.Core.Grabbers;
+using Gothic.VR.Interaction.Models;
+using Gothic.VR.Interaction.Ports;
using Reflex.Attributes;
using UnityEngine;
namespace Gothic.VR.Adapters.Player
{
+ ///
+ /// Sits on the player rig and listens to the hand and distance grabbers of both hands.
+ ///
public class VRPlayerItemAdapter : MonoBehaviour
{
[Inject] private readonly MarvinService _marvinService;
+ private IVrRig _rig;
+
+
+ private void Awake()
+ {
+ _rig = GetComponent();
+ foreach (var grabber in _rig.HandGrabbers)
+ grabber.BeforeGrabbed += OnBeforeGrabbed;
+ }
+
+ private void OnDestroy()
+ {
+ if (_rig == null)
+ return;
+
+ foreach (var grabber in _rig.HandGrabbers)
+ grabber.BeforeGrabbed -= OnBeforeGrabbed;
+ }
///
/// We need to set isKinematic=false in BeforeGrabbed, otherwise we get a warning at OnGrabbed event time afterward.
///
- public void OnBeforeGrabbed(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ private void OnBeforeGrabbed(VrGrabArgs args)
{
// Ignore grabbing once, if MarvinSelectionMode is active.
if (_marvinService.IsMarvinSelectionMode)
@@ -23,11 +44,11 @@ public void OnBeforeGrabbed(HVRGrabberBase grabber, HVRGrabbable grabbable)
// OnGrabbed is normally called multiple times. Even after an object is already socketed. If so, then let's stop Grab behaviour.
// If we sock an object on our hips or backpack etc.
- if (grabber is HVRSocket)
+ if (args.Kind == VrGrabberKind.Socket || args.Interactable == null)
return;
// In Gothic, Items have no physics when lying around. We need to activate physics for HVR to properly move items into our hands.
- if (grabbable.TryGetComponent(out var rb))
+ if (args.Interactable.TryGetComponent(out var rb))
{
rb.isKinematic = false;
}
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerWeaponInteraction.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerWeaponInteraction.cs
index 2ceb096ba..9b35186a2 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerWeaponInteraction.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRPlayerWeaponInteraction.cs
@@ -5,11 +5,10 @@
using Gothic.Core.Models.Marvin;
using Gothic.Core.Models.Vm;
using Gothic.Core.Services;
-using Gothic.VR.Interaction.Backends.Hvr;
+using Gothic.VR.Interaction.Models;
+using Gothic.VR.Interaction.Ports;
using Gothic.VR.Models.Vob;
using Gothic.VR.Services;
-using HurricaneVR.Framework.Core;
-using HurricaneVR.Framework.Core.Grabbers;
using Reflex.Attributes;
using UnityEngine;
using ZenKit.Vobs;
@@ -41,10 +40,38 @@ public class VRPlayerWeaponInteraction : MonoBehaviour, IMarvinPropertyCollector
[SerializeField] private float _velocityCheckDuration = 0.5f;
[SerializeField] private int _velocitySampleCount = 5;
+ private IVrRig _rig;
- public void OnGrabbed(HVRGrabberBase hand, HVRGrabbable item)
+
+ private void Awake()
+ {
+ _rig = GetComponent();
+ foreach (var grabber in _rig.HandGrabbers)
+ {
+ // Melee weapons are handled once they're in a hand, not while being pulled by distance.
+ if (grabber.Kind != VrGrabberKind.Hand)
+ continue;
+
+ grabber.Grabbed += OnGrabbed;
+ grabber.Released += OnReleased;
+ }
+ }
+
+ private void OnDestroy()
+ {
+ if (_rig == null)
+ return;
+
+ foreach (var grabber in _rig.HandGrabbers)
+ {
+ grabber.Grabbed -= OnGrabbed;
+ grabber.Released -= OnReleased;
+ }
+ }
+
+ private void OnGrabbed(VrGrabArgs args)
{
- var vobItem = item.GetComponentInParent();
+ var vobItem = args.Interactable != null ? args.Interactable.GetComponentInParent() : null;
var vobContainer = vobItem?.Container;
// We grab something not handled as VobItem.
@@ -57,13 +84,13 @@ public void OnGrabbed(HVRGrabberBase hand, HVRGrabbable item)
if (itemInstance!.MainFlag != (int)VmGothicEnums.ItemFlags.ItemKatNf)
return;
- _weaponService.OnGrabbed(((HVRHandGrabber)hand).HandSide.ToVr(), vobContainer, GetWeaponPhysicsConfig());
+ _weaponService.OnGrabbed(args.HandSide, vobContainer, GetWeaponPhysicsConfig());
SyncEquippedWeaponToHero(itemInstance, equip: true);
}
- public void OnReleased(HVRGrabberBase hand, HVRGrabbable item)
+ private void OnReleased(VrGrabArgs args)
{
- var vobItem = item.GetComponentInParent();
+ var vobItem = args.Interactable != null ? args.Interactable.GetComponentInParent() : null;
var vobContainer = vobItem?.Container;
// We grab something not handled as VobItem.
@@ -76,7 +103,7 @@ public void OnReleased(HVRGrabberBase hand, HVRGrabbable item)
if (itemInstance!.MainFlag != (int)VmGothicEnums.ItemFlags.ItemKatNf)
return;
- _weaponService.OnReleased(((HVRHandGrabber)hand).HandSide.ToVr(), GetWeaponPhysicsConfig());
+ _weaponService.OnReleased(args.HandSide, GetWeaponPhysicsConfig());
SyncEquippedWeaponToHero(itemInstance, equip: false);
}
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRSeat.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/VRSeat.cs
index 7d2da9bb7..0863fcd9c 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Player/VRSeat.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRSeat.cs
@@ -5,10 +5,10 @@
using Gothic.Core.Services.Context;
using Gothic.Core;
using Gothic.Core.Extensions;
-using HurricaneVR.Framework.Core;
-using HurricaneVR.Framework.Core.Grabbers;
-using HurricaneVR.Framework.Core.Player;
-using HurricaneVR.Framework.Core.Utils;
+using Gothic.VR.Interaction.Components;
+using Gothic.VR.Interaction.Models;
+using Gothic.VR.Interaction.Ports;
+using Gothic.VR.Services.Context;
using Reflex.Attributes;
using UnityEngine;
@@ -25,10 +25,10 @@ public class VRSeat : MonoBehaviour
// Fade components
[Header("Vignette Settings")]
- [SerializeField] private HVRCanvasFade _canvasFade;
[SerializeField] private float _fadeSpeed = 6f;
+ private IVrRig _rig;
private bool _isPlayerSeated;
//when NPC sits down this should be changed to true and when NPC stands up change it back to false
@@ -38,10 +38,23 @@ public class VRSeat : MonoBehaviour
private Transform _currentSnapPoint;
private bool _canPlayerSit = true;
+ private VrInteractable _interactable;
+
+ private void Awake()
+ {
+ _interactable = VrInteractable.Find(this);
+ _interactable.Grabbed += OnGrabbed;
+ }
+
+ private void OnDestroy()
+ {
+ if (_interactable != null)
+ _interactable.Grabbed -= OnGrabbed;
+ }
private void GetSnapPoints()
{
- var zsPosParent = transform.FindChildRecursive("ZS_POS0").parent;
+ var zsPosParent = gameObject.FindChildRecursively("ZS_POS0").transform.parent;
//find children that contain "ZS_POS" in object name and add to list of snap points
for (var i = 0; i < zsPosParent.childCount; i++)
{
@@ -54,7 +67,7 @@ private void GetSnapPoints()
}
}
- public void OnGrabbed(HVRGrabberBase grabber, HVRGrabbable grabbable)
+ private void OnGrabbed(VrGrabArgs args)
{
if (_snapPoints.IsEmpty())
{
@@ -71,7 +84,7 @@ public void OnGrabbed(HVRGrabberBase grabber, HVRGrabbable grabbable)
GameObject player = _contextInteractionService.GetCurrentPlayerController();
- _canvasFade = player.FindChildRecursively("GlobalCameraFade").GetComponent();
+ _rig = _contextInteractionService.GetImpl().Rig;
//handle sitting/standing
_isPlayerSeated = !_isPlayerSeated;
@@ -98,31 +111,31 @@ private IEnumerator SitDown(GameObject player)
_currentSnapPoint = GetNearestSnapPoint(player.transform.position);
// Fade in
- _canvasFade.Fade(1f, _fadeSpeed);
- yield return new WaitUntil(() => _canvasFade.CurrentFade >= 1f);
+ _rig.Fade(1f, _fadeSpeed);
+ yield return new WaitUntil(() => _rig.FadeAlpha >= 1f);
// Move player
player.transform.position = _currentSnapPoint.position + _currentSnapPoint.TransformDirection(_posOffset);
player.transform.eulerAngles = _currentSnapPoint.eulerAngles + _eulerOffset;
// Fade out
- _canvasFade.Fade(0f, _fadeSpeed);
- yield return new WaitUntil(() => _canvasFade.CurrentFade <= 0f);
+ _rig.Fade(0f, _fadeSpeed);
+ yield return new WaitUntil(() => _rig.FadeAlpha <= 0f);
}
private IEnumerator StandUp(GameObject player)
{
// Fade in
- _canvasFade.Fade(1f, _fadeSpeed);
- yield return new WaitUntil(() => _canvasFade.CurrentFade >= 1f);
+ _rig.Fade(1f, _fadeSpeed);
+ yield return new WaitUntil(() => _rig.FadeAlpha >= 1f);
// Move player
player.transform.position += player.transform.TransformDirection(new Vector3(0, 0.5f, 1f));
_contextInteractionService.UnlockPlayer();
// Fade out
- _canvasFade.Fade(0f, _fadeSpeed);
- yield return new WaitUntil(() => _canvasFade.CurrentFade <= 0f);
+ _rig.Fade(0f, _fadeSpeed);
+ yield return new WaitUntil(() => _rig.FadeAlpha <= 0f);
}
private Transform GetNearestSnapPoint(Vector3 pos)
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRSpectatorCamera.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/VRSpectatorCamera.cs
index e597a9fc1..ffbbb77bb 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Player/VRSpectatorCamera.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRSpectatorCamera.cs
@@ -5,7 +5,7 @@
using Gothic.Core.Models.Config;
using Gothic.Core.Services.Config;
using Gothic.Core.Services.Context;
-using Gothic.VR.Adapters.HVROverrides;
+using Gothic.VR.Services.Context;
using Reflex.Attributes;
using UnityEngine;
using Logger = Gothic.Core.Logging.Logger;
@@ -67,8 +67,7 @@ private void Start()
///
private void GothicStart()
{
- var playerController = _contextInteractionService.GetCurrentPlayerController().GetComponent();
- playerController.Teleporter.PositionUpdate.AddListener(SetTeleportPosition);
+ _contextInteractionService.GetImpl().Rig.Teleported += SetTeleportPosition;
SetSmoothness();
SetRenderDistance(_configService.Gothic.IniVisualRange);
diff --git a/Assets/Gothic-VR/Scripts/Adapters/Player/VRSwimDive.cs b/Assets/Gothic-VR/Scripts/Adapters/Player/VRSwimDive.cs
index ba33732ad..f5765b935 100644
--- a/Assets/Gothic-VR/Scripts/Adapters/Player/VRSwimDive.cs
+++ b/Assets/Gothic-VR/Scripts/Adapters/Player/VRSwimDive.cs
@@ -16,9 +16,9 @@
using Gothic.Core.Services.Context;
using Gothic.Core.Services.Meshes;
using Gothic.Core.Services.Player;
-using Gothic.VR.Adapters.HVROverrides;
using Gothic.Core.Services.Vm;
-using HurricaneVR.Framework.Core.Utils;
+using Gothic.VR.Interaction.Models;
+using Gothic.VR.Interaction.Ports;
using Reflex.Attributes;
using UnityEngine;
using ZenKit.Daedalus;
@@ -27,11 +27,10 @@
namespace Gothic.VR.Adapters.Player
{
- [RequireComponent(typeof(VRPlayerController), typeof(VRPlayerInputs))]
+ [RequireComponent(typeof(VRPlayer))]
public class VRSwimDive : MonoBehaviour, IMarvinPropertyCollector
{
- [SerializeField] private VRPlayerController _playerController;
- [SerializeField] private VRPlayerInputs _playerInputs;
+ private IVrRig _rig;
private INpc _playerVob;
private IAiHuman _playerAi;
@@ -89,6 +88,13 @@ public class VRSwimDive : MonoBehaviour, IMarvinPropertyCollector
[Inject] private readonly MeshService _meshService;
[Inject] private readonly PlayerService _playerService;
[Inject] private readonly ContextGameVersionService _contextGameVersionService;
+ [Inject] private readonly IVrInput _vrInput;
+ [Inject] private readonly IVrSfxPlayer _vrSfxPlayer;
+
+ private void Awake()
+ {
+ _rig = GetComponent();
+ }
private void Start()
{
@@ -157,10 +163,10 @@ SfxModel FindSwimSfx(string animName)
_playerAi = (IAiHuman)_playerVob.Ai;
});
- _initialGravity = _playerController.Gravity;
- _initialMoveSpeed = _playerController.MoveSpeed;
- _initialRunSpeed = _playerController.RunSpeed;
- _initialFallSpeed = _playerController.MaxFallSpeed;
+ _initialGravity = _rig.Gravity;
+ _initialMoveSpeed = _rig.MoveSpeed;
+ _initialRunSpeed = _rig.RunSpeed;
+ _initialFallSpeed = _rig.MaxFallSpeed;
}
private void Update()
@@ -220,9 +226,9 @@ private void OnValidate()
{
_debugStartDive = false;
- if (_mode == VmGothicEnums.WalkMode.Swim)
+ if (_mode == VmGothicEnums.WalkMode.Swim && _rig != null)
{
- _playerController.CharacterController.Move(Vector3.down * 5);
+ _rig.CharacterController.Move(Vector3.down * 5);
StartDive();
}
}
@@ -240,23 +246,23 @@ private void ChangeWaterBehavior()
switch ((ZenGineConst.WaterLevel)_playerAi.WaterLevel)
{
case ZenGineConst.WaterLevel.Normal:
- _playerController.Gravity = _initialGravity;
- _playerController.MoveSpeed = _initialMoveSpeed;
- _playerController.RunSpeed = _initialRunSpeed;
- _playerController.CanSprint = true;
- _playerController.MaxFallSpeed = _initialFallSpeed;
+ _rig.Gravity = _initialGravity;
+ _rig.MoveSpeed = _initialMoveSpeed;
+ _rig.RunSpeed = _initialRunSpeed;
+ _rig.CanSprint = true;
+ _rig.MaxFallSpeed = _initialFallSpeed;
- _playerController.SetWalkingControls();
+ _contextInteractionService.SetWalkingControls();
break;
case ZenGineConst.WaterLevel.Knee:
// Dive -> Swim (sometimes when pulling hard up, we are briefly knee deep and need to call the sound in here once)
if (_mode == VmGothicEnums.WalkMode.Dive)
{
_playerService.StopDiving();
- _playerController.ScreenFader.Fade(0, float.MaxValue); // Immediately fade the screen back to normal (no fade)
+ _rig.Fade(0, float.MaxValue); // Immediately fade the screen back to normal (no fade)
var clip = _audioService.CreateAudioClip(_sfxSwim2HangSound.GetRandomSound());
- SFXPlayer.Instance.PlaySFX(clip, Camera.main!.transform.position);
+ _vrSfxPlayer.Play(clip, Camera.main!.transform.position);
// FIXME - Bubbles are too big on screen. Needs more love.
// _diveBubbles.SetActive(false);
@@ -266,23 +272,23 @@ private void ChangeWaterBehavior()
_mode = VmGothicEnums.WalkMode.Walk;
Shader.SetGlobalInt(Constants.ShaderPropertyWaterEffectToggle, 0);
- _playerController.Gravity = _initialGravity;
- _playerController.MoveSpeed = _initialMoveSpeed / 2;
- _playerController.RunSpeed = _initialMoveSpeed / 2; // No running, but it might be, that we run into deep water, then we need to slow it down like walking.
- _playerController.CanSprint = false;
- _playerController.MaxFallSpeed = _initialFallSpeed;
+ _rig.Gravity = _initialGravity;
+ _rig.MoveSpeed = _initialMoveSpeed / 2;
+ _rig.RunSpeed = _initialMoveSpeed / 2; // No running, but it might be, that we run into deep water, then we need to slow it down like walking.
+ _rig.CanSprint = false;
+ _rig.MaxFallSpeed = _initialFallSpeed;
- _playerController.SetWaterWalkingControls();
+ _contextInteractionService.SetWaterWalkingControls();
break;
case ZenGineConst.WaterLevel.Chest:
// Dive -> Swim
if (_mode == VmGothicEnums.WalkMode.Dive)
{
_playerService.StopDiving();
- _playerController.ScreenFader.Fade(0, float.MaxValue); // Immediately fade the screen back to normal (no fade)
+ _rig.Fade(0, float.MaxValue); // Immediately fade the screen back to normal (no fade)
var clip = _audioService.CreateAudioClip(_sfxSwim2HangSound.GetRandomSound());
- SFXPlayer.Instance.PlaySFX(clip, Camera.main!.transform.position);
+ _vrSfxPlayer.Play(clip, Camera.main!.transform.position);
// FIXME - Bubbles are too big on screen. Needs more love.
// _diveBubbles.SetActive(false);
@@ -290,10 +296,10 @@ private void ChangeWaterBehavior()
Shader.SetGlobalInt(Constants.ShaderPropertyWaterEffectToggle, 0);
_mode = VmGothicEnums.WalkMode.Swim;
- _playerController.Gravity = 0f;
- _playerController.MaxFallSpeed = 0f;
+ _rig.Gravity = 0f;
+ _rig.MaxFallSpeed = 0f;
- _playerController.SetSwimmingControls();
+ _contextInteractionService.SetSwimmingControls();
if (_waterBobbingCoroutine == null)
_waterBobbingCoroutine = StartCoroutine(WaterBobbing());
@@ -310,7 +316,7 @@ private IEnumerator WaterBobbing()
{
time += Time.deltaTime;
var offset = Mathf.Sin(time * _waterBobFrequency) * _waterBobAmplitude;
- _playerController.CharacterController.Move(Vector3.down * offset);
+ _rig.CharacterController.Move(Vector3.down * offset);
yield return null;
}
}
@@ -324,15 +330,15 @@ private void StartDive()
// (After "forcing" diving by moving hands down.)
_currentVelocity = Vector3.zero;
- _playerController.Gravity = 0;
- _playerController.MaxFallSpeed = 0;
+ _rig.Gravity = 0;
+ _rig.MaxFallSpeed = 0;
- _playerController.SetDivingControls();
+ _contextInteractionService.SetDivingControls();
_playerService.StartDiving();
- _playerController.ScreenFader.Fade(0.8f, 1/_playerService.CurrentAir); // We fade to black based on our start level of air (in seconds)
+ _rig.Fade(0.8f, 1/_playerService.CurrentAir); // We fade to black based on our start level of air (in seconds)
- SFXPlayer.Instance.PlaySFX(_audioService.CreateAudioClip(_sfxSwim2DiveSound.GetRandomSound()), Camera.main!.transform.position);
+ _vrSfxPlayer.Play(_audioService.CreateAudioClip(_sfxSwim2DiveSound.GetRandomSound()), Camera.main!.transform.position);
// FIXME - Bubbles are too big on screen. Needs more love.
// _diveBubbles.SetActive(true);
@@ -349,7 +355,7 @@ private void StartDive()
///
/// Test 2. Translation with PlayerController (where Thumbstick rotation is applied)
/// var combinedVelocity = (leftHandVelocity + rightHandVelocity) * _swimHandMovementMultiplier;
- /// var rotatedVelocity = _playerController.transform.TransformDirection(combinedVelocity);
+ /// var rotatedVelocity = _rig.Root.TransformDirection(combinedVelocity);
/// _currentVelocity = Vector3.Lerp(_currentVelocity, -rotatedVelocity, Time.deltaTime);
///
/// [🛑] Moving physical head
@@ -370,7 +376,7 @@ private void StartDive()
/// [🛑] Rigidbody velocity is only tracked at FixedUpdate(). Which makes the movement wonky and I couldn't figure out how to apply multiplier right.
///
/// Test 5. Using CameraRig as TransformDirection
- /// var rotatedVelocity = _playerController.CameraRig.transform.TransformDirection(combinedVelocity);
+ /// var rotatedVelocity = _rig.TrackingSpace.TransformDirection(combinedVelocity);
/// Why? Something like: The two rotations are applied like this in HVR Player:
/// PlayerController - real and synthetic rotation
/// - CameraRig - inverse real rotation
@@ -381,30 +387,33 @@ private void StartDive()
///
private void HandleSwim()
{
- if (_playerInputs.IsLeftGrabActivated)
+ var leftGrip = _vrInput.GetButton(VrHandSide.Left, VrButton.Grip);
+ var rightGrip = _vrInput.GetButton(VrHandSide.Right, VrButton.Grip);
+
+ if (leftGrip.IsJustActivated)
_isSwimDiveForceLeftJustStarted = true;
- if (_playerInputs.IsRightGrabActivated)
+ if (rightGrip.IsJustActivated)
_isSwimDiveForceRightJustStarted = true;
// Use force to pull yourself (per hand). Only include hands whose Grip is currently held.
- if (_playerInputs.IsLeftGripHoldActive || _playerInputs.IsRightGripHoldActive)
+ if (leftGrip.IsActive || rightGrip.IsActive)
{
var desiredLocalVelocity = Vector3.zero;
- if (_playerInputs.IsLeftGripHoldActive)
+ if (leftGrip.IsActive)
{
- if (IsHandBelowWater(_playerController.LeftControllerTransform))
+ if (IsHandBelowWater(_rig.LeftHand))
{
- var leftHandVelocity = _playerInputs.LeftController.Velocity;
+ var leftHandVelocity = _vrInput.GetControllerVelocity(VrHandSide.Left);
desiredLocalVelocity += leftHandVelocity;
}
}
- if (_playerInputs.IsRightGripHoldActive)
+ if (rightGrip.IsActive)
{
- if (IsHandBelowWater(_playerController.RightControllerTransform))
+ if (IsHandBelowWater(_rig.RightHand))
{
- var rightHandVelocity = _playerInputs.RightController.Velocity;
+ var rightHandVelocity = _vrInput.GetControllerVelocity(VrHandSide.Right);
desiredLocalVelocity += rightHandVelocity;
}
}
@@ -412,7 +421,7 @@ private void HandleSwim()
desiredLocalVelocity *= _swimHandMovementMultiplier;
// Transform velocity to world space based on player rotation
- var rotatedVelocity = _playerController.CameraRig.transform.TransformDirection(desiredLocalVelocity);
+ var rotatedVelocity = _rig.TrackingSpace.TransformDirection(desiredLocalVelocity);
// Apply opposite force for swimming - Only horizontal!
_currentVelocity = Vector3.Lerp(_currentVelocity, -rotatedVelocity, Time.deltaTime);
@@ -429,19 +438,19 @@ private void HandleSwim()
if (_isSwimDiveForceLeftJustStarted && _currentVelocity.magnitude > 1f)
{
var clip = _audioService.CreateAudioClip(_sfxSwimSound.GetRandomSound())!;
- SFXPlayer.Instance.PlaySFXCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, cooldownTime: clip.length);
+ _vrSfxPlayer.PlayWithCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, clip.length);
_isSwimDiveForceLeftJustStarted = false;
}
if (_isSwimDiveForceRightJustStarted && _currentVelocity.magnitude > 1f)
{
var clip = _audioService.CreateAudioClip(_sfxSwimSound.GetRandomSound())!;
- SFXPlayer.Instance.PlaySFXCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, cooldownTime: clip.length);
+ _vrSfxPlayer.PlayWithCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, clip.length);
_isSwimDiveForceRightJustStarted = false;
}
// Move the character - Horizontal only
var rotatedHorizontalVelocity = new Vector3(_currentVelocity.x, 0, _currentVelocity.z);
- _playerController.CharacterController.Move(rotatedHorizontalVelocity * Time.deltaTime);
+ _rig.CharacterController.Move(rotatedHorizontalVelocity * Time.deltaTime);
// We seek -y aka "down"
if (_currentVelocity.y < _swimStartDiveVerticalVelocity)
@@ -455,38 +464,41 @@ private bool IsHandBelowWater(Transform handTransform)
RaycastHit hit;
// Is there water above your hand?
- return Physics.Raycast(handTransform.position, Vector3.up, out hit, _playerController.CameraHeight,
+ return Physics.Raycast(handTransform.position, Vector3.up, out hit, _rig.CameraHeight,
1 << Constants.WaterLayer);
}
private void HandleDive()
{
- if (_playerInputs.IsLeftGrabActivated)
+ var leftGrip = _vrInput.GetButton(VrHandSide.Left, VrButton.Grip);
+ var rightGrip = _vrInput.GetButton(VrHandSide.Right, VrButton.Grip);
+
+ if (leftGrip.IsJustActivated)
_isSwimDiveForceLeftJustStarted = true;
- if (_playerInputs.IsRightGrabActivated)
+ if (rightGrip.IsJustActivated)
_isSwimDiveForceRightJustStarted = true;
// Use force to pull yourself (per hand). Only include hands whose Grip is currently held.
- if (_playerInputs.IsLeftGripHoldActive || _playerInputs.IsRightGripHoldActive)
+ if (leftGrip.IsActive || rightGrip.IsActive)
{
var desiredLocalVelocity = Vector3.zero;
- if (_playerInputs.IsLeftGripHoldActive)
+ if (leftGrip.IsActive)
{
- var leftHandVelocity = _playerInputs.LeftController.Velocity;
+ var leftHandVelocity = _vrInput.GetControllerVelocity(VrHandSide.Left);
desiredLocalVelocity += leftHandVelocity;
}
- if (_playerInputs.IsRightGripHoldActive)
+ if (rightGrip.IsActive)
{
- var rightHandVelocity = _playerInputs.RightController.Velocity;
+ var rightHandVelocity = _vrInput.GetControllerVelocity(VrHandSide.Right);
desiredLocalVelocity += rightHandVelocity;
}
desiredLocalVelocity *= _diveHandMovementMultiplier;
// Transform velocity to world space based on player rotation
- var rotatedVelocity = _playerController.CameraRig.transform.TransformDirection(desiredLocalVelocity);
+ var rotatedVelocity = _rig.TrackingSpace.TransformDirection(desiredLocalVelocity);
// Apply opposite force for diving (full 3D movement)
_currentVelocity = Vector3.Lerp(_currentVelocity, -rotatedVelocity, Time.deltaTime);
@@ -503,18 +515,18 @@ private void HandleDive()
if (_isSwimDiveForceLeftJustStarted && _currentVelocity.magnitude > 1f)
{
var clip = _audioService.CreateAudioClip(_sfxDiveSound.GetRandomSound())!;
- SFXPlayer.Instance.PlaySFXCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, cooldownTime: clip.length);
+ _vrSfxPlayer.PlayWithCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, clip.length);
_isSwimDiveForceLeftJustStarted = false;
}
if (_isSwimDiveForceRightJustStarted && _currentVelocity.magnitude > 1f)
{
var clip = _audioService.CreateAudioClip(_sfxDiveSound.GetRandomSound())!;
- SFXPlayer.Instance.PlaySFXCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, cooldownTime: clip.length);
+ _vrSfxPlayer.PlayWithCooldown(clip, Camera.main!.transform.position, _swimDiveSfxUuid, clip.length);
_isSwimDiveForceRightJustStarted = false;
}
// Move the character
- _playerController.CharacterController.Move(_currentVelocity * Time.deltaTime);
+ _rig.CharacterController.Move(_currentVelocity * Time.deltaTime);
}
public IEnumerable