1 Commits

Author SHA1 Message Date
qlr32
86e84bee15 yo 2025-01-17 12:16:58 -05:00
882 changed files with 12316 additions and 73579 deletions

BIN
.DS_Store vendored

Binary file not shown.

BIN
Assets/.DS_Store vendored

Binary file not shown.

View File

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

View File

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

View File

@@ -1,376 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8088454279998633666
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2600039493493020915}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3289816270970516984
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2600039493493020915}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3226116647278939360
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1699472617733096240}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.625
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-1538096663108953913
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 2600039493493020915}
m_Position: {x: 550, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -65348665591799820}
m_Position: {x: 290, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: 1699472617733096240}
m_Position: {x: 290, y: -50, z: 0}
- serializedVersion: 1
m_State: {fileID: 4390441580030614539}
m_Position: {x: 60, y: 80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 5263795009836994554}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 80, y: 0, z: 0}
m_EntryPosition: {x: 890, y: 0, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 2600039493493020915}
--- !u!1101 &-1491732674038617540
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1699472617733096240}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1027424570895581804
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -65348665591799820}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.625
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-65348665591799820
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1491732674038617540}
- {fileID: -3289816270970516984}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 93a4e7ef703974b11a664b2860f28280, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Bones
serializedVersion: 5
m_AnimatorParameters:
- m_Name: state
m_Type: 3
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: punch
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -1538096663108953913}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1187931533429329025
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -65348665591799820}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1699472617733096240
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -8088454279998633666}
- {fileID: 1187931533429329025}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 2753c956d51d84998a3232a32023fb33, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2600039493493020915
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Walk
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3226116647278939360}
- {fileID: -1027424570895581804}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 590f229c565f34c8296a875497c76553, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &4390441580030614539
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TrevorPunch
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7801668757208663834}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: d35a84e254439400a98448cb2348a2f8, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5263795009836994554
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: punch
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4390441580030614539}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.05
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &7801668757208663834
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1699472617733096240}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.7972973
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 8a738d31dc8884ffeb8292972ba3cff6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 2753c956d51d84998a3232a32023fb33
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 93a4e7ef703974b11a664b2860f28280
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: d35a84e254439400a98448cb2348a2f8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 590f229c565f34c8296a875497c76553
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,15 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: DefaultVolumeProfile
m_EditorClassIdentifier:
components: []

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 2b037fb9c899f094586d19b7a999ef2a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Games/.DS_Store vendored

Binary file not shown.

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1ed653fe1593421408c89420fabe292e
guid: 980fb9ecb9b27d9499905c73ae3550c8
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 1959672341225110449}
- component: {fileID: 1277363986118001863}
m_Layer: 0
m_Name: Player Camera
m_Name: Platformer Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

View File

@@ -87,15 +87,13 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 627266363752542778}
- component: {fileID: 5205514565969078994}
- component: {fileID: 4323437100190106747}
- component: {fileID: 9112988359646506999}
- component: {fileID: 8542321013335259419}
- component: {fileID: 2791557175355662981}
- component: {fileID: 3406519100105273690}
- component: {fileID: 251648003544978305}
m_Layer: 0
m_Name: Player
m_Name: Platformer Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -117,36 +115,6 @@ Transform:
- {fileID: 317069132541983608}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5205514565969078994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6546762253351562952}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!212 &4323437100190106747
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -219,33 +187,17 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 64
walkSpeed: 5
walkSpeedFactor: 30
maxSpeed: 5
virtualAxisX: 0
virtualButtonJump: 0
virtualButtonJumpLastFrame: 0
turnaroundMultiplier: 2
walkSmooth: 0.98
walkSmooth: 0
secondsToFullSpeed: 0
jumpSpeed: 17
coyoteTime: 0.1
jumpLenience: 0.1
timeUnableToBeDeclaredNotJumping: 0.1
groundCheckDistance: 0.1
--- !u!114 &8542321013335259419
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6546762253351562952}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3}
m_Name:
m_EditorClassIdentifier:
spawnPoint: {x: 0, y: 0}
respawnTag: Platformer Hazard
--- !u!61 &2791557175355662981
BoxCollider2D:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5c0b2030ed36245158311e6d41e2d384
guid: 7ced54d002210494abdbf0bcaa120835
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -1,8 +1,10 @@
using System.Collections.Generic;
using UnityEngine;
public class PlayerCameraMovement : MonoBehaviour
public class PlatformerCameraMovement : MonoBehaviour
{
public List<GameObject> players;
private Vector3 start;
private Vector3 target;
public float weight;
@@ -15,10 +17,6 @@ public class PlayerCameraMovement : MonoBehaviour
private void Update()
{
List<GameObject> players = PlayerManager.Instance.players;
if (players.Count == 0) return;
Vector3 playerAverage = Vector3.zero;
foreach (GameObject player in players)
{

View File

@@ -1,26 +1,19 @@
using System.Collections;
using TMPro;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
using UnityEngine.Animations;
using UnityEngine.InputSystem;
using UnityEngine.Tilemaps;
[RequireComponent(typeof(Rigidbody2D))]
[RequireComponent(typeof(BoxCollider2D))]
[RequireComponent(typeof(PlayerInput))]
[RequireComponent(typeof(AnimationPlayer))]
[RequireComponent(typeof(Punch))]
public class PlayerMovement : MonoBehaviour
{
public string player;
[Header("Ground Layers")]
public LayerMask ground;
public TextMeshProUGUI playerText;
[Header("Movement")]
public float walkSpeed;
public float walkSpeedFactor = 1f;
public float maxSpeed = 5f;
public float slowdownMultiplier = 10f;
public float virtualAxisX;
public float virtualButtonJump;
public float virtualButtonJumpLastFrame;
@@ -35,9 +28,8 @@ public class PlayerMovement : MonoBehaviour
private Rigidbody2D body;
private BoxCollider2D collide;
private PlayerInput input;
private AnimationPlayer animationPlayer;
private Punch punch;
private Vector2 spawnPosition;
private bool jumpInputStillValid = false;
private float lastTimeJumpPressed;
@@ -54,15 +46,10 @@ public class PlayerMovement : MonoBehaviour
void Start()
{
GetComponent<RespawnOnTriggerEnter>().spawnPoint = transform.position;
spawnPosition = transform.position;
body = GetComponent<Rigidbody2D>();
collide = GetComponent<BoxCollider2D>();
input = GetComponent<PlayerInput>();
animationPlayer = GetComponent<AnimationPlayer>();
punch = GetComponent<Punch>();
playerText.text = input.playerIndex.ToString();
}
private void Update()
@@ -78,32 +65,10 @@ public class PlayerMovement : MonoBehaviour
HorizontalMovement();
Land();
}
private void LateUpdate()
{
Animate();
}
private void Animate()
{
if (!IsPhysicallyGrounded())
animationPlayer.SetState(AnimationPlayer.AnimationState.Jump);
else
{
if (Mathf.Abs(body.linearVelocityX) >= 0.1f)
animationPlayer.SetState(AnimationPlayer.AnimationState.Run);
else
animationPlayer.SetState(AnimationPlayer.AnimationState.Idle);
}
if (body.linearVelocityX < -0.1f)
animationPlayer.backwards = true;
else if (body.linearVelocityX > 0.1f)
animationPlayer.backwards = false;
}
private void Land()
{
if (body.linearVelocity.y >= 0f) return;
@@ -119,8 +84,6 @@ public class PlayerMovement : MonoBehaviour
private void Jump()
{
if (!punch.cancelable) return;
if (virtualButtonJumpLastFrame == 1f)
{
jumpInputStillValid = true;
@@ -160,16 +123,9 @@ public class PlayerMovement : MonoBehaviour
private void HorizontalMovement()
{
if (!punch.cancelable) return;
body.linearVelocity = new Vector2(virtualAxisX * walkSpeed, body.linearVelocity.y);
body.AddForce(new Vector2(virtualAxisX * walkSpeed * walkSpeedFactor, 0), ForceMode2D.Force);
if (Mathf.Abs(body.linearVelocityX) >= maxSpeed)
{
body.AddForce(new Vector2(-Mathf.Sign(body.linearVelocityX) * (Mathf.Abs(body.linearVelocityX) - maxSpeed) * slowdownMultiplier, 0));
}
if (transform.position == positionLastFrame && (input.actions.FindAction("Move").ReadValue<Vector2>().x == 0))
if (transform.position == positionLastFrame && (InputSystem.actions.FindAction($"Player {player} Move").ReadValue<Vector2>().x == 0))
{
virtualAxisX = 0;
}
@@ -179,11 +135,45 @@ public class PlayerMovement : MonoBehaviour
private void UpdateVirtualAxis()
{
virtualButtonJump = input.actions.FindAction("Action").ReadValue<float>();
virtualButtonJumpLastFrame = input.actions.FindAction("Action").WasPressedThisFrame() ? 1 : 0;
// From https://discussions.unity.com/t/manually-smooth-input-getaxisraw/225141/4
float basicallyRawAxis = InputSystem.actions.FindAction($"Player {player} Move").ReadValue<Vector2>().x;
float sensitivity = 3;
float gravity = 3;
float time = Time.deltaTime;
virtualAxisX = input.actions.FindAction("Move").ReadValue<Vector2>().x;
return;
if (basicallyRawAxis != 0)
{
virtualAxisX = Mathf.Clamp(virtualAxisX + basicallyRawAxis * sensitivity * time * turnaroundMultiplier, -1f, 1f);
}
else
{
virtualAxisX = Mathf.Clamp01(Mathf.Abs(virtualAxisX) - gravity * time) * Mathf.Sign(virtualAxisX);
}
if ((basicallyRawAxis > 0f && virtualAxisX < 0f) || (basicallyRawAxis < 0f && virtualAxisX > 0f))
{
turnaroundMultiplier = 2;
}
else
{
turnaroundMultiplier = 1;
}
virtualButtonJump = InputSystem.actions.FindAction($"Player {player} Action").ReadValue<float>();
virtualButtonJumpLastFrame = InputSystem.actions.FindAction($"Player {player} Action").WasPressedThisFrame() ? 1 : 0;
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.gameObject.CompareTag("Platformer Hazard"))
{
Respawn();
}
}
private void Respawn()
{
transform.position = spawnPosition;
body.linearVelocity = Vector2.zero;
}
public bool IsBasicallyGrounded()
@@ -223,9 +213,4 @@ public class PlayerMovement : MonoBehaviour
boxCollider2D.bounds.center.y + (vertical * boxCollider2D.bounds.extents.y)
);
}
public void StopVelocity()
{
if (IsPhysicallyGrounded()) body.linearVelocity = Vector2.zero;
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4ac8c764f1723a245a7d1526c4de48d8
guid: b42915419d163024fb0214278adbd52f
folderAsset: yes
DefaultImporter:
externalObjects: {}

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 855987bb66804c94fb25c13cb75a7f65
guid: 4371746b6d98e6b489bfef954bbc9fdb
PrefabImporter:
externalObjects: {}
userData:

View File

@@ -104,7 +104,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
speed: 400
isPlayer1: 1
move: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3}
--- !u!60 &6715754573185558080
PolygonCollider2D:
m_ObjectHideFlags: 0

View File

@@ -2126,10 +2126,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 946501248446145305, guid: 603e313b1bcbb4e7ab65d3ec701ce789, type: 3}
propertyPath: move.m_Name
value: Move
objectReference: {fileID: 0}
- target: {fileID: 2899264478719472934, guid: 603e313b1bcbb4e7ab65d3ec701ce789, type: 3}
propertyPath: m_LocalPosition.x
value: -8

View File

@@ -0,0 +1,27 @@
using UnityEngine;
using UnityEngine.InputSystem;
public class PongPaddleBehavior : MonoBehaviour
{
public float speed = 5f;
public bool isPlayer1 = true;
private InputAction move;
private Rigidbody2D rb;
private void Start()
{
move = isPlayer1 ? InputSystem.actions.FindAction("Player 1 Move") : InputSystem.actions.FindAction("Player 2 Move");
rb = GetComponent<Rigidbody2D>();
}
private void FixedUpdate()
{
float direction = move.ReadValue<Vector2>().y;
if (transform.position.y >= 4 && direction > 0 || transform.position.y <= -4 && direction < 0)
{
direction = 0;
}
rb.linearVelocityY = direction * speed * Time.fixedDeltaTime;
}
}

View File

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

View File

@@ -1,18 +0,0 @@
using UnityEngine;
using UnityEngine.InputSystem;
public class Trevor : MonoBehaviour
{
[SerializeField] private float speed;
void Start()
{
}
void Update()
{
Vector2 direction = InputSystem.actions.FindAction("Player 1 Move").ReadValue<Vector2>();
transform.position += speed * (Vector3)direction * Time.deltaTime;
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: ba8c0359d26a446ae8b41269b13ac727

View File

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 710 B

View File

@@ -96,19 +96,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:

View File

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

View File

@@ -1,73 +0,0 @@
{
"name": "Global Actions",
"maps": [
{
"name": "Global",
"id": "df70fa95-8a34-4494-b137-73ab6b9c7d37",
"actions": [],
"bindings": []
}
],
"controlSchemes": [
{
"name": "Keyboard&Mouse",
"bindingGroup": "Keyboard&Mouse",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Mouse>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Touch",
"bindingGroup": "Touch",
"devices": [
{
"devicePath": "<Touchscreen>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Joystick",
"bindingGroup": "Joystick",
"devices": [
{
"devicePath": "<Joystick>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "XR",
"bindingGroup": "XR",
"devices": [
{
"devicePath": "<XRController>",
"isOptional": false,
"isOR": false
}
]
}
]
}

View File

@@ -1,14 +0,0 @@
fileFormatVersion: 2
guid: 6cbaae0ad99590d468c8b501c0452c36
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
generateWrapperCode: 0
wrapperCodePath:
wrapperClassName:
wrapperCodeNamespace:

View File

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

View File

@@ -1,14 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!62 &6200000
PhysicsMaterial2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ground
serializedVersion: 2
friction: 0
bounciness: 0
m_FrictionCombine: 1
m_BounceCombine: 4

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c29c2a30d0b3d4a9b95031c5dfbd222a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 6200000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,14 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!62 &6200000
PhysicsMaterial2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player
serializedVersion: 2
friction: 0
bounciness: 0
m_FrictionCombine: 1
m_BounceCombine: 4

View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 522e8bb901c31496c91921bd603c0e8b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 6200000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d77def305dca24a80bbecb5e7edfe7fe
guid: 902a3e40c4fe7c64690b99710e736c55
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@@ -0,0 +1,16 @@
using UnityEngine;
public class Test : MonoBehaviour
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: ca02decb56ef91c40af52d499e1659c0

View File

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

View File

@@ -1,46 +0,0 @@
using UnityEngine;
using UnityEngine.InputSystem;
public class PongPaddleBehavior : MonoBehaviour
{
public float speed = 5f;
public bool isPlayer1 = true;
[SerializeField] private InputActionAsset move;
private Rigidbody2D rb;
private void Start()
{
rb = GetComponent<Rigidbody2D>();
}
private void FixedUpdate()
{
if (!isPlayer1)
{
Transform ball = FindFirstObjectByType<PongBallBehavior>().transform;
RaycastHit2D[] hits = Physics2D.RaycastAll(ball.position, ball.GetComponent<Rigidbody2D>().linearVelocity, Mathf.Infinity, LayerMask.GetMask("Pong Goal"));
Debug.DrawRay(ball.position, ball.GetComponent<Rigidbody2D>().linearVelocity * 1000f, Color.red);
foreach(RaycastHit2D hit in hits)
{
if (hit.collider.gameObject.CompareTag("Pong Goal"))
{
print("Hit");
float dir = transform.position.y - hit.point.y > 0 ? 1 : -1;
rb.linearVelocityY = dir * speed * Time.fixedDeltaTime;
}
}
return;
}
float direction = move.FindAction("Move").ReadValue<Vector2>().y;
if (transform.position.y >= 4 && direction > 0 || transform.position.y <= -4 && direction < 0)
{
direction = 0;
}
rb.linearVelocityY = direction * speed * Time.fixedDeltaTime;
}
}

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 1fd31b88e5609482ab7e8ab16a932947
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 4371746b6d98e6b489bfef954bbc9fdb
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -1,36 +0,0 @@
using UnityEngine;
[RequireComponent(typeof(Animator))]
public class AnimationPlayer : MonoBehaviour
{
public enum AnimationState { Idle, Run, Jump };
public AnimationState state;
public bool backwards;
public AnimationClip clip;
private Animator animator;
private void Start()
{
animator = GetComponent<Animator>();
animator.Play(clip.name);
}
private void LateUpdate()
{
animator.SetInteger("state", (int)state);
transform.localScale = new Vector3(Mathf.Sign(backwards ? -1 : 1) * Mathf.Abs(transform.localScale.x), transform.localScale.y, transform.localScale.z);
}
public void SetState(AnimationState state)
{
this.state = state;
}
public void Punch()
{
animator.SetTrigger("punch");
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 6e9d01bde449c4d0fa146e06804d6a03

Some files were not shown because too many files have changed in this diff Show More