From dfea57877eaa747579bd48b47d44fa98be3e4abc Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Thu, 18 Aug 2022 12:35:18 +0200 Subject: [PATCH] Fixed missing scripts --- .../Scripts/Networking/HumanoidPlayerVoice.cs | 7 + .../Networking/HumanoidPlayerVoice.cs.meta | 11 + .../Sites/Prefabs/Possession Receiver.prefab | 425 +--------- .../Sites/Prefabs/Sword.prefab | 797 ------------------ .../Sites/Prefabs/Sword.prefab.meta | 7 - .../Sites/Prefabs/Trophy.prefab | 69 +- 6 files changed, 89 insertions(+), 1227 deletions(-) create mode 100644 Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs create mode 100644 Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs.meta delete mode 100644 Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab delete mode 100644 Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab.meta diff --git a/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs b/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs new file mode 100644 index 0000000..be026b2 --- /dev/null +++ b/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs @@ -0,0 +1,7 @@ +using UnityEngine; + +namespace Passer.Humanoid { + + public partial class HumanoidPlayerPunVoice : MonoBehaviour { + } +} \ No newline at end of file diff --git a/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs.meta b/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs.meta new file mode 100644 index 0000000..d93c6a0 --- /dev/null +++ b/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerVoice.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c48e8d9c90f89154daf3a86de9a5f2ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples~/VisitorsAndSites/Sites/Prefabs/Possession Receiver.prefab b/Samples~/VisitorsAndSites/Sites/Prefabs/Possession Receiver.prefab index 1b43681..92ac76a 100644 --- a/Samples~/VisitorsAndSites/Sites/Prefabs/Possession Receiver.prefab +++ b/Samples~/VisitorsAndSites/Sites/Prefabs/Possession Receiver.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4277796414752682} - - component: {fileID: 114621159559771258} - component: {fileID: 65270251136982880} - component: {fileID: 114764087030327654} - component: {fileID: 114031946833962336} @@ -34,85 +33,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114621159559771258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728898943659484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 420729d57aa3e734982a265b400401d5, type: 3} - m_Name: - m_EditorClassIdentifier: - attachedPrefab: {fileID: 0} - attachedTransform: {fileID: 0} - attachedHandle: {fileID: 0} - socketTag: Untagged - attachMethod: 0 - destroyOnLoad: 1 - attachEvent: - id: 0 - label: Hold Event - tooltip: 'Call functions using what the socket is holding - - Parameter: the - GameObject held by the socket' - eventTypeLabels: - - Never - - On Attach - - On Release - - While Attached - - While Released - - When Changed - - Always - fromEventLabel: - events: - - eventType: 1 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 0} - methodName: Passer.PawnPossessions/TryAddGameObject - parameters: - - fromEvent: 1 - localProperty: From Event - type: 5 - floatConstant: 0 - intConstant: 0 - boolConstant: 0 - stringConstant: - vector3Constant: {x: 0, y: 0, z: 0} - gameObjectConstant: {fileID: 0} - rigidbodyConstant: {fileID: 0} - boolInverse: 0 - overrideMode: 0 - - eventType: 1 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 1728898943659484} - methodName: Passer.Destroyer/Destroy - parameters: - - fromEvent: 1 - localProperty: From Event - type: 5 - floatConstant: 0 - intConstant: 0 - boolConstant: 0 - stringConstant: - vector3Constant: {x: 0, y: 0, z: 0} - gameObjectConstant: {fileID: 0} - rigidbodyConstant: {fileID: 0} - boolInverse: 0 - overrideMode: 0 - - eventType: 0 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 0} - methodName: - parameters: [] - boolInverse: 0 - overrideMode: 0 --- !u!65 &65270251136982880 BoxCollider: m_ObjectHideFlags: 0 @@ -135,344 +55,26 @@ MonoBehaviour: m_GameObject: {fileID: 1728898943659484} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1fdf6bb225e95246b0a0a46135637fd, type: 3} + m_Script: {fileID: 11500000, guid: 87ca2b1b6a00bde4db71d02605338043, type: 3} m_Name: m_EditorClassIdentifier: - triggerHandlers: + collisionHandlers: id: 0 - label: Trigger Event - tooltip: 'Call functions using the trigger collider state + label: Collision Event + tooltip: 'Call functions using the collider state - Parameter: the - GameObject entering the trigger' + Parameter: the GameObject + colliding with the collider' eventTypeLabels: - Never - - On Trigger Enter - - On Trigger Exit - - On Trigger Stay - - On Trigger Empty - - On Trigger Change + - On Collision Start + - On Collision End + - While Colliding + - While not Colliding + - On Collision Change - Always fromEventLabel: - events: - - eventType: 1 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 1728898943659484} - methodName: Passer.Socket/Attach - parameters: - - fromEvent: 1 - localProperty: From Event - type: 5 - floatConstant: 0 - intConstant: 0 - boolConstant: 0 - stringConstant: - vector3Constant: {x: 0, y: 0, z: 0} - gameObjectConstant: {fileID: 0} - rigidbodyConstant: {fileID: 0} - boolInverse: 0 - overrideMode: 0 - - eventType: 0 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 0} - methodName: Passer.Socket/Attach - parameters: - - fromEvent: 1 - localProperty: From Event - type: 5 - floatConstant: 0 - intConstant: 0 - boolConstant: 0 - stringConstant: - vector3Constant: {x: 0, y: 0, z: 0} - gameObjectConstant: {fileID: 0} - rigidbodyConstant: {fileID: 0} - boolInverse: 0 - overrideMode: 0 - leftInputEvents: - - id: 0 - label: Left Vertical - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: events: [] - defaultParameterProperty: - - id: 1 - label: Left Horizontal - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 2 - label: Left Stick Button - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 3 - label: Left Button 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 4 - label: Left Button 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 5 - label: Left Button 3 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 6 - label: Left Button 4 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 7 - label: Left Trigger 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 8 - label: Left Trigger 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 9 - label: Left Option - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - rightInputEvents: - - id: 0 - label: Right Vertical - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 1 - label: Right Horizontal - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 2 - label: Right Stick Button - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 3 - label: Right Button 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 4 - label: Right Button 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 5 - label: Right Button 3 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 6 - label: Right Button 4 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 7 - label: Right Trigger 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 8 - label: Right Trigger 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 9 - label: Right Option - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: --- !u!114 &114031946833962336 MonoBehaviour: m_ObjectHideFlags: 0 @@ -482,6 +84,9 @@ MonoBehaviour: m_GameObject: {fileID: 1728898943659484} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9827df2d9b2c2d749b3ef4a9a7f6ddc7, type: 3} + m_Script: {fileID: 11500000, guid: 0395546b2eee9064d87a73f5e764624e, type: 3} m_Name: m_EditorClassIdentifier: + possessions: [] + defaultPossessions: [] + clearOnAwake: 0 diff --git a/Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab b/Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab deleted file mode 100644 index ef56bd3..0000000 --- a/Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab +++ /dev/null @@ -1,797 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1012140536541306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4034238211626266} - - component: {fileID: 33030236148900874} - - component: {fileID: 23573196266115648} - m_Layer: 0 - m_Name: mesh0%root%3% - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4034238211626266 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012140536541306} - m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4776878667147238} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33030236148900874 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012140536541306} - m_Mesh: {fileID: 4300006, guid: 0ab70a1707de0e44587a89aef8b3cfa5, type: 3} ---- !u!23 &23573196266115648 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012140536541306} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!1 &1454009853569688 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4485372751874832} - - component: {fileID: 33311715605823068} - - component: {fileID: 23288090676835784} - m_Layer: 0 - m_Name: mesh0%root%1% - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4485372751874832 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454009853569688} - m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4776878667147238} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33311715605823068 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454009853569688} - m_Mesh: {fileID: 4300002, guid: 0ab70a1707de0e44587a89aef8b3cfa5, type: 3} ---- !u!23 &23288090676835784 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454009853569688} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!1 &1558094847459998 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4372148119112408} - - component: {fileID: 33094879087091000} - - component: {fileID: 23782030088720226} - m_Layer: 0 - m_Name: mesh0%root%2% - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4372148119112408 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558094847459998} - m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4776878667147238} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33094879087091000 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558094847459998} - m_Mesh: {fileID: 4300004, guid: 0ab70a1707de0e44587a89aef8b3cfa5, type: 3} ---- !u!23 &23782030088720226 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558094847459998} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!1 &1589324037421008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4171889397997054} - - component: {fileID: 33663753153004224} - - component: {fileID: 23678308902062954} - m_Layer: 0 - m_Name: mesh0%root%0% - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4171889397997054 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589324037421008} - m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4776878667147238} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33663753153004224 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589324037421008} - m_Mesh: {fileID: 4300000, guid: 0ab70a1707de0e44587a89aef8b3cfa5, type: 3} ---- !u!23 &23678308902062954 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589324037421008} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!1 &1637081267702634 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4776878667147238} - - component: {fileID: 54046747442775926} - - component: {fileID: 114559312008520994} - - component: {fileID: 114488145700360734} - - component: {fileID: 82276618620638922} - - component: {fileID: 65433957520519454} - - component: {fileID: 65239915906408070} - - component: {fileID: 136455234883199966} - - component: {fileID: 114237298761810666} - - component: {fileID: 114288600509852506} - - component: {fileID: 114275210487121840} - m_Layer: 0 - m_Name: Sword - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4776878667147238 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4171889397997054} - - {fileID: 4485372751874832} - - {fileID: 4372148119112408} - - {fileID: 4034238211626266} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &54046747442775926 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &114559312008520994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c31644b9ad00b724cb79f4ecef450365, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &114488145700360734 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e27c61780f506f84282a32ce63522c75, type: 3} - m_Name: - m_EditorClassIdentifier: - grabType: 0 - sticky: 0 - range: 0.2 - inputEvents: - - id: 0 - label: Vertical - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Horizontal - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Stick Button - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Button 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Button 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Button 3 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Button 4 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Trigger 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Trigger 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 0 - label: Option - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - socket: {fileID: 0} - hand: 0 - pose: {fileID: 11400000, guid: 682a43336a5f811459a9de4bd74db3d7, type: 2} - handTarget: {fileID: 0} - isHeld: 0 - grabbedEvent: - id: 0 - label: - tooltip: 'Call functions using the grabbing status - - Parameter: the grabbed - object' - eventTypeLabels: - - Nothing - - On Grab Start - - On Let Go - - While Holding - - While Not Holding - - On Grab Change - - Always - fromEventLabel: socket.gameObject - events: [] ---- !u!82 &82276618620638922 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: f7fca1489bedebe43b8ed0f7fc76adee, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 0 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 0 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 0 ---- !u!65 &65433957520519454 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.02, y: 0.54, z: 0.05} - m_Center: {x: 0, y: 0.39, z: 0} ---- !u!65 &65239915906408070 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.04, y: 0.04, z: 0.1799081} - m_Center: {x: 0, y: 0.1, z: 0} ---- !u!136 &136455234883199966 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.02 - m_Height: 0.15 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &114237298761810666 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 466bfefa01b6b0b4581534749b39666a, type: 3} - m_Name: - m_EditorClassIdentifier: - collisionHandlers: - id: 0 - label: Collision Event - tooltip: 'Call functions using the collider state - - Parameter: the GameObject - colliding with the collider' - eventTypeLabels: - - Never - - On Collision Start - - On Collision End - - While Colliding - - While not Colliding - - On Collision Change - - Always - fromEventLabel: - events: - - eventType: 1 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 1637081267702634} - methodName: UnityEngine.AudioSource/Play - parameters: - - fromEvent: 1 - localProperty: - type: 0 - floatConstant: 0 - intConstant: 0 - boolConstant: 0 - stringConstant: - vector3Constant: {x: 0, y: 0, z: 0} - gameObjectConstant: {fileID: 0} - rigidbodyConstant: {fileID: 0} - boolInverse: 0 - overrideMode: 0 - - eventType: 0 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 0} - methodName: UnityEngine.AudioSource/Play - parameters: - - fromEvent: 1 - localProperty: - type: 0 - floatConstant: 0 - intConstant: 0 - boolConstant: 0 - stringConstant: - vector3Constant: {x: 0, y: 0, z: 0} - gameObjectConstant: {fileID: 0} - rigidbodyConstant: {fileID: 0} - boolInverse: 0 - overrideMode: 0 ---- !u!114 &114288600509852506 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e12136205c1bf104094db5c81cff52aa, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &114275210487121840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637081267702634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bdb8618378c173d4d83d9b78bf66dd78, type: 3} - m_Name: - m_EditorClassIdentifier: - possessionType: 0 - crossSite: 1 - isUnique: 0 - assetPath: Assets/Passer/Demo/Pawn/Prefabs/Sword.prefab diff --git a/Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab.meta b/Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab.meta deleted file mode 100644 index a29237a..0000000 --- a/Samples~/VisitorsAndSites/Sites/Prefabs/Sword.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0ff67b809a8853344b9a95d81be65fc4 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Samples~/VisitorsAndSites/Sites/Prefabs/Trophy.prefab b/Samples~/VisitorsAndSites/Sites/Prefabs/Trophy.prefab index f76e06e..da13445 100644 --- a/Samples~/VisitorsAndSites/Sites/Prefabs/Trophy.prefab +++ b/Samples~/VisitorsAndSites/Sites/Prefabs/Trophy.prefab @@ -134,13 +134,13 @@ MonoBehaviour: m_GameObject: {fileID: 1176813054575496} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e27c61780f506f84282a32ce63522c75, type: 3} + m_Script: {fileID: 11500000, guid: 2489f5accb5a91347a7a00e906fea4bb, type: 3} m_Name: m_EditorClassIdentifier: grabType: 0 sticky: 0 - range: 0.21 - inputEvents: + range: 0.2 + controllerInputEvents: - id: 0 label: Vertical tooltip: @@ -184,7 +184,7 @@ MonoBehaviour: events: [] defaultParameterProperty: - id: 3 - label: Button 1 + label: Vertical tooltip: eventTypeLabels: - Never @@ -198,7 +198,7 @@ MonoBehaviour: events: [] defaultParameterProperty: - id: 4 - label: Button 2 + label: Horizontal tooltip: eventTypeLabels: - Never @@ -212,7 +212,7 @@ MonoBehaviour: events: [] defaultParameterProperty: - id: 5 - label: Button 3 + label: Stick Button tooltip: eventTypeLabels: - Never @@ -226,7 +226,7 @@ MonoBehaviour: events: [] defaultParameterProperty: - id: 6 - label: Button 4 + label: Button 1 tooltip: eventTypeLabels: - Never @@ -240,7 +240,7 @@ MonoBehaviour: events: [] defaultParameterProperty: - id: 7 - label: Trigger 1 + label: Button 2 tooltip: eventTypeLabels: - Never @@ -254,7 +254,7 @@ MonoBehaviour: events: [] defaultParameterProperty: - id: 8 - label: Trigger 2 + label: Button 3 tooltip: eventTypeLabels: - Never @@ -268,6 +268,48 @@ MonoBehaviour: events: [] defaultParameterProperty: - id: 9 + label: Button 4 + tooltip: + eventTypeLabels: + - Never + - On Press + - On Release + - While Down + - While Up + - On Change + - Continuous + fromEventLabel: + events: [] + defaultParameterProperty: + - id: 10 + label: Trigger 1 + tooltip: + eventTypeLabels: + - Never + - On Press + - On Release + - While Down + - While Up + - On Change + - Continuous + fromEventLabel: + events: [] + defaultParameterProperty: + - id: 11 + label: Trigger 2 + tooltip: + eventTypeLabels: + - Never + - On Press + - On Release + - While Down + - While Up + - On Change + - Continuous + fromEventLabel: + events: [] + defaultParameterProperty: + - id: 12 label: Option tooltip: eventTypeLabels: @@ -283,7 +325,7 @@ MonoBehaviour: defaultParameterProperty: socket: {fileID: 0} hand: 0 - pose: {fileID: 11400000, guid: 682a43336a5f811459a9de4bd74db3d7, type: 2} + pose: {fileID: 0} handTarget: {fileID: 0} isHeld: 0 grabbedEvent: @@ -456,10 +498,11 @@ MonoBehaviour: m_GameObject: {fileID: 1831363734356520} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bdb8618378c173d4d83d9b78bf66dd78, type: 3} + m_Script: {fileID: 11500000, guid: 88256850d79dc574bbff4d169a7e62d8, type: 3} m_Name: m_EditorClassIdentifier: possessionType: 0 crossSite: 1 - isUnique: 1 - assetPath: Assets/Passer/Sites/Prefabs/Trophy.prefab + isUnique: 0 + _siteLocation: + assetPath: