diff --git a/Assets/Physics.meta b/Assets/Physics.meta
deleted file mode 100644
index 46c56d2bb0a349698013582cf99d081b4616e9ca..0000000000000000000000000000000000000000
--- a/Assets/Physics.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5097a5d46361eda43b5a45ce166e49aa
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Physics/.gitkeep b/Assets/Physics/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Assets/Prefabs/GUI/BarreDenature.prefab b/Assets/Prefabs/GUI/BarreDenature.prefab
index f5f616da65bf35ec986cd84ad31c0cdb56f5d525..64ea857a9d1ed61a62038def8b9d5871411be621 100644
--- a/Assets/Prefabs/GUI/BarreDenature.prefab
+++ b/Assets/Prefabs/GUI/BarreDenature.prefab
@@ -601,7 +601,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 262, y: -82}
+ m_AnchoredPosition: {x: 276, y: -82}
m_SizeDelta: {x: 783.7002, y: 106.7631}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6308161532840785029
@@ -645,7 +645,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: Press space to continue...
+ m_Text: Press space to continue
--- !u!114 &8222045683807769845
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -658,8 +658,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
- m_EffectDistance: {x: 1, y: -1}
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.8235294}
+ m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &8044393686726401242
GameObject:
@@ -739,7 +739,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: Inventaire
+ m_Text: Infentaire
--- !u!1 &8451290368213161651
GameObject:
m_ObjectHideFlags: 0
@@ -802,7 +802,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.44705883}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
index 57cc48463589c4ff1811cc618cde5770c9d181e5..c58ee70ff1ddd6cf0c917e7a7f77810518c5df24 100644
--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -761,7 +761,7 @@ MonoBehaviour:
city: {fileID: 1075515021}
scene: sceneRaffael
animmator: {fileID: 1460786684}
- nom: Dusseldorf
+ nom: DUSSELDORF
--- !u!4 &1459655252
Transform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity
index 63df50c8b982246c54b3c530704baa8c2192ada0..1c3d83d1e579e40da9c9b88695c7b4d9f69e595f 100644
--- a/Assets/Scenes/sceneRaffael.unity
+++ b/Assets/Scenes/sceneRaffael.unity
@@ -2404,7 +2404,7 @@ PrefabInstance:
objectReference: {fileID: 593755023}
- target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: currentNature
- value: 80
+ value: 70
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264872, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_SortingOrder
@@ -2420,7 +2420,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: speed
- value: 70
+ value: 8.5
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: stage
@@ -2436,11 +2436,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.x
- value: 23.55
+ value: 25.88
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.y
- value: 1.76
+ value: 1.19
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.z
@@ -5087,6 +5087,50 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 422283776695013040, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_FontSize
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 1360714821386396631, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 1153.82
+ objectReference: {fileID: 0}
+ - target: {fileID: 1360714821386396631, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 256.08
+ objectReference: {fileID: 0}
+ - target: {fileID: 1360714821386396631, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -0.000030518
+ objectReference: {fileID: 0}
+ - target: {fileID: 1360714821386396631, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -385
+ objectReference: {fileID: 0}
+ - target: {fileID: 1778026432316727230, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_MaxSize
+ value: 55
+ objectReference: {fileID: 0}
+ - target: {fileID: 1778026432316727230, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_FontSize
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 1835591788233434329, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 1048.09
+ objectReference: {fileID: 0}
+ - target: {fileID: 1835591788233434329, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 168.11
+ objectReference: {fileID: 0}
+ - target: {fileID: 1835591788233434329, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -3.17
+ objectReference: {fileID: 0}
+ - target: {fileID: 1835591788233434329, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.17
+ objectReference: {fileID: 0}
- target: {fileID: 2147933392024235413, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_SizeDelta.x
value: 324.8188
@@ -5103,6 +5147,22 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 2695144739806175214, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 352.05
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695144739806175214, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 200.37
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695144739806175214, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 207.15997
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695144739806175214, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -209.06
+ objectReference: {fileID: 0}
- target: {fileID: 3578018028916196401, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_Color.b
value: 1
@@ -5115,6 +5175,42 @@ PrefabInstance:
propertyPath: m_Color.r
value: 0.42397022
objectReference: {fileID: 0}
+ - target: {fileID: 5714833643991437839, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 331.97
+ objectReference: {fileID: 0}
+ - target: {fileID: 5714833643991437839, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 157.81
+ objectReference: {fileID: 0}
+ - target: {fileID: 5714833643991437839, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -0.0000097752
+ objectReference: {fileID: 0}
+ - target: {fileID: 5714833643991437839, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -11.71
+ objectReference: {fileID: 0}
+ - target: {fileID: 5773380438681244941, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_MinSize
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5773380438681244941, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_FontSize
+ value: 28
+ objectReference: {fileID: 0}
+ - target: {fileID: 6658433123143694179, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 340.25
+ objectReference: {fileID: 0}
+ - target: {fileID: 6658433123143694179, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 47.734
+ objectReference: {fileID: 0}
+ - target: {fileID: 6658433123143694179, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 5.9
+ objectReference: {fileID: 0}
- target: {fileID: 7977247320747760606, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 44.80896
@@ -5123,6 +5219,42 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
+ - target: {fileID: 8599628515917749640, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: -1394.92
+ objectReference: {fileID: 0}
+ - target: {fileID: 8599628515917749640, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: -958.26
+ objectReference: {fileID: 0}
+ - target: {fileID: 8599628515917749640, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0.00012207031
+ objectReference: {fileID: 0}
+ - target: {fileID: 8599628515917749640, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 464.18
+ objectReference: {fileID: 0}
+ - target: {fileID: 8782272684317430153, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_MaxSize
+ value: 55
+ objectReference: {fileID: 0}
+ - target: {fileID: 8782272684317430153, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_MinSize
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8782272684317430153, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_FontData.m_FontSize
+ value: 45
+ objectReference: {fileID: 0}
+ - target: {fileID: 8867886190291889678, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8867886190291889678, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -97
+ objectReference: {fileID: 0}
- target: {fileID: 9185901235225783795, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
@@ -5131,6 +5263,18 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 9185901235847042338, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_Camera
+ value:
+ objectReference: {fileID: 2041949055}
+ - target: {fileID: 9185901235847042338, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_RenderMode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901235847042338, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SortingLayerID
+ value: -1803831129
+ objectReference: {fileID: 0}
- target: {fileID: 9185901235847042339, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_Pivot.x
value: 0
@@ -5219,6 +5363,50 @@ PrefabInstance:
propertyPath: m_Name
value: BarreDenature
objectReference: {fileID: 0}
+ - target: {fileID: 9185901235847042351, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236199156305, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 358.37
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236199156305, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 67.694
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236199156305, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 210.32
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236199156305, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -48.794983
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236528642289, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236528642289, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236528642289, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 66.01
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236528642289, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 76.417
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236528642289, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 9185901236528642289, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.8615
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
--- !u!4 &1399096483 stripped
@@ -5404,7 +5592,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: -11.424435, y: -9.144066}
+ m_Offset: {x: -11.424435, y: -7.6097336}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@@ -5415,7 +5603,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 49.0467, y: 7.5176697}
+ m_Size: {x: 49.0467, y: 4.449005}
m_EdgeRadius: 0
--- !u!4 &1467294797 stripped
Transform:
@@ -10803,46 +10991,6 @@ Tilemap:
m_GameObject: {fileID: 1598571161}
m_Enabled: 1
m_Tiles:
- - first: {x: 12, y: 1, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 40
- m_TileSpriteIndex: 56
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 13, y: 1, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 41
- m_TileSpriteIndex: 55
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 12, y: 2, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 42
- m_TileSpriteIndex: 54
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 13, y: 2, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 43
- m_TileSpriteIndex: 53
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: 13, y: 3, z: 0}
second:
serializedVersion: 2
@@ -10877,7 +11025,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 2
- m_TileSpriteIndex: 49
+ m_TileSpriteIndex: 56
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -10887,7 +11035,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 3
- m_TileSpriteIndex: 48
+ m_TileSpriteIndex: 55
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -10897,7 +11045,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 4
- m_TileSpriteIndex: 47
+ m_TileSpriteIndex: 54
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -11027,7 +11175,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 28
- m_TileSpriteIndex: 25
+ m_TileSpriteIndex: 53
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -11223,6 +11371,26 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
+ - first: {x: 12, y: 9, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 55
+ m_TileSpriteIndex: 49
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: 13, y: 9, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 54
+ m_TileSpriteIndex: 48
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
- first: {x: 16, y: 9, z: 0}
second:
serializedVersion: 2
@@ -11263,6 +11431,26 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
+ - first: {x: 12, y: 10, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 53
+ m_TileSpriteIndex: 47
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: 13, y: 10, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 52
+ m_TileSpriteIndex: 25
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
- first: {x: 16, y: 10, z: 0}
second:
serializedVersion: 2
@@ -14385,16 +14573,6 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 9642e15b8e5e85348926b5caf63b2f56, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d7819c1f29372794a86ffeab5c2039b3, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 914747c40f7f8984e994064ecaacbe07, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 5ec4c36c72d80ed4ca2e2c8280286c97, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 286586da120748e4192326d919ba8f70, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 86a7f4cab3e2f7947a2906b7a47248bf, type: 2}
- - m_RefCount: 91
- m_Data: {fileID: 11400000, guid: fa4952579d58f434b8af86fdd81066a3, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
@@ -14403,6 +14581,8 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
+ - m_RefCount: 91
+ m_Data: {fileID: 11400000, guid: fa4952579d58f434b8af86fdd81066a3, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
@@ -14417,6 +14597,14 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: 8fb684a53319fe04ebfdaefc605ed65b, type: 2}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: efb78ecb866618541a72757a619e60cc, type: 2}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: c7980230c4d006f4b8d991d8a3bb3c74, type: 2}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: ff0bc9697385dc9488041f852663bf81, type: 2}
- m_RefCount: 6
m_Data: {fileID: 11400000, guid: 603b5c613c18dd746a4d7ea1ec412483, type: 2}
- m_RefCount: 4
@@ -14483,7 +14671,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 1829778442542560619, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -4035382832446957438, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
+ m_Data: {fileID: 3350004809810163815, guid: daf7a004f90436d44b7350e800807623, type: 3}
- m_RefCount: 1
m_Data: {fileID: 8806494164667250962, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
@@ -14527,11 +14715,11 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 7804496093160481770, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 2101081655942667766, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
+ m_Data: {fileID: -5710720316583847276, guid: daf7a004f90436d44b7350e800807623, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -8253807065747828767, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
+ m_Data: {fileID: 3944755590341191488, guid: daf7a004f90436d44b7350e800807623, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -4856597035943072115, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
+ m_Data: {fileID: -6986749091672745172, guid: daf7a004f90436d44b7350e800807623, type: 3}
- m_RefCount: 1
m_Data: {fileID: 5390515300888648957, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
@@ -14539,13 +14727,13 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -1147168906562122949, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 7786903608194387369, guid: daf7a004f90436d44b7350e800807623, type: 3}
+ m_Data: {fileID: -4035382832446957438, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 1321063535609759881, guid: daf7a004f90436d44b7350e800807623, type: 3}
+ m_Data: {fileID: 2101081655942667766, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 3370928037850011573, guid: daf7a004f90436d44b7350e800807623, type: 3}
+ m_Data: {fileID: -8253807065747828767, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -7098020958239099497, guid: daf7a004f90436d44b7350e800807623, type: 3}
+ m_Data: {fileID: -4856597035943072115, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- m_RefCount: 4
m_Data: {fileID: -6014281745691687770, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 10
@@ -55788,7 +55976,7 @@ GameObject:
- component: {fileID: 2041949054}
- component: {fileID: 2041949053}
m_Layer: 0
- m_Name: Main Camera (1)
+ m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -55808,8 +55996,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
target: {fileID: 87062375}
smoothing: 0.9
- maxPosition: {x: 16.15, y: 74.98}
- minPosition: {x: -11.2, y: 5.01}
+ maxPosition: {x: 16.3, y: 73.85}
+ minPosition: {x: -11.33, y: 5.04}
--- !u!81 &2041949054
AudioListener:
m_ObjectHideFlags: 0
@@ -55828,7 +56016,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
- m_BackGroundColor: {r: 1, g: 0, b: 0.03915453, a: 0}
+ m_BackGroundColor: {r: 0.227451, g: 0.74509805, b: 0.25490198, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@@ -55869,7 +56057,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2041949052}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 15.28, y: 5.47, z: -10}
+ m_LocalPosition: {x: 16.3, y: 5.1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs
index 9abb0f2f14b5f0261fe84076f9390af512e0983b..65bd044b78cfac3c016f5d295d026e15f3a34acd 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -45,30 +45,12 @@ public class Dialog : MonoBehaviour
this.dialog = 0;
- string[] DialogsStart = {
- "Ach... Encore ein gute chournée dans mon fillage!",
+ string[] DialogsLvl1 = {
+ "Ach... Encore eine gute chournée dans mon fillage!",
"Ch'ai très enfie te me balader",
"Che defrai aller au Nord dans la forêt ja !"
};
-
-
- this.ListDialogs.Add("start", DialogsStart);
-
- string[] Dialogsraff = {
- "Salut",
- "cava ?",
- "Je te mange tes morts"
- };
-
- this.ListDialogs.Add("pnj", Dialogsraff);
-
- string[] DialogsTest = {
- "Je fais un test",
- "ca marche ? ou pas ?",
- "bisous"
- };
-
- this.ListDialogs.Add("test", DialogsTest);
+ this.ListDialogs.Add("start", DialogsLvl1);
string[] boutiqueChaussure = {
@@ -124,18 +106,6 @@ public class Dialog : MonoBehaviour
if ((Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown("joystick button 0")) && dialogActive)
this.Next();
- // // DEBUG
- // if ((Input.GetKeyDown(KeyCode.H) || Input.GetKeyDown("joystick button 1")))
- // this.dialogActive = !this.dialogActive;
-
- // // DEBUG
- // if (Input.GetKeyDown(KeyCode.F))
- // {
- // Debug.Log("tut");
-
- // this.setSituation("marchand");
- // }
-
if (this.dialogActive)
{
this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);
diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs
index da1b0b976b422cc1517e0e7d0c391655767177db..6dcf98ae44a0e6d19ea9feec4e81648dc8b57624 100644
--- a/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Assets/Scripts/Player/PlayerMovement.cs
@@ -15,7 +15,7 @@ public class PlayerMovement : MonoBehaviour
{
public float speed;
private Rigidbody2D myRigidbody;
- private Vector3 change;
+ private Vector2 moveDirection;
private Animator animator;
public PlayerState currentState;
public int stage = 0;
@@ -39,22 +39,52 @@ public class PlayerMovement : MonoBehaviour
// Update is called once per frame
void Update()
{
-
- change = Vector3.zero;
- change.x = Input.GetAxisRaw("Horizontal");
- change.y = Input.GetAxisRaw("Vertical");
+ ProcessInputs();
if(currentState == PlayerState.walk)
{
UpdateAnimationAndMove();
}
-
Vector3 pos = Camera.main.WorldToViewportPoint(transform.position);
pos.x = Mathf.Clamp01(pos.x);
pos.y = Mathf.Clamp01(pos.y);
transform.position = Camera.main.ViewportToWorldPoint(pos);
+ gameIntelligence();
+ }
+
+ private void FixedUpdate()
+ {
+ moveDirection.Normalize();
+ myRigidbody.velocity = new Vector2(moveDirection.x * speed, moveDirection.y * speed);
+ }
+
+ private void ProcessInputs()
+ {
+ float moveX = Input.GetAxisRaw("Horizontal");
+ float moveY = Input.GetAxisRaw("Vertical");
+ moveDirection = new Vector2(moveX, moveY);
+ }
+
+ void UpdateAnimationAndMove()
+ {
+ if (moveDirection != Vector2.zero)
+ {
+
+ animator.SetFloat("moveX", moveDirection.x);
+ animator.SetFloat("moveY", moveDirection.y);
+
+ animator.SetBool("moving", true);
+ }
+ else
+ {
+ animator.SetBool("moving", false);
+ }
+ }
+
+ void gameIntelligence()
+ {
if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 0)
{
GenerateMap.instance.generateBoutique(0, 1, "chaussure");
@@ -96,26 +126,4 @@ public class PlayerMovement : MonoBehaviour
stage++;
}
}
-
- void MoveCharacter()
- {
- change.Normalize();
- myRigidbody.MovePosition(transform.position + change * speed * Time.deltaTime);
- }
-
- void UpdateAnimationAndMove()
- {
- if (change != Vector3.zero)
- {
- MoveCharacter();
- animator.SetFloat("moveX", change.x);
- animator.SetFloat("moveY", change.y);
-
- animator.SetBool("moving", true);
- }
- else
- {
- animator.SetBool("moving", false);
- }
- }
}
diff --git a/Assets/Scripts/Player/PlayerNature.cs b/Assets/Scripts/Player/PlayerNature.cs
index 29c9778abcdd786f035c437cc782aba220eb8237..f71f55ceeaae9c0484e6f9045be4d8a829721d4c 100644
--- a/Assets/Scripts/Player/PlayerNature.cs
+++ b/Assets/Scripts/Player/PlayerNature.cs
@@ -8,6 +8,8 @@ using System;
using System.Timers;
public class PlayerNature : MonoBehaviour
+
+
{
// l'instance de PlayerNature (pour un singleton)
@@ -39,8 +41,6 @@ public class PlayerNature : MonoBehaviour
}
-
-
void Update()
{
diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs
index 54ee3994efc8fa05f65964ce3d24f736d442e863..2e7065896430342572375dfc0e71b7e74ca18251 100644
--- a/Assets/Shopping.cs
+++ b/Assets/Shopping.cs
@@ -55,6 +55,7 @@ public class Shopping : MonoBehaviour
if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown("joystick button 1")) && playerInRange && sellItem && itemForSale.Count > 0)
{
+ PlayerNature.instance.LooseNature(25);
switch (sellItem.id)
{
case 1:
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index ca77a8b3ade4914cc1f674b87f06ad45eac094ce..d237ebf8a1b6c54d2b16037ece89b2eb76ba0fae 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,7 +5,10 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- - enabled: 1
+ - enabled: 0
+ path: Assets/Scenes/Niveau1.unity
+ guid: 2cda990e2423bbf4892e6590ba056729
+ - enabled: 0
path: Assets/Scenes/Menu.unity
guid: 458707c07ba6b4b4297fc1de6ac38622
- enabled: 1
@@ -14,10 +17,10 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/sceneRaffael.unity
guid: bdf7662389bf8487c9a7909d08af8c3e
- - enabled: 1
+ - enabled: 0
path: Assets/Scenes/Valentin.unity
guid: 8c9ceab1c999ea749aa0fe2b0c87b0bf
- - enabled: 1
+ - enabled: 0
path: Assets/Scenes/Niveau2.unity
guid: 4ae30febc4f91474fa9164b85521aaf5
- enabled: 1