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 514c4d46c829ac09627b1d2e2fb02d7742437f8e..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
diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity
index a7dfde46ca8b9d5ea0643804eaef4cac7e549c00..7961b63d7aea1f88d7ecea2367ce4b598b77bed4 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: 100
+ value: 70
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264872, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_SortingOrder
@@ -2432,11 +2432,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.x
- value: -14.6
+ value: 25.88
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.y
- value: 38.73
+ value: 1.19
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.z
@@ -5083,6 +5083,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
@@ -5099,6 +5143,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
@@ -5111,6 +5171,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
@@ -5119,6 +5215,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
@@ -5127,6 +5259,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
@@ -5215,6 +5359,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
@@ -10799,46 +10987,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
@@ -10873,7 +11021,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 2
- m_TileSpriteIndex: 49
+ m_TileSpriteIndex: 56
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -10883,7 +11031,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 3
- m_TileSpriteIndex: 48
+ m_TileSpriteIndex: 55
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -10893,7 +11041,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 4
- m_TileSpriteIndex: 47
+ m_TileSpriteIndex: 54
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -11023,7 +11171,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 28
- m_TileSpriteIndex: 25
+ m_TileSpriteIndex: 53
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -11219,6 +11367,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
@@ -11259,6 +11427,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
@@ -14381,16 +14569,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
@@ -14399,6 +14577,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
@@ -14413,6 +14593,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
@@ -14479,7 +14667,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
@@ -14523,11 +14711,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
@@ -14535,13 +14723,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
@@ -55784,7 +55972,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
@@ -55804,8 +55992,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
@@ -55824,7 +56012,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
@@ -55865,7 +56053,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2041949052}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -11.13, y: 39.12, 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 b0f0e17020c3a45c1784be8eea71d54382db77f5..5ccfd6e37cc6070f33edc5404febb39bfc0dcc58 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -46,33 +46,12 @@ public class Dialog : MonoBehaviour
this.dialog = 0;
string[] DialogsLvl1 = {
- "Coucou",
- "Je fais un test pour le niveau 1",
- "Ca marche bien nan ?",
- "Melvyn t moch",
- "Valentin aussi",
- "Raff est pas bo"
+ "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", DialogsLvl1);
- 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);
-
string[] boutiqueChaussure = {
"Je fous prendrais zes chauzzures en taille Zweiundvierzig Bitte !",
@@ -127,6 +106,7 @@ 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;
@@ -138,7 +118,7 @@ public class Dialog : MonoBehaviour
this.setSituation("marchand");
}
-
+ */
if(this.dialogActive)
{
this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);