test

Just-Kiel · May 7, 2021 · 4b555dd · 4b555dd
1 parent bb8bc52
commit 4b555dd
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 18 deletions.
diff --git a/Assets/Images/Persos/Kiel2/Blue+Yellow.asset b/Assets/Images/Persos/Kiel2/Blue+Yellow.asset
@@ -37,8 +37,8 @@ MonoBehaviour:
   - m_Name: Body
     m_Hash: 2073732236
     m_CategoryList:
-    - m_Name: body
-      m_Hash: -609743950
+    - m_Name: corps
+      m_Hash: -894175077
       m_Sprite: {fileID: 721252117495052482, guid: d83a6c96d8f376644b09efe3f0e13299,
         type: 3}
   - m_Name: LegG

diff --git a/Assets/Images/Persos/Kiel2/Normal.asset b/Assets/Images/Persos/Kiel2/Normal.asset
@@ -37,8 +37,8 @@ MonoBehaviour:
   - m_Name: Body
     m_Hash: 2073732236
     m_CategoryList:
-    - m_Name: body
-      m_Hash: -609743950
+    - m_Name: corps
+      m_Hash: -894175077
       m_Sprite: {fileID: -7442390020001042202, guid: d83a6c96d8f376644b09efe3f0e13299,
         type: 3}
   - m_Name: LegG

diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
@@ -517,9 +517,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   levelName:
   - Intro
-  - Intro_2
-  - Intro_3
-  - Level1_3
+  - Level1_8
+  - Level2_10
+  - Level3_12
   - Level1_5
   - Level1_8
   - Level2_1
@@ -552,7 +552,7 @@ MonoBehaviour:
   speedJump: 130
   getDash: 0
   isDashing: 0
-  speedDash: 175
+  speedDash: 160
   getClimb: 0
   wallCheck: {fileID: 0}
   wallCheckRay: 8.69

diff --git a/Assets/Scenes/EndScene.unity b/Assets/Scenes/EndScene.unity
@@ -356,7 +356,7 @@ VideoPlayer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1787108294}
   m_Enabled: 1
-  m_VideoClip: {fileID: 32900000, guid: 530d8eacfc72b1f44a2885c7b228e918, type: 3}
+  m_VideoClip: {fileID: 32900000, guid: 7ae09764dc0cc3749bef454c83ae0a86, type: 3}
   m_TargetCameraAlpha: 1
   m_TargetCamera3DLayout: 0
   m_TargetCamera: {fileID: 674754901}
@@ -369,14 +369,12 @@ VideoPlayer:
   m_DataSource: 0
   m_PlaybackSpeed: 1
   m_AudioOutputMode: 2
-  m_TargetAudioSources:
-  - {fileID: 0}
-  m_DirectAudioVolumes:
-  - 1
+  m_TargetAudioSources: []
+  m_DirectAudioVolumes: []
   m_Url: 
-  m_EnabledAudioTracks: 01
-  m_DirectAudioMutes: 00
-  m_ControlledAudioTrackCount: 1
+  m_EnabledAudioTracks: 
+  m_DirectAudioMutes: 
+  m_ControlledAudioTrackCount: 0
   m_PlayOnAwake: 1
   m_SkipOnDrop: 1
   m_Looping: 0

diff --git a/Assets/Scenes/Level2/Level2_2.unity b/Assets/Scenes/Level2/Level2_2.unity
@@ -1882,6 +1882,11 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 1370702892382476256, guid: e8ce79da23812a744ab2d714db54a196,
         type: 3}
+    - target: {fileID: 8255807988836452800, guid: b6b2f1f3e2ba300408e74e621a634320,
+        type: 3}
+      propertyPath: m_CollisionDetection
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8255807988836452801, guid: b6b2f1f3e2ba300408e74e621a634320,
         type: 3}
       propertyPath: m_LocalPosition.x

diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs
@@ -244,7 +244,7 @@ void MovePlayer(float _horizontalMovement)
 
         if (Walking == true) //si le joueur est en contact avec le sol
         {
-            rb2DPlayer.gravityScale = 5;
+            rb2DPlayer.gravityScale = 15;
             isDashing = false; //le joueur n'est pas en train de dash
             animator.SetBool("isJumping", false); //le personnage ne saute pas
 
@@ -253,7 +253,7 @@ void MovePlayer(float _horizontalMovement)
         else
         {
             animator.SetBool("isJumping", true);
-            rb2DPlayer.gravityScale = 26;
+            rb2DPlayer.gravityScale = 30;
             targetSpeed = new Vector2(_horizontalMovement / 5, rb2DPlayer.velocity.y);
             rb2DPlayer.velocity = Vector3.SmoothDamp(rb2DPlayer.velocity, targetSpeed, ref velocity, 0.05f);
             //Debug.Log("Saut actif");

diff --git a/Assets/Videos/Composition_1_1.mp4 b/Assets/Videos/Composition_1_1.mp4
diff --git a/Assets/Videos/Composition_1_1.mp4.meta b/Assets/Videos/Composition_1_1.mp4.meta