feat/DropHead #4

Merged
BoxOfPandor merged 3 commits from feat/throwingArc into Prototype 2026-03-12 13:19:48 +01:00
4 changed files with 44 additions and 9 deletions
Showing only changes of commit 1dbc2734f3 - Show all commits

View File

@@ -2,7 +2,7 @@
- Project name: HeadlessHazard
- Unity version: Unity 6000.3.10f1
- Active game object:
- Name: Plate
- Tag: Untagged
- Layer: Ground
- Name: Player
- Tag: Player
- Layer: Default
<!-- UNITY CODE ASSIST INSTRUCTIONS END -->

View File

@@ -504,7 +504,7 @@
{
"name": "",
"id": "05a519b8-f991-4f43-a438-fbe3db38625b",
"path": "<Mouse>/rightButton",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",

View File

@@ -5,31 +5,31 @@ public class PlayerInputController : MonoBehaviour
{
public InputActionAsset InputActions;
private InputAction m_headInteractAction;
private InputAction m_moveAction;
private InputAction m_lookAction;
private InputAction m_jumpAction;
private InputAction m_throwAction;
private InputAction m_shiftAction;
private InputAction m_headInteractAction;
public Vector2 MoveAmount { get; private set; }
public Vector2 LookAmount { get; private set; }
public bool HeadInteractionPressed { get; private set; }
public bool JumpPressed { get; private set; }
public bool ShiftPressed { get; private set; }
public bool ThrowPressed { get; private set; }
public bool HeadInteractionPressed { get; private set; }
private void Awake()
{
var map = InputActions.FindActionMap("Player");
m_headInteractAction = map.FindAction("HeadInteract");
m_moveAction = map.FindAction("Move");
m_lookAction = map.FindAction("Look");
m_jumpAction = map.FindAction("Jump");
m_shiftAction = map.FindAction("Shift");
m_throwAction = map.FindAction("Throw");
m_headInteractAction = map.FindAction("HeadInteract");
}
private void OnEnable()

View File

@@ -925,6 +925,9 @@ PrefabInstance:
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4446703388580953019, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
insertIndex: -1
addedObject: {fileID: 762199654}
- targetCorrespondingSourceObject: {fileID: 1446289441119343760, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
insertIndex: -1
addedObject: {fileID: 36927862}
@@ -37007,6 +37010,38 @@ Mesh:
- serializedVersion: 1
m_IndexStart: 0
m_IndexCount: 0
--- !u!1 &762199651 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4446703388580953019, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
m_PrefabInstance: {fileID: 99539971}
m_PrefabAsset: {fileID: 0}
--- !u!54 &762199654
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 762199651}
serializedVersion: 5
m_Mass: 1
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}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &818197916
GameObject:
m_ObjectHideFlags: 0
@@ -37803,7 +37838,7 @@ GameObject:
- component: {fileID: 1173887971}
- component: {fileID: 1173887970}
- component: {fileID: 1173887969}
m_Layer: 0
m_Layer: 3
m_Name: Plate
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -107190,7 +107225,7 @@ GameObject:
- component: {fileID: 1524676968}
- component: {fileID: 1524676967}
- component: {fileID: 1524676966}
m_Layer: 0
m_Layer: 3
m_Name: Plate
m_TagString: Untagged
m_Icon: {fileID: 0}