Symmetrical/BGJ-2022.1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Over' into Syntriax

Browse Source
This commit is contained in:
Syntriax
2022-02-23 11:43:30 +03:00
parent 438663eeab 9d0f9e620c
commit a030894ff3
6 changed files with 247 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Prefabs/Camera/Camera.prefab
View File

@@ -150,7 +150,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 11
orthographic size: 15
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -225,9 +225,9 @@ MonoBehaviour:
m_RefResolutionY: 240
m_UpscaleRT: 0
m_PixelSnapping: 0
m_CropFrameX: 0
m_CropFrameY: 0
m_StretchFill: 0
m_CropFrameX: 1
m_CropFrameY: 1
m_StretchFill: 1
--- !u!1 &2662163039948621855
GameObject:
m_ObjectHideFlags: 0
@@ -316,7 +316,7 @@ MonoBehaviour:
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 60
OrthographicSize: 11
OrthographicSize: 15
NearClipPlane: 0.3
FarClipPlane: 1000
Dutch: 0

98
Assets/Prefabs/Playable/Player.prefab
View File

@@ -1,5 +1,99 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &698768804
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 698768805}
- component: {fileID: 698768806}
m_Layer: 6
m_Name: PlayerWallTriggerLeft
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &698768805
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 698768804}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.5, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7008207192594766311}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &698768806
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 698768804}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3}
m_Name:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967103
--- !u!1 &2083070160
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2083070161}
- component: {fileID: 2083070162}
m_Layer: 6
m_Name: PlayerWallTriggerRight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2083070161
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083070160}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.5, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7008207192594766311}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2083070162
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083070160}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3}
m_Name:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967103
--- !u!1 &7008207192594766305
GameObject:
m_ObjectHideFlags: 0
@@ -29,11 +123,13 @@ Transform:
m_GameObject: {fileID: 7008207192594766305}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.55, y: 0.41, z: 0}
m_LocalScale: {x: 1, y: 2, z: 1}
m_LocalScale: {x: 1, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7008207193600475140}
- {fileID: 3507368432553107122}
- {fileID: 698768805}
- {fileID: 2083070161}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

102
Assets/Scenes/OverDevScene.unity
View File

@@ -5247,53 +5247,6 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!1 &698768804
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 698768805}
- component: {fileID: 698768806}
m_Layer: 6
m_Name: PlayerWallTriggerLeft
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &698768805
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 698768804}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.5, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1053905692}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &698768806
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 698768804}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3}
m_Name:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967103
--- !u!4 &1053905692 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3}
@@ -5438,53 +5391,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2083070160
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2083070161}
- component: {fileID: 2083070162}
m_Layer: 6
m_Name: PlayerWallTriggerRight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2083070161
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083070160}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.5, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1053905692}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2083070162
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083070160}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3}
m_Name:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967103
--- !u!1001 &2662163040783957219
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5492,10 +5398,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2662163039882375473, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3}
propertyPath: orthographic size
value: 15
objectReference: {fileID: 0}
- target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3}
propertyPath: m_RootOrder
value: 2
@@ -5548,10 +5450,6 @@ PrefabInstance:
propertyPath: m_Follow
value:
objectReference: {fileID: 1053905692}
- target: {fileID: 2662163040849090936, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3}
propertyPath: m_Lens.OrthographicSize
value: 15
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3}
--- !u!1001 &7008207193554258683

65
Assets/Scripts/Player/PlayerController.cs
View File

@@ -9,17 +9,20 @@ namespace Player
{
public class PlayerController : MonoBehaviour, IMovement, PlayerInput.IPlayerControlActions
{
private const float DefaultJumpForce = 25.0f;
private const float DefaultJumpForce = 26.0f;
private const float DefaultMass = 80.0f;
private const float MaxSpeed = 500.0f;
private const float DefaultAirSpeed = 300.0f;
private const float GravityScale = 5.0f;
private const float MaxSpeed = 700.0f;
private const float MaxAirSpeed = 500.0f;
private const float GravityScale = 6.0f;
private const float AccelerationScale = 40.0f;
private const float DecelerationScale = 60.0f;
private const float RespawnLimit = -60.0f;
private const float FallMultiplier = 5.0f;
private const float LowJumpMultiplier = 20.0f;
//Took from tutorial : https://www.youtube.com/watch?v=7KiK0Aqtmzc
private const float FallMultiplier = 3.0f;
private const float LowJumpMultiplier = 40.0f;
//End of credits
private PlayerInput _controls;
private Rigidbody2D _playerRigidbody2D;
@@ -27,6 +30,8 @@ namespace Player
private CollisionChecker _playerGroundTrigger;
private CollisionChecker _playerInteractableTrigger;
private CollisionChecker _playerWallTriggerLeft;
private CollisionChecker _playerWallTriggerRight;
private Orientation _orientation;
@@ -34,7 +39,7 @@ namespace Player
private bool _jumpKeyPressed;
private float _xAxisValue;
public float speed;
private float _speed;
private bool _isOnAir;
private bool _canJump;
@@ -46,6 +51,8 @@ namespace Player
_playerSpriteRenderer = GetComponent<SpriteRenderer>();
_playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent<CollisionChecker>();
_playerInteractableTrigger = GameObject.Find("PlayerInteractableTrigger").GetComponent<CollisionChecker>();
_playerWallTriggerLeft = GameObject.Find("PlayerWallTriggerLeft").GetComponent<CollisionChecker>();
_playerWallTriggerRight = GameObject.Find("PlayerWallTriggerRight").GetComponent<CollisionChecker>();
}
private void Start()
@@ -81,6 +88,7 @@ namespace Player
private void FixedUpdate()
{
//Took from tutorial : https://www.youtube.com/watch?v=7KiK0Aqtmzc
switch (_playerRigidbody2D.velocity.y)
{
case < 0:
@@ -92,13 +100,14 @@ namespace Player
Vector2.up * (Physics2D.gravity.y * (LowJumpMultiplier - 1) * Time.fixedDeltaTime);
break;
}
//End of credits
if (_moveKeyPressed)
Move(_xAxisValue);
else
_playerRigidbody2D.velocity = new Vector2(0.0f, _playerRigidbody2D.velocity.y);
if (_jumpKeyPressed && _canJump && _playerGroundTrigger.IsCollided)
if (_jumpKeyPressed && _playerGroundTrigger.IsCollided && _canJump)
Jump();
if (_afterMoving)
@@ -137,15 +146,26 @@ namespace Player
public float BaseSpeed
{
get => speed;
get => _speed;
set
{
speed = speed switch
switch (_isOnAir)
{
> MaxSpeed => MaxSpeed,
< 0 => 0,
_ => value
};
case false when value > MaxSpeed:
_speed = MaxSpeed;
break;
case true when value > MaxAirSpeed:
_speed = MaxAirSpeed;
break;
default:
{
if (value < 0)
_speed = 0;
else
_speed = value;
break;
}
}
}
}
@@ -156,18 +176,20 @@ namespace Player
case < 0:
_playerSpriteRenderer.flipX = true;
_orientation = Orientation.Left;
//prevent player from sticking to wall while moving to its direction in the air
if (!_playerGroundTrigger.IsCollided && _playerWallTriggerLeft.IsCollided)
return;
break;
case > 0:
_playerSpriteRenderer.flipX = false;
_orientation = Orientation.Right;
break;
default:
_playerSpriteRenderer.flipX = _playerSpriteRenderer.flipX;
//prevent player from sticking to wall while moving to its direction in the air
if (!_playerGroundTrigger.IsCollided && _playerWallTriggerRight.IsCollided)
return;
break;
}
if (!_isOnAir)
BaseSpeed += AccelerationScale;
BaseSpeed += AccelerationScale;
_playerRigidbody2D.velocity = new Vector2(BaseSpeed * _xAxisValue * Time.fixedDeltaTime,
_playerRigidbody2D.velocity.y);
}
@@ -183,7 +205,7 @@ namespace Player
private void Jump()
{
BaseSpeed = DefaultAirSpeed;
BaseSpeed = MaxAirSpeed;
_playerRigidbody2D.velocity = Vector2.up.normalized * DefaultJumpForce;
_canJump = false;
}
@@ -220,7 +242,8 @@ namespace Player
_canJump = true;
break;
case false:
_jumpKeyPressed = true;
if (_playerGroundTrigger.IsCollided)
_jumpKeyPressed = true;
break;
}
}