diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 44d4d23d619810b73a092bfb1a95ccf91fefaa6b..447fc9bbec1d2d71a1a3ed2e32a7d6de1744dedd 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -14,9 +14,10 @@ GameObject:
- component: {fileID: 1206561506436264874}
- component: {fileID: 1206561506436264875}
- component: {fileID: -6286016664533736427}
+ - component: {fileID: 6134360248180697739}
m_Layer: 0
m_Name: Player
- m_TagString: Untagged
+ m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -136,6 +137,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 75
+ currentState: 0
--- !u!114 &-6286016664533736427
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -151,3 +153,22 @@ MonoBehaviour:
maxNature: 100
currentNature: 0
natureBar: {fileID: 0}
+--- !u!95 &6134360248180697739
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1206561506436264884}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 622c321d3e0984dad8b20ba6a71d05d3, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Assets/Scenes/Valentin.unity b/Assets/Scenes/Valentin.unity
index c3c99eba4141b4b876dffc0bc75dddd6910f4ab4..8cda1c797091a69a73d59ead4c91c00286b314a2 100644
--- a/Assets/Scenes/Valentin.unity
+++ b/Assets/Scenes/Valentin.unity
@@ -219,8 +219,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 28ea63413f02b427485eabebfddf3ae4, type: 3}
m_Name:
m_EditorClassIdentifier:
- target: {fileID: 1566297805}
- smoothing: 0.6
+ target: {fileID: 848529838}
+ smoothing: 0.9
maxPosition: {x: 21, y: 6}
minPosition: {x: -20, y: -9}
--- !u!1 &749746675
@@ -1346,6 +1346,11 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
+--- !u!4 &848529838 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+ m_PrefabInstance: {fileID: 1883734374}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &866635828
GameObject:
m_ObjectHideFlags: 0
@@ -1909,11 +1914,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
---- !u!4 &1566297805 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- m_PrefabInstance: {fileID: 1206561506050437115}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1733108886
GameObject:
m_ObjectHideFlags: 0
@@ -17152,97 +17152,24 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!114 &1820275358 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 9185901236199156311, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
- m_PrefabInstance: {fileID: 892848102}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f33cf3cdc7d9b2043bb8287db4107514, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!1 &1937963257
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1937963259}
- - component: {fileID: 1937963258}
- m_Layer: 0
- m_Name: Grid
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!156049354 &1937963258
-Grid:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1937963257}
- m_Enabled: 1
- m_CellSize: {x: 1, y: 1, z: 0}
- m_CellGap: {x: 0, y: 0, z: 0}
- m_CellLayout: 0
- m_CellSwizzle: 0
---- !u!4 &1937963259
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1937963257}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 866635829}
- - {fileID: 749746676}
- - {fileID: 1733108887}
- m_Father: {fileID: 0}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1206561506050437115
+--- !u!1001 &1883734374
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: maxNature
- value: 200
- objectReference: {fileID: 0}
- - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: natureBar
- value:
- objectReference: {fileID: 1820275358}
- - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: currentNature
- value: 100
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: speed
- value: 25
- objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.x
- value: -6.7
+ value: -6.6508474
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.y
- value: 2
+ value: 1.3086643
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.z
@@ -17282,27 +17209,49 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
---- !u!1 &1206561506050437116 stripped
+--- !u!1 &1937963257
GameObject:
- m_CorrespondingSourceObject: {fileID: 1206561506436264884, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- m_PrefabInstance: {fileID: 1206561506050437115}
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
---- !u!95 &1206561506050437117
-Animator:
- serializedVersion: 3
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1937963259}
+ - component: {fileID: 1937963258}
+ m_Layer: 0
+ m_Name: Grid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!156049354 &1937963258
+Grid:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1206561506050437116}
+ m_GameObject: {fileID: 1937963257}
m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 622c321d3e0984dad8b20ba6a71d05d3, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorControllerStateOnDisable: 0
+ m_CellSize: {x: 1, y: 1, z: 0}
+ m_CellGap: {x: 0, y: 0, z: 0}
+ m_CellLayout: 0
+ m_CellSwizzle: 0
+--- !u!4 &1937963259
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1937963257}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 866635829}
+ - {fileID: 749746676}
+ - {fileID: 1733108887}
+ m_Father: {fileID: 0}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/sceneTanguy.unity b/Assets/Scenes/sceneTanguy.unity
index b650df8d232b609a1d78584320eaf0dfc6e137ff..b43a3a495881426b3ccea11269b5b4b0ba69cbca 100644
--- a/Assets/Scenes/sceneTanguy.unity
+++ b/Assets/Scenes/sceneTanguy.unity
@@ -262,7 +262,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 319329289}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -10}
+ m_LocalPosition: {x: -8.35, y: -3.61, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -280,8 +280,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 28ea63413f02b427485eabebfddf3ae4, type: 3}
m_Name:
m_EditorClassIdentifier:
- target: {fileID: 1130743936}
+ target: {fileID: 0}
smoothing: 0.6
+ maxPosition: {x: 9.73, y: 4.8}
+ minPosition: {x: -8.35, y: -3.61}
--- !u!1 &1050834082
GameObject:
m_ObjectHideFlags: 0
@@ -324,7 +326,7 @@ Transform:
m_Children:
- {fileID: 1104949080}
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1104949079
GameObject:
@@ -8260,22 +8262,6 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!4 &1130743936 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- m_PrefabInstance: {fileID: 2055149492}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &1465314674 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 9185901236199156311, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
- m_PrefabInstance: {fileID: 1982678461}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f33cf3cdc7d9b2043bb8287db4107514, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1001 &1982678461
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8301,7 +8287,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9185901235847042339, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 9185901235847042339, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_AnchorMax.x
@@ -8381,71 +8367,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
---- !u!1001 &2055149492
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: natureBar
- value:
- objectReference: {fileID: 1465314674}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_RootOrder
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalPosition.x
- value: -3.26
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.13
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264884, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_Name
- value: Player
- objectReference: {fileID: 0}
- - target: {fileID: 1206561506436264884, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- propertyPath: m_TagString
- value: Player
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
--- !u!1001 &480113694882563883
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8455,7 +8376,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 480113695441922077, guid: 9cdcd3ac7314fd649bf366c8fd2a4460, type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 480113695441922077, guid: 9cdcd3ac7314fd649bf366c8fd2a4460, type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Scripts/Camera/CameraMouvement.cs b/Assets/Scripts/Camera/CameraMouvement.cs
index bdd97229ad54862977071183b9e8895474511922..c741662422010091e8e83d131a538cc2b208e78a 100644
--- a/Assets/Scripts/Camera/CameraMouvement.cs
+++ b/Assets/Scripts/Camera/CameraMouvement.cs
@@ -1,5 +1,8 @@
-using System.Collections;
-using System.Collections.Generic;
+/*
+ * Script par Valentin Bloch
+ *
+ */
+
using UnityEngine;
public class CameraMouvement : MonoBehaviour
@@ -12,19 +15,20 @@ public class CameraMouvement : MonoBehaviour
// Start is called before the first frame update
void Start()
{
-
+
}
// Update is called once per frame
void LateUpdate()
{
- if(transform.position != target.position){
- Vector3 targetPosition = new Vector3(target.position.x, target.position.y,transform.position.z);
+ if (transform.position != target.position)
+ {
+ Vector3 targetPosition = new Vector3(target.position.x, target.position.y, transform.position.z);
targetPosition.x = Mathf.Clamp(targetPosition.x, minPosition.x, maxPosition.x);
targetPosition.y = Mathf.Clamp(targetPosition.y, minPosition.y, maxPosition.y);
- transform.position = Vector3.Lerp(transform.position, targetPosition, smoothing);
- }
+ transform.position = Vector3.Lerp(transform.position, targetPosition, smoothing);
+ }
}
}
diff --git a/Assets/Scripts/GUI/Bar.cs b/Assets/Scripts/GUI/Bar.cs
index bdc73c495b55bad2d10ed3a9f33fb70054963f21..5acdaa01a384f2bb787025447fd4b54437dda522 100644
--- a/Assets/Scripts/GUI/Bar.cs
+++ b/Assets/Scripts/GUI/Bar.cs
@@ -15,12 +15,12 @@ public class Bar : MonoBehaviour
public void SetMaxNature(int nature)
{
slider.maxValue = nature;
-
- this.SetValue(nature/2);
}
public void SetValue(int nature)
{
slider.value = nature;
+
+ // Debug.Log(slider.value);
}
}
diff --git a/Assets/Scripts/Player/PlayerNature.cs b/Assets/Scripts/Player/PlayerNature.cs
index 069a56ff582253446454d7a49481585690952ba1..6ad6b0bec583701dba69450653e1a3f31bf7685b 100644
--- a/Assets/Scripts/Player/PlayerNature.cs
+++ b/Assets/Scripts/Player/PlayerNature.cs
@@ -4,6 +4,8 @@
*/
using UnityEngine;
+using System;
+using System.Timers;
public class PlayerNature : MonoBehaviour
{
@@ -20,23 +22,44 @@ public class PlayerNature : MonoBehaviour
// Jauge de points de nature
public Bar natureBar;
- private Animator animator;
+ // durée en ms ou a chaque fois, le joueur perd un certain nombre de pv
+ public int duree = 1000;
+
+ // dommage pris tout les x ms si t'es dans la ville
+ public int TimeDamage;
+
+ private float nextActionTime = 0.0f;
+ public float period = 0.1f;
void Start()
{
- animator = GetComponent<Animator>();
- this.currentNature = this.maxNature / 2;
+ // initialisation des points de nature
this.natureBar.SetMaxNature(this.maxNature);
+ this.natureBar.SetValue(this.currentNature);
+
+
}
void Update()
{
+
+ //on
+ if (Time.time > nextActionTime)
+ {
+ nextActionTime += period;
+
+ this.LooseNature(this.TimeDamage);
+ }
+
// DEBUG
- if (Input.GetKeyDown(KeyCode.Space))
+ if (Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown("joystick button 0"))
this.LooseNature(1);
+
+ if (this.currentNature < 0)
+ Debug.Log("qsidjgbisdfjghb");
}
-
+
// Perd un certain nombre de points de nature
public void LooseNature(int damage)
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 5d430cfa2b57bd21cbd777b3375ca2d55508d1f4..66096c379c4843359e56ab05aef2bfe4ef040dfa 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,6 +12,9 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c4b1505032b2929262361633c133af6f9
flags: 0
RecentlyUsedScenePath-2:
+ value: 22424703114646680e0b0227036c69111a12163e252668252320092a
+ flags: 0
+ RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c4c1313191d1e2d2621253467083debf42d
flags: 0
vcSharedLogLevel: