diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 447fc9bbec1d2d71a1a3ed2e32a7d6de1744dedd..e4a6ee765618394f61f3095c41f5defacdf81bf0 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -153,6 +153,9 @@ MonoBehaviour:
maxNature: 100
currentNature: 0
natureBar: {fileID: 0}
+ duree: 1000
+ TimeDamage: 0
+ period: 0.1
--- !u!95 &6134360248180697739
Animator:
serializedVersion: 3
diff --git a/Assets/Prefabs/Shop.prefab b/Assets/Prefabs/Shop.prefab
index 3196d7fff2caae50b4ccc28231a991070fd8b3e9..6829516701842336f7ec39b2fe46e2710ca15dcd 100644
--- a/Assets/Prefabs/Shop.prefab
+++ b/Assets/Prefabs/Shop.prefab
@@ -10,7 +10,8 @@ GameObject:
m_Component:
- component: {fileID: 6996933207471714739}
- component: {fileID: -421924145509232575}
- - component: {fileID: -6252229300533940746}
+ - component: {fileID: 6595684778732623722}
+ - component: {fileID: 968398465587571092}
m_Layer: 0
m_Name: Shop
m_TagString: Untagged
@@ -72,32 +73,77 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: -5665453922479426850, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 1, y: 1}
+ m_Size: {x: 5, y: 6}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
- m_WasSpriteAssigned: 0
+ m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!114 &-6252229300533940746
-MonoBehaviour:
+--- !u!60 &6595684778732623722
+PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 96efccd7704b37949a51739ed18bbd7d, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- dialogBox: {fileID: 0}
- dialogText: {fileID: 0}
- cr: {fileID: 0}
- dialog: 0
- dialogActive: 0
- situation:
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 5, y: 6}
+ newSize: {x: 5, y: 6}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Points:
+ m_Paths:
+ - - {x: -0.875, y: 2.6875}
+ - {x: -2.125, y: 2.625}
+ - {x: -2.5, y: 2.5}
+ - {x: -2.5, y: -2.6875}
+ - {x: 2.5, y: -2.6875}
+ - {x: 2.5, y: 2.5}
+ - {x: 2.375, y: 2.6875}
+ - - {x: -1.75, y: -0.125}
+ - {x: -1.6875, y: -0.1875}
+ - {x: 1.3125, y: -0.1875}
+ - {x: 1.3125, y: -0.8125}
+ - {x: -1.75, y: -0.8125}
+--- !u!61 &968398465587571092
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 830773922753710147}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: -2.646246}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 5, y: 6}
+ newSize: {x: 5, y: 6}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 5, y: 1.9857826}
+ m_EdgeRadius: 0
diff --git a/Assets/Scenes/Valentin.unity b/Assets/Scenes/Valentin.unity
index 4a7cec68c76cb0fab956d301ca173d33c8af477b..5652559a97afa32f82d6a58457ae063a3a5867a8 100644
--- a/Assets/Scenes/Valentin.unity
+++ b/Assets/Scenes/Valentin.unity
@@ -123,63 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &56556506 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
- m_PrefabInstance: {fileID: 8964184068704032841}
- m_PrefabAsset: {fileID: 0}
---- !u!61 &56556507
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 56556506}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IsTrigger: 1
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 5, y: 6}
- newSize: {x: 5, y: 6}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 5, y: 6}
- m_EdgeRadius: 0
---- !u!61 &56556508
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 56556506}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0.38403344}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 5, y: 6}
- newSize: {x: 5, y: 6}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 5, y: 4.4390893}
- m_EdgeRadius: 0
--- !u!1 &461386753
GameObject:
m_ObjectHideFlags: 0
@@ -280,6 +223,17 @@ MonoBehaviour:
smoothing: 0.9
maxPosition: {x: 21, y: 6}
minPosition: {x: -20, y: -9}
+--- !u!114 &571909601 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 1778026432316727230, 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: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &749746675
GameObject:
m_ObjectHideFlags: 0
@@ -1971,6 +1925,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+--- !u!114 &1624355757 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 &1733108886
GameObject:
m_ObjectHideFlags: 0
@@ -17209,6 +17174,11 @@ Tilemap:
e31: 0
e32: 0
e33: 1
+--- !u!1 &1811477057 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1705879581494847332, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 892848102}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1883734374
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17216,6 +17186,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+ propertyPath: natureBar
+ value:
+ objectReference: {fileID: 1624355757}
- target: {fileID: 1206561506436264872, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_SortingLayer
value: 2
@@ -17224,6 +17198,10 @@ PrefabInstance:
propertyPath: m_SortingLayerID
value: -1803831129
objectReference: {fileID: 0}
+ - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+ propertyPath: speed
+ value: 40
+ objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_RootOrder
value: 1
@@ -17327,6 +17305,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: -6252229300533940746, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: dialogBox
+ value:
+ objectReference: {fileID: 1811477057}
+ - target: {fileID: -6252229300533940746, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: dialogText
+ value:
+ objectReference: {fileID: 571909601}
- target: {fileID: -421924145509232575, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_Size.x
value: 5
@@ -17355,6 +17341,50 @@ PrefabInstance:
propertyPath: m_Name
value: Shop
objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.size
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].x
+ value: -2.4748821
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].y
+ value: -1.7958459
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[4].x
+ value: -1.8147049
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[4].y
+ value: -1.7707291
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[5].x
+ value: 2.474883
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[5].y
+ value: -1.820963
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[6].x
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[6].y
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[7].x
+ value: 2.375
+ objectReference: {fileID: 0}
+ - target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Points.m_Paths.Array.data[0].Array.data[7].y
+ value: 2.6875
+ objectReference: {fileID: 0}
- target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_RootOrder
value: 4
diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs
index 120a8e82232d1032d94ae19a509c714a9b10e571..5728fe70e695dd4d40cfde6d552f457547f0b09e 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -125,7 +125,7 @@ public class Dialog : MonoBehaviour
}
// Ouvre une bulle de dialogue dans une situation donnée
- void Situation(string sit)
+ public void Situation(string sit)
{
this.situation = sit;
this.dialog = 0;
diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e7bdcdf5c080653ccfce3c1470bdba271fe01889
--- /dev/null
+++ b/Assets/Shopping.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Shopping : MonoBehaviour
+{
+ private bool playerInRange;
+ private Component player;
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ if (Input.GetKeyDown(KeyCode.E) && playerInRange)
+ {
+ Dialog.instance.Situation("marchand");
+
+ }
+ }
+
+ private void OnTriggerEnter2D(Collider2D collision)
+ {
+ if (collision.CompareTag("Player"))
+ {
+ playerInRange = true;
+ }
+ }
+
+ private void OnTriggerExit2D(Collider2D collision)
+ {
+ playerInRange = false;
+ player = collision;
+ }
+}
diff --git a/Assets/Shopping.cs.meta b/Assets/Shopping.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4c5481eec0db327df7a3b263beb056eca9abf127
--- /dev/null
+++ b/Assets/Shopping.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b0d67e78638d146bd8a6878c5027f9c5
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: