From fc473b390a0a34ece1bcc85203c99a23b3bbbf58 Mon Sep 17 00:00:00 2001
From: lgress <loanie.gress@etu.unistra.fr>
Date: Mon, 29 Nov 2021 00:24:45 +0100
Subject: [PATCH] Minor changes for the upcoming Beta release
---
Assets/Scenes/Scene.unity | 62 ++++++--------------------------
Assets/Scripts/PlayerMovement.cs | 2 --
2 files changed, 10 insertions(+), 54 deletions(-)
diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity
index 0ab4b5f..ebc2818 100644
--- a/Assets/Scenes/Scene.unity
+++ b/Assets/Scenes/Scene.unity
@@ -9406,7 +9406,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 59.637, y: 63.512005, z: 58.997}
--- !u!1001 &638793760
PrefabInstance:
@@ -12251,7 +12251,7 @@ PrefabInstance:
- target: {fileID: 6175370585790185263, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_RootOrder
- value: 7
+ value: 6
objectReference: {fileID: 0}
- target: {fileID: 6175370585790185263, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
@@ -14518,6 +14518,11 @@ PrefabInstance:
propertyPath: craftSystem
value:
objectReference: {fileID: 1275559986}
+ - target: {fileID: 4370585583712565799, guid: 2dc8e29e6890c4b47afaad8f0bdd7e74,
+ type: 3}
+ propertyPath: currentHealth
+ value: 100
+ objectReference: {fileID: 0}
- target: {fileID: 4370585583712565799, guid: 2dc8e29e6890c4b47afaad8f0bdd7e74,
type: 3}
propertyPath: characterSystem
@@ -14531,7 +14536,7 @@ PrefabInstance:
- target: {fileID: 4370585583712565816, guid: 2dc8e29e6890c4b47afaad8f0bdd7e74,
type: 3}
propertyPath: walkSpeed
- value: 8
+ value: 6
objectReference: {fileID: 0}
- target: {fileID: 4370585583712565816, guid: 2dc8e29e6890c4b47afaad8f0bdd7e74,
type: 3}
@@ -19518,7 +19523,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &949809384
PrefabInstance:
@@ -20799,7 +20804,7 @@ Transform:
- {fileID: 332738262}
- {fileID: 95957520}
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1106812198
PrefabInstance:
@@ -23531,53 +23536,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1425821235}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &1436487108
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_RootOrder
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalPosition.x
- value: 723.7074
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.77
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalPosition.z
- value: 570.137
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.18597972
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0.9825536
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4960964548591436, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -158.563
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 114783869016024064, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- - {fileID: 114884937775178486, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
- m_SourcePrefab: {fileID: 100100000, guid: d2de1a3f8c7bad342aaa43012040af4b, type: 3}
--- !u!4 &1439680125 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4237741520885958, guid: 8ad137f6808375f4e885d60451f0c4fc,
diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs
index 77854c3..99435f5 100644
--- a/Assets/Scripts/PlayerMovement.cs
+++ b/Assets/Scripts/PlayerMovement.cs
@@ -9,9 +9,7 @@ public class PlayerMovement : MonoBehaviour
//Déplacement
public float walkSpeed;
- public float sprintSpeed;
public float turnSpeed;
- public float jumpForce;
public Vector3 jumpSpeed;
// Attaque
--
GitLab