fix: replace mesh collider to sphere collider from the button

2026-03-11 11:29:43 +01:00
13 changed files with 989 additions and 1067 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,7 +2,7 @@
 - Project name: HeadlessHazard
 - Unity version: Unity 6000.3.10f1
 - Active game object:
-  - Name: Head
-  - Tag: Player
+  - Name: GroundCheck
+  - Tag: Untagged
  - Layer: Default
 <!-- UNITY CODE ASSIST INSTRUCTIONS END -->
--- a/Assets/Art/Materials/Player/Trajectory
+++ b/Assets/Art/Materials/Player/Trajectory
@@ -1,141 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4017841189937380044
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
-  version: 10
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Trajectory Material
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _SPECULAR_SETUP
-  - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - MOTIONVECTORS
-  - DepthOnly
-  - SHADOWCASTER
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _AddPrecomputedVelocity: 0
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendModePreserveSpecular: 0
-    - _BumpScale: 1
-    - _ClearCoatMask: 0
-    - _ClearCoatSmoothness: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DetailAlbedoMapScale: 1
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
-    - _EnvironmentReflections: 1
-    - _GlossMapScale: 0
-    - _Glossiness: 0
-    - _GlossyReflections: 0
-    - _Metallic: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.005
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
-    - _Smoothness: 0.5
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 5
-    - _SrcBlendAlpha: 1
-    - _Surface: 1
-    - _WorkflowMode: 0
-    - _XRMotionVectorsPass: 1
-    - _ZWrite: 0
-    m_Colors:
-    - _BaseColor: {r: 1, g: 0, b: 0, a: 0.6862745}
-    - _Color: {r: 1, g: 0, b: 0, a: 0.6862745}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
--- a/Assets/Art/Materials/Player/Trajectory
+++ b/Assets/Art/Materials/Player/Trajectory
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 51588d9f6325eb54eaa0c67389672860
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Code/Scripts/Player/InputSystem_Actions.inputactions
+++ b/Assets/Code/Scripts/Player/InputSystem_Actions.inputactions
@@ -25,7 +25,7 @@
                    "initialStateCheck": true
                },
                {
-                    "name": "HeadInteract",
+                    "name": "Pickup",
                    "type": "Button",
                    "id": "5a0c555a-8fc4-4188-9eed-401eb8f017b5",
                    "expectedControlType": "",
@@ -504,7 +504,7 @@
                {
                    "name": "",
                    "id": "05a519b8-f991-4f43-a438-fbe3db38625b",
-                    "path": "<Mouse>/leftButton",
+                    "path": "<Mouse>/rightButton",
                    "interactions": "",
                    "processors": "",
                    "groups": ";Keyboard&Mouse",
@@ -519,7 +519,7 @@
                    "interactions": "",
                    "processors": "",
                    "groups": ";Keyboard&Mouse",
-                    "action": "HeadInteract",
+                    "action": "Pickup",
                    "isComposite": false,
                    "isPartOfComposite": false
                },
--- a/Assets/Code/Scripts/Player/PlayerHeadControll.cs
+++ b/Assets/Code/Scripts/Player/PlayerHeadControll.cs
@@ -34,27 +34,22 @@ public class PlayerHeadController : MonoBehaviour

    void Update()
    {
-        if (input.HeadInteractionPressed)
-        {
-            InteractHead();
-        }
-
        if (input.ThrowPressed)
        {
            ThrowHead();
        }
+
+        if (input.PickupPressed)
+        {
+            TryPickupHead();
+        }
    }

-    private void InteractHead()
+    private void ThrowHead()
    {
        if (!isHoldingHead)
-            TryPickupHead();
-        else
-            DropHead();
-    }
+            return;

-    private void DropHead()
-    {
        animator.SetTrigger("Throw");

        isHoldingHead = false;
@@ -68,14 +63,6 @@ public class PlayerHeadController : MonoBehaviour
            RigidbodyConstraints.FreezeRotationX |
            RigidbodyConstraints.FreezeRotationZ |
            RigidbodyConstraints.FreezeRotationY;
-    }
-
-    private void ThrowHead()
-    {
-        if (!isHoldingHead)
-            return;
-
-        DropHead();

        m_headRigidbody.AddForce(CameraTransform.forward * ThrowForce, ForceMode.Impulse);
    }
@@ -107,4 +94,4 @@ public class PlayerHeadController : MonoBehaviour
        Head.localPosition = m_headInitialLocalPos;
        Head.localRotation = m_headInitialLocalRot;
    }
-} 
+}
--- a/Assets/Code/Scripts/Player/PlayerInputHandler.cs
+++ b/Assets/Code/Scripts/Player/PlayerInputHandler.cs
@@ -1,5 +1,6 @@
 using UnityEngine;
 using UnityEngine.InputSystem;
+using UnityEngine.Windows;

 public class PlayerInputController : MonoBehaviour
 {
@@ -9,8 +10,8 @@ public class PlayerInputController : MonoBehaviour
    private InputAction m_lookAction;
    private InputAction m_jumpAction;
    private InputAction m_throwAction;
+    private InputAction m_pickupAction;
    private InputAction m_shiftAction;
-    private InputAction m_headInteractAction;

    public Vector2 MoveAmount { get; private set; }
    public Vector2 LookAmount { get; private set; }
@@ -18,7 +19,7 @@ public class PlayerInputController : MonoBehaviour
    public bool JumpPressed { get; private set; }
    public bool ShiftPressed { get; private set; }
    public bool ThrowPressed { get; private set; }
-    public bool HeadInteractionPressed { get; private set; }
+    public bool PickupPressed { get; private set; }

    private void Awake()
    {
@@ -29,7 +30,7 @@ public class PlayerInputController : MonoBehaviour
        m_jumpAction = map.FindAction("Jump");
        m_shiftAction = map.FindAction("Shift");
        m_throwAction = map.FindAction("Throw");
-        m_headInteractAction = map.FindAction("HeadInteract");
+        m_pickupAction = map.FindAction("Pickup");
    }

    private void OnEnable()
@@ -50,6 +51,6 @@ public class PlayerInputController : MonoBehaviour
        ShiftPressed = m_shiftAction.IsPressed();
        JumpPressed = m_jumpAction.WasPressedThisFrame();
        ThrowPressed = m_throwAction.WasPressedThisFrame();
-        HeadInteractionPressed = m_headInteractAction.WasPressedThisFrame();
+        PickupPressed = m_pickupAction.WasPressedThisFrame();
    }
 }
--- a/Assets/Level/Prefabs/Interactives/Button.prefab
+++ b/Assets/Level/Prefabs/Interactives/Button.prefab
@@ -13,6 +13,7 @@ GameObject:
  - component: {fileID: 7188501903215599936}
  - component: {fileID: 2249752946204529007}
  - component: {fileID: 8097217384448450469}
+  - component: {fileID: 513860795296143253}
  - component: {fileID: 9200216552899707794}
  - component: {fileID: 3436190445336344638}
  m_Layer: 0
@@ -34077,6 +34078,27 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6532970485135766022}
  m_Mesh: {fileID: 0}
+--- !u!135 &513860795296143253
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6532970485135766022}
+  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: 1
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!135 &9200216552899707794
 SphereCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Level/Prefabs/Interactives/Door.prefab
+++ b/Assets/Level/Prefabs/Interactives/Door.prefab
@@ -13,7 +13,7 @@ GameObject:
  - component: {fileID: 3884605895522482221}
  - component: {fileID: 16871832050785725}
  - component: {fileID: 8512140229507148937}
-  - component: {fileID: 6734862024670495346}
+  - component: {fileID: 5304359845802383427}
  - component: {fileID: 6921400718617286756}
  m_Layer: 0
  m_Name: Door
@@ -335,8 +335,8 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6922175388650039756}
  m_Mesh: {fileID: 0}
--- !u!64 &6734862024670495346
-MeshCollider:
+--- !u!65 &5304359845802383427
+BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -353,10 +353,9 @@ MeshCollider:
  m_IsTrigger: 0
  m_ProvidesContacts: 0
  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 0}
+  serializedVersion: 3
+  m_Size: {x: 0.1, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &6921400718617286756
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Level/Prefabs/Player/Player.prefab
+++ b/Assets/Level/Prefabs/Player/Player.prefab
@@ -71,10 +71,6 @@ PrefabInstance:
      propertyPath: m_Name
      value: Head
      objectReference: {fileID: 0}
-    - target: {fileID: 4513738306462009106, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
-      propertyPath: m_TagString
-      value: Player
-      objectReference: {fileID: 0}
    - target: {fileID: 4522719369371878407, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
      propertyPath: m_LocalPosition.y
      value: 0
@@ -252,29 +248,8 @@ PrefabInstance:
    m_RemovedGameObjects:
    - {fileID: 2059550454731354505, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 1015176535145037065, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 2084843937911841166}
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
--- !u!1 &1446289441119343760 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1015176535145037065, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
-  m_PrefabInstance: {fileID: 1874870990122559897}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &2084843937911841166
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1446289441119343760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1d8f349ed7dc088a4a6e2690ee87094a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::PlayerMovement
-  InputActions: {fileID: 0}
 --- !u!4 &6975610370707183838 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
@@ -570,15 +545,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.5
+      value: 1.48
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0
+      value: -6.57
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalRotation.x
@@ -586,7 +561,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.7071068
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalRotation.z
@@ -598,7 +573,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
--- a/Assets/Level/Scenes/DevRoom.unity
+++ b/Assets/Level/Scenes/DevRoom.unity
--- a/Assets/Settings/PhysicsMaterial/Player/No_Frcition.physicMaterial.meta
+++ b/Assets/Settings/PhysicsMaterial/Player/No_Frcition.physicMaterial.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f9ccf03e1da5f4a4683903447659b3d7
+guid: f5c0ebee25ced1d42b0312b27d0aad54
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 13400000
--- a/Assets/Settings/PhysicsMaterial/Player/No_Friction.physicMaterial.meta
+++ b/Assets/Settings/PhysicsMaterial/Player/No_Friction.physicMaterial.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7ddf8204ae4327bb84e928c9ae561d4
+guid: 7c0881b5a8885c9f0a5954bd7ca490b4
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 13400000
--- a/HeadlessHazard.slnx
+++ b/HeadlessHazard.slnx
@@ -1,3 +1,4 @@
-<Solution>
-  <Project Path="Assembly-CSharp.csproj" />
-</Solution>
+<Solution>
+  <Project Path="MerryYellow.CodeAssist.Editor.csproj" />
+  <Project Path="Assembly-CSharp.csproj" />
+</Solution>