prepped aiming

This commit is contained in:
2023-04-04 00:04:34 -04:00
parent 3586ee1e48
commit e948e4687d
44 changed files with 4057 additions and 2696 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c45f05892f2ff27429f6adc9e95855b9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,27 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class DummyComponent : MonoBehaviour
{
private Animator anim;
// Start is called before the first frame update
void Start()
{
anim = this.GetComponentInParent<Animator>();
}
// Update is called once per frame
void Update()
{
}
private void OnCollisionEnter(Collision collision)
{
if(collision.gameObject.GetComponent<BulletComponent>() != null)
{
anim.Play("DummyFall");
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7704c7887a840104bbb7774436810b7c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -42,6 +42,10 @@ public class PlayerAnimationController : MonoBehaviour
}
}
public void Hit()
{
animController.SetTrigger("WasHit");
}
// Start is called before the first frame update
void Start()
@ -54,7 +58,8 @@ public class PlayerAnimationController : MonoBehaviour
{
animController.SetBool("IsCarrying", interactionHandler.IsCarrying);
animController.SetBool("HasGun",interactionHandler.GunEnabled);
print("carrying:" + interactionHandler.IsCarrying + " running:"+animController.GetBool(runningParameter)+" running speed:" + animController.GetFloat(runningSpeedParameter));
//print("carrying:" + interactionHandler.IsCarrying + " running:"+animController.GetBool(runningParameter)+" running speed:" + animController.GetFloat(runningSpeedParameter));
}
}

View File

@ -205,6 +205,9 @@ public class PlayerInteractionHandler : MonoBehaviour
if (this.GunEnabled)
{
this.DisableFlashlight();
float aimAxis = Input.GetAxis("Aim");
print("Aim:" + aimAxis);
}
else
{