Skip to content

Commit 4b555dd

Browse files
author
Aurore
committed
test
1 parent bb8bc52 commit 4b555dd

File tree

8 files changed

+39
-18
lines changed

8 files changed

+39
-18
lines changed

Assets/Images/Persos/Kiel2/Blue+Yellow.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ MonoBehaviour:
3737
- m_Name: Body
3838
m_Hash: 2073732236
3939
m_CategoryList:
40-
- m_Name: body
41-
m_Hash: -609743950
40+
- m_Name: corps
41+
m_Hash: -894175077
4242
m_Sprite: {fileID: 721252117495052482, guid: d83a6c96d8f376644b09efe3f0e13299,
4343
type: 3}
4444
- m_Name: LegG

Assets/Images/Persos/Kiel2/Normal.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ MonoBehaviour:
3737
- m_Name: Body
3838
m_Hash: 2073732236
3939
m_CategoryList:
40-
- m_Name: body
41-
m_Hash: -609743950
40+
- m_Name: corps
41+
m_Hash: -894175077
4242
m_Sprite: {fileID: -7442390020001042202, guid: d83a6c96d8f376644b09efe3f0e13299,
4343
type: 3}
4444
- m_Name: LegG

Assets/Prefabs/Player.prefab

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,9 @@ MonoBehaviour:
517517
m_EditorClassIdentifier:
518518
levelName:
519519
- Intro
520-
- Intro_2
521-
- Intro_3
522-
- Level1_3
520+
- Level1_8
521+
- Level2_10
522+
- Level3_12
523523
- Level1_5
524524
- Level1_8
525525
- Level2_1
@@ -552,7 +552,7 @@ MonoBehaviour:
552552
speedJump: 130
553553
getDash: 0
554554
isDashing: 0
555-
speedDash: 175
555+
speedDash: 160
556556
getClimb: 0
557557
wallCheck: {fileID: 0}
558558
wallCheckRay: 8.69

Assets/Scenes/EndScene.unity

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ VideoPlayer:
356356
m_PrefabAsset: {fileID: 0}
357357
m_GameObject: {fileID: 1787108294}
358358
m_Enabled: 1
359-
m_VideoClip: {fileID: 32900000, guid: 530d8eacfc72b1f44a2885c7b228e918, type: 3}
359+
m_VideoClip: {fileID: 32900000, guid: 7ae09764dc0cc3749bef454c83ae0a86, type: 3}
360360
m_TargetCameraAlpha: 1
361361
m_TargetCamera3DLayout: 0
362362
m_TargetCamera: {fileID: 674754901}
@@ -369,14 +369,12 @@ VideoPlayer:
369369
m_DataSource: 0
370370
m_PlaybackSpeed: 1
371371
m_AudioOutputMode: 2
372-
m_TargetAudioSources:
373-
- {fileID: 0}
374-
m_DirectAudioVolumes:
375-
- 1
372+
m_TargetAudioSources: []
373+
m_DirectAudioVolumes: []
376374
m_Url:
377-
m_EnabledAudioTracks: 01
378-
m_DirectAudioMutes: 00
379-
m_ControlledAudioTrackCount: 1
375+
m_EnabledAudioTracks:
376+
m_DirectAudioMutes:
377+
m_ControlledAudioTrackCount: 0
380378
m_PlayOnAwake: 1
381379
m_SkipOnDrop: 1
382380
m_Looping: 0

Assets/Scenes/Level2/Level2_2.unity

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,6 +1882,11 @@ PrefabInstance:
18821882
value:
18831883
objectReference: {fileID: 1370702892382476256, guid: e8ce79da23812a744ab2d714db54a196,
18841884
type: 3}
1885+
- target: {fileID: 8255807988836452800, guid: b6b2f1f3e2ba300408e74e621a634320,
1886+
type: 3}
1887+
propertyPath: m_CollisionDetection
1888+
value: 0
1889+
objectReference: {fileID: 0}
18851890
- target: {fileID: 8255807988836452801, guid: b6b2f1f3e2ba300408e74e621a634320,
18861891
type: 3}
18871892
propertyPath: m_LocalPosition.x

Assets/Scripts/PlayerBehavior.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ void MovePlayer(float _horizontalMovement)
244244

245245
if (Walking == true) //si le joueur est en contact avec le sol
246246
{
247-
rb2DPlayer.gravityScale = 5;
247+
rb2DPlayer.gravityScale = 15;
248248
isDashing = false; //le joueur n'est pas en train de dash
249249
animator.SetBool("isJumping", false); //le personnage ne saute pas
250250

@@ -253,7 +253,7 @@ void MovePlayer(float _horizontalMovement)
253253
else
254254
{
255255
animator.SetBool("isJumping", true);
256-
rb2DPlayer.gravityScale = 26;
256+
rb2DPlayer.gravityScale = 30;
257257
targetSpeed = new Vector2(_horizontalMovement / 5, rb2DPlayer.velocity.y);
258258
rb2DPlayer.velocity = Vector3.SmoothDamp(rb2DPlayer.velocity, targetSpeed, ref velocity, 0.05f);
259259
//Debug.Log("Saut actif");

Assets/Videos/Composition_1_1.mp4

5.44 MB
Binary file not shown.

Assets/Videos/Composition_1_1.mp4.meta

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)