From 98526fd582ff593961b8c293c9f6ece0efd8dde3 Mon Sep 17 00:00:00 2001 From: mxssw Date: Mon, 15 Dec 2025 21:16:03 +0200 Subject: [PATCH] improved door grabbing. Sometimes leaves ghost hands. --- .../Prefabs/SmartHandPresence Left.prefab | 22 + .../Prefabs/SmartHandPresence Right.prefab | 22 + .../NewHandPresence/Prefabs/XR Origin.prefab | 2 +- .../NewHandPresence/SmartHandPresence.cs | 36 +- Assets/_PROJECT/Models/DoorHandReplacer.cs | 108 +++++ .../_PROJECT/Models/DoorHandReplacer.cs.meta | 11 + Assets/_PROJECT/Models/DoorSlab.fbx | 3 + Assets/_PROJECT/Models/DoorSlab.fbx.meta | 108 +++++ .../Prefabs/Doors/Indoor Door Right.prefab | 375 +++++++++++------- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- Packages/manifest.json | 1 - Packages/packages-lock.json | 6 - 12 files changed, 546 insertions(+), 152 deletions(-) create mode 100644 Assets/_PROJECT/Models/DoorHandReplacer.cs create mode 100644 Assets/_PROJECT/Models/DoorHandReplacer.cs.meta create mode 100644 Assets/_PROJECT/Models/DoorSlab.fbx create mode 100644 Assets/_PROJECT/Models/DoorSlab.fbx.meta diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Left.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Left.prefab index f40c84ed..0f51c3d5 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Left.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Left.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 4094291069417963952} - component: {fileID: 4094291069417963953} + - component: {fileID: 3968873566812316387} m_Layer: 0 m_Name: SmartHandPresence Left m_TagString: NetworkHide @@ -51,3 +52,24 @@ MonoBehaviour: - {fileID: 11400000, guid: 6a509cd8fcf2901489e42ba44b5ac991, type: 2} - {fileID: 11400000, guid: 122b65a97d948e94da7a963fe110b068, type: 2} - {fileID: 11400000, guid: 5cd37cccbf3023d43818e487f29248c8, type: 2} +--- !u!135 &3968873566812316387 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4094291069417963955} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.08 + m_Center: {x: -0.01, y: -0.03, z: -0.12} diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Right.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Right.prefab index b3a65615..16ada63d 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Right.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/SmartHandPresence Right.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 3440047626596586913} - component: {fileID: 3440047626596586917} + - component: {fileID: 7103916417101120392} m_Layer: 0 m_Name: SmartHandPresence Right m_TagString: NetworkHide @@ -51,3 +52,24 @@ MonoBehaviour: - {fileID: 11400000, guid: 2440c680cf2f3c947af431fb58aa75bb, type: 2} - {fileID: 11400000, guid: 772380a82cd83174cbd672430aca6941, type: 2} - {fileID: 11400000, guid: 41bbb243b8f86c24489e2262946c7e45, type: 2} +--- !u!135 &7103916417101120392 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3440047626596586914} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.08 + m_Center: {x: -0.01, y: -0.03, z: -0.12} diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab index 7179b538..28139b5a 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab @@ -3411,7 +3411,7 @@ GameObject: - component: {fileID: 4833661431984909633} - component: {fileID: 6982718084823378580} - component: {fileID: 7143839380141204878} - m_Layer: 0 + m_Layer: 12 m_Name: XR Origin m_TagString: Player m_Icon: {fileID: 0} diff --git a/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs b/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs index 1df7a4e9..4b824825 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs @@ -10,6 +10,8 @@ namespace _PROJECT.NewHandPresence public bool showController; public bool showHand; + private bool inDoorGrabRadius = false; + public InputDeviceCharacteristics controllerCharacteristics; public List controllerInformation; @@ -113,5 +115,37 @@ namespace _PROJECT.NewHandPresence updateAnimation(); } } - } + + private void OnDisable() + { + if (!inDoorGrabRadius) return; + if (_spawnedHandModel != null) + _spawnedHandModel.SetActive(false); + + if (_spawnedController != null) + _spawnedController.SetActive(false); + } + + private void OnEnable() + { + // Let Update handle visibility naturally + // or force refresh: + if (_spawnedHandModel != null) + _spawnedHandModel.SetActive(showHand); + + if (_spawnedController != null) + _spawnedController.SetActive(showController); + } + + private void OnTriggerEnter(Collider other) + { + if (other.GetComponent() == null) return; + inDoorGrabRadius = true; + } + private void OnTriggerExit(Collider other) + { + if (other.GetComponent() == null) return; + inDoorGrabRadius = false; + } + } } \ No newline at end of file diff --git a/Assets/_PROJECT/Models/DoorHandReplacer.cs b/Assets/_PROJECT/Models/DoorHandReplacer.cs new file mode 100644 index 00000000..7e4aa288 --- /dev/null +++ b/Assets/_PROJECT/Models/DoorHandReplacer.cs @@ -0,0 +1,108 @@ +using _PROJECT.NewHandPresence; +using System.Collections.Generic; +using UnityEngine; + +public enum GrabbingHand +{ + Right, + Left +} + +public class DoorHandReplacer : MonoBehaviour +{ + public GameObject LeftHand; + public GameObject RightHand; + + private GrabbingHand? hand = null; // nullable + private SmartHandPresence currentHand = null; + private bool isGrabbing; + + // Tracks all hands currently inside the trigger + private HashSet handsInTrigger = new HashSet(); + + public void ManifestDoorHand() + { + if (currentHand == null || hand == null) return; + isGrabbing = true; + switch (hand.Value) + { + case GrabbingHand.Left: + RightHand.SetActive(false); + LeftHand.SetActive(true); + Debug.Log("Dissapearing hand"); + break; + + case GrabbingHand.Right: + LeftHand.SetActive(false); + RightHand.SetActive(true); + Debug.Log("Dissapearing hand"); + break; + } + } + + public void DeManifestDoorHand() + { + isGrabbing = false; + LeftHand.SetActive(false); + RightHand.SetActive(false); + if (currentHand == null) return; + } + + private void OnTriggerEnter(Collider other) + { + if (isGrabbing) return; + + // IMPORTANT: in case hands have multiple colliders + SmartHandPresence playerHand = other.GetComponentInParent(); + if (playerHand == null) return; + + handsInTrigger.Add(playerHand); + + currentHand = playerHand; + + string name = playerHand.gameObject.name; + + if (name.Contains("left", System.StringComparison.OrdinalIgnoreCase)) + { + hand = GrabbingHand.Left; + } + else if (name.Contains("right", System.StringComparison.OrdinalIgnoreCase)) + { + hand = GrabbingHand.Right; + } + } + + private void OnTriggerExit(Collider other) + { + if (isGrabbing) return; + + SmartHandPresence playerHand = other.GetComponentInParent(); + if (playerHand == null) return; + + handsInTrigger.Remove(playerHand); + + // If no hands remain, clear everything + if (handsInTrigger.Count == 0) + { + currentHand = null; + hand = null; + } + else + { + // Pick any remaining hand as current + foreach (var remainingHand in handsInTrigger) + { + currentHand = remainingHand; + + string name = remainingHand.gameObject.name; + hand = name.Contains("left", System.StringComparison.OrdinalIgnoreCase) + ? GrabbingHand.Left + : GrabbingHand.Right; + + break; + } + } + } + +} + diff --git a/Assets/_PROJECT/Models/DoorHandReplacer.cs.meta b/Assets/_PROJECT/Models/DoorHandReplacer.cs.meta new file mode 100644 index 00000000..a48ca142 --- /dev/null +++ b/Assets/_PROJECT/Models/DoorHandReplacer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ac36ec1128f62944a96ea2127166b5cf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/DoorSlab.fbx b/Assets/_PROJECT/Models/DoorSlab.fbx new file mode 100644 index 00000000..8d5f687f --- /dev/null +++ b/Assets/_PROJECT/Models/DoorSlab.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b2e08e2ece7319ff4e6a0d6fa62b6eb08e7a2905abbdc7f70effc8f4e45aa18 +size 11852 diff --git a/Assets/_PROJECT/Models/DoorSlab.fbx.meta b/Assets/_PROJECT/Models/DoorSlab.fbx.meta new file mode 100644 index 00000000..19dffcea --- /dev/null +++ b/Assets/_PROJECT/Models/DoorSlab.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 52fd38741dd12914a862eb9b5917a6e0 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab b/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab index e0e80792..9725bc57 100644 --- a/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab +++ b/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab @@ -1282,6 +1282,7 @@ Transform: m_Children: - {fileID: 6585262094497446843} - {fileID: 1141650349950631806} + - {fileID: 7961391948850877860} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1561,7 +1562,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7656089963409239787 Transform: m_ObjectHideFlags: 0 @@ -1569,9 +1570,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3103255069014892412} - m_LocalRotation: {x: -0.49986684, y: -0.32747808, z: 0.48819995, w: 0.6360441} - m_LocalPosition: {x: -0.26200032, y: -0.11600876, z: 0.14849266} - m_LocalScale: {x: 2.1763556, y: 1.319628, z: 2.5111616} + m_LocalRotation: {x: -0.49986684, y: -0.32747817, z: 0.4882, w: 0.63604397} + m_LocalPosition: {x: -0.26200277, y: -0.11601877, z: 0.14848861} + m_LocalScale: {x: 2.1763544, y: 1.3196279, z: 2.511162} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1176404124931907078} @@ -1785,7 +1786,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7019002931954688932 Transform: m_ObjectHideFlags: 0 @@ -1793,9 +1794,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3653856938231415728} - m_LocalRotation: {x: 0.00000007834743, y: 0.000000026910033, z: 0.70710677, w: -0.70710695} - m_LocalPosition: {x: -0.04500407, y: -0.2375145, z: 0.15239155} - m_LocalScale: {x: 2.5888042, y: 2.5766208, z: 1.3532312} + m_LocalRotation: {x: -0.00000003774431, y: 0.000000022404436, z: 0.70710677, w: -0.70710695} + m_LocalPosition: {x: -0.04500549, y: -0.23751946, z: 0.15238497} + m_LocalScale: {x: 2.5888042, y: 2.5766208, z: 1.3532305} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9115089225662392797} @@ -1987,13 +1988,14 @@ GameObject: m_Component: - component: {fileID: 2228776233369751345} - component: {fileID: 877541596531606559} + - component: {fileID: 3191106616717673862} m_Layer: 0 m_Name: Hand replacements outer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2228776233369751345 Transform: m_ObjectHideFlags: 0 @@ -2001,14 +2003,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3825006123690713697} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.5104, y: 2.2941, z: -0.166} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.00000017881388, y: -0.00000006283548, z: -0.00000025445325, + w: 1} + m_LocalPosition: {x: 0.0055232896, y: -0.0071187913, z: -0.12927005} + m_LocalScale: {x: 0.032342084, y: 0.15451151, z: 0.73897237} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7019002931954688932} - {fileID: 7656089963409239787} - m_Father: {fileID: 6548037134010678093} + m_Father: {fileID: 5291731708927053895} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &877541596531606559 @@ -2026,12 +2029,26 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.8, y: 0.8, z: 0.4} - m_Center: {x: 0, y: 0, z: -0.06} + m_Size: {x: 0.6, y: 0.6, z: 0.3} + m_Center: {x: 0, y: 0, z: -0.02} +--- !u!114 &3191106616717673862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3825006123690713697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac36ec1128f62944a96ea2127166b5cf, type: 3} + m_Name: + m_EditorClassIdentifier: + LeftHand: {fileID: 3653856938231415728} + RightHand: {fileID: 3103255069014892412} --- !u!1 &3833539609118016623 GameObject: m_ObjectHideFlags: 0 @@ -3118,13 +3135,14 @@ GameObject: m_Component: - component: {fileID: 5932402600523855724} - component: {fileID: 8759920318007360382} + - component: {fileID: 2221957187104149257} m_Layer: 0 m_Name: Hand replacements inner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5932402600523855724 Transform: m_ObjectHideFlags: 0 @@ -3132,14 +3150,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6650029314675893934} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.557, y: 2.306, z: 0.1393} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.00000017881388, y: -0.00000006283548, z: -0.00000025445325, + w: 1} + m_LocalPosition: {x: 0.0040161684, y: -0.0052811983, z: 0.09633875} + m_LocalScale: {x: 0.032342084, y: 0.15451151, z: 0.73897237} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8132581534601811375} - {fileID: 2308502953967288723} - m_Father: {fileID: 6548037134010678093} + m_Father: {fileID: 5291731708927053895} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &8759920318007360382 @@ -3157,12 +3176,26 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.8, y: 0.8, z: 0.4} - m_Center: {x: 0, y: 0, z: 0.12} + m_Size: {x: 0.6, y: 0.6, z: 0.3} + m_Center: {x: 0, y: 0, z: 0.055} +--- !u!114 &2221957187104149257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6650029314675893934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac36ec1128f62944a96ea2127166b5cf, type: 3} + m_Name: + m_EditorClassIdentifier: + LeftHand: {fileID: 8103609142261368991} + RightHand: {fileID: 8840218683010281881} --- !u!1 &6679012744063801158 GameObject: m_ObjectHideFlags: 0 @@ -3601,7 +3634,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9007664768440961826} - - {fileID: 6548037134010678093} m_Father: {fileID: 2389456291377549788} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3685,8 +3717,8 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7524997068079331246} serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 + m_Mass: 2 + m_Drag: 2 m_AngularDrag: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} @@ -3699,7 +3731,7 @@ Rigidbody: m_Bits: 0 m_ImplicitCom: 1 m_ImplicitTensor: 1 - m_UseGravity: 1 + m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 @@ -3760,10 +3792,58 @@ MonoBehaviour: m_Calls: [] m_Activated: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 3191106616717673862} + m_TargetAssemblyTypeName: DoorHandReplacer, Assembly-CSharp + m_MethodName: ManifestDoorHand + 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_Target: {fileID: 2221957187104149257} + m_TargetAssemblyTypeName: DoorHandReplacer, Assembly-CSharp + m_MethodName: ManifestDoorHand + 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_Deactivated: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 3191106616717673862} + m_TargetAssemblyTypeName: DoorHandReplacer, Assembly-CSharp + m_MethodName: DeManifestDoorHand + 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_Target: {fileID: 2221957187104149257} + m_TargetAssemblyTypeName: DoorHandReplacer, Assembly-CSharp + m_MethodName: DeManifestDoorHand + 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_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] @@ -3794,7 +3874,7 @@ MonoBehaviour: m_OnDeactivate: m_PersistentCalls: m_Calls: [] - m_AttachTransform: {fileID: 3597511004041366441} + m_AttachTransform: {fileID: 9007664768440961826} m_SecondaryAttachTransform: {fileID: 0} m_UseDynamicAttach: 1 m_MatchAttachPosition: 1 @@ -3811,7 +3891,7 @@ MonoBehaviour: m_SmoothPosition: 0 m_SmoothPositionAmount: 5 m_TightenPosition: 0.5 - m_TrackRotation: 1 + m_TrackRotation: 0 m_SmoothRotation: 0 m_SmoothRotationAmount: 5 m_TightenRotation: 0.5 @@ -3851,8 +3931,8 @@ HingeJoint: m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: -0.5, y: 0, z: 0} m_Axis: {x: 0, y: -0.4, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -3.2937593, y: -0.012340573, z: -0.36000913} + m_AutoConfigureConnectedAnchor: 0 + m_ConnectedAnchor: {x: -0.77, y: -0.012340573, z: -0.36000913} serializedVersion: 2 m_UseSpring: 0 m_Spring: @@ -3896,7 +3976,6 @@ MonoBehaviour: k__BackingField: {fileID: 0} _networkBehaviours: - {fileID: 3727098163363429260} - - {fileID: 3389705014521454347} k__BackingField: {fileID: 6748563106103991965} k__BackingField: [] _isNetworked: 1 @@ -4015,105 +4094,6 @@ Transform: m_Father: {fileID: 7019002931954688932} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7641886289678632063 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6548037134010678093} - - component: {fileID: 5489323224948033285} - - component: {fileID: 3389705014521454347} - m_Layer: 0 - m_Name: Knob - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 - m_IsActive: 1 ---- !u!4 &6548037134010678093 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7641886289678632063} - m_LocalRotation: {x: -0.00000008115275, y: -0.000000119209275, z: -1, w: -0.00000025602202} - m_LocalPosition: {x: 0.1481, y: 0.4123, z: -0.1} - m_LocalScale: {x: 0.34807622, y: 0.17558122, z: 12.316201} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3597511004041366441} - - {fileID: 2228776233369751345} - - {fileID: 5932402600523855724} - m_Father: {fileID: 1141650349950631806} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 180, y: 180, z: 0} ---- !u!64 &5489323224948033285 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7641886289678632063} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 1c68b634608ac71409cc85c15415923b, type: 2} ---- !u!114 &3389705014521454347 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7641886289678632063} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: - _componentIndexCache: 1 - _addedNetworkObject: {fileID: 6734132021369869160} - _networkObjectCache: {fileID: 6734132021369869160} - _synchronizeParent: 0 - _packing: - Position: 1 - Rotation: 1 - Scale: 0 - _interpolation: 2 - _extrapolation: 2 - _enableTeleport: 0 - _teleportThreshold: 1 - _clientAuthoritative: 1 - _sendToOwner: 1 - _synchronizePosition: 1 - _positionSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeRotation: 1 - _rotationSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeScale: 1 - _scaleSnapping: - X: 0 - Y: 0 - Z: 0 --- !u!1 &7820845655831880696 GameObject: m_ObjectHideFlags: 0 @@ -4137,12 +4117,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7820845655831880696} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.686, y: 2.337, z: -0.002} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.00000017881388, y: -0.00000006283548, z: -0.00000025445325, + w: 1} + m_LocalPosition: {x: -0.00015548983, y: -0.00049058406, z: -0.008076336} + m_LocalScale: {x: 0.032342084, y: 0.15451151, z: 0.73897237} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6548037134010678093} + m_Father: {fileID: 5291731708927053895} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7849625112812448748 @@ -4420,7 +4401,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2308502953967288723 Transform: m_ObjectHideFlags: 0 @@ -4532,7 +4513,10 @@ Transform: m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 12, y: 2.5, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3597511004041366441} + - {fileID: 2228776233369751345} + - {fileID: 5932402600523855724} m_Father: {fileID: 9007664768440961826} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5110,7 +5094,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8132581534601811375 Transform: m_ObjectHideFlags: 0 @@ -5317,3 +5301,112 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6455717503727900637} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7635345978376335951 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2389456291377549788} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalScale.x + value: 55.750034 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalScale.y + value: 110.000015 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.149 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.06 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 35cceeb3b97a92540bb4cbe621fafb82, type: 2} + - target: {fileID: 919132149155446097, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_Name + value: DoorSlab + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52fd38741dd12914a862eb9b5917a6e0, type: 3} +--- !u!4 &7961391948850877860 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 52fd38741dd12914a862eb9b5917a6e0, + type: 3} + m_PrefabInstance: {fileID: 7635345978376335951} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index fe71a27b..d0de5ed4 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd0c163aca6201f2a108ff1608c7c08b8fd442a19f2294fbade0801e23c67bdc -size 66886921 +oid sha256:6cd974454ef3e19e2f26f6a872249e709acd500a12fdea780dbbdcd99f675562 +size 66872261 diff --git a/Packages/manifest.json b/Packages/manifest.json index fe88d8ce..c1390d2e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,5 @@ { "dependencies": { - "com.meta.xr.sdk.acoustics": "file:C:/Users/nizamov/Downloads/meta_xr_audio_sdk_fmod_81.0/FMOD/Unity/MetaXRSDKAcousticsFMOD.tgz", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ai.navigation": "1.1.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 11e05355..d56d202b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,12 +6,6 @@ "source": "embedded", "dependencies": {} }, - "com.meta.xr.sdk.acoustics": { - "version": "file:C:/Users/nizamov/Downloads/meta_xr_audio_sdk_fmod_81.0/FMOD/Unity/MetaXRSDKAcousticsFMOD.tgz", - "depth": 0, - "source": "local-tarball", - "dependencies": {} - }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0,