diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
index b84224ceb274c8c5a66175f95b971ab32ad70c38..8de6bb15c7a95cd85fdab918a4eed51167d86c98 100644
--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -756,12 +756,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dcebe77ef51f6b409b7e10aa9028a43, type: 3}
m_Name:
m_EditorClassIdentifier:
- nextYear:
+ nextYear: 1875
year: {fileID: 672131795}
city: {fileID: 1075515021}
scene: Niveau1
animmator: {fileID: 1460786684}
- name: GAME OVER
+ name: "D\xFCsseldorf"
--- !u!4 &1459655252
Transform:
m_ObjectHideFlags: 0
@@ -1166,7 +1166,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
propertyPath: m_Color.r
- value: 0.9528302
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7659010468970738341, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
propertyPath: m_Name
diff --git a/Assets/Scenes/sceneTanguy.unity b/Assets/Scenes/sceneTanguy.unity
index 2a5aaefc4d9ecdf2472985bb5efc087eda3afcbf..458832f7073258d18229a50d41a1625b9c8c040f 100644
--- a/Assets/Scenes/sceneTanguy.unity
+++ b/Assets/Scenes/sceneTanguy.unity
@@ -341,6 +341,10 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 9185901235847042338, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SortingOrder
+ value: -1
+ objectReference: {fileID: 0}
- target: {fileID: 9185901235847042339, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_Pivot.x
value: 0
@@ -759,6 +763,207 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
+--- !u!1 &378742029
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 378742030}
+ - component: {fileID: 378742032}
+ - component: {fileID: 378742031}
+ m_Layer: 5
+ m_Name: City
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &378742030
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 378742029}
+ 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: []
+ m_Father: {fileID: 916199388}
+ m_RootOrder: 1
+ 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: 84, y: -42}
+ m_SizeDelta: {x: 331.2151, y: 62.1028}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &378742031
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 378742029}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: '
+
+'
+--- !u!222 &378742032
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 378742029}
+ m_CullTransparentMesh: 1
+--- !u!1 &388904383
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 388904387}
+ - component: {fileID: 388904386}
+ - component: {fileID: 388904385}
+ - component: {fileID: 388904384}
+ - component: {fileID: 388904388}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &388904384
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 388904383}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &388904385
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 388904383}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &388904386
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 388904383}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &388904387
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 388904383}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_Children:
+ - {fileID: 916199388}
+ m_Father: {fileID: 0}
+ m_RootOrder: 44
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!95 &388904388
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 388904383}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 9b389855dca6c1a409f7f8c6b5762d70, 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
--- !u!1001 &489539845
PrefabInstance:
m_ObjectHideFlags: 0
@@ -987,6 +1192,115 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
+--- !u!1001 &596799311
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 388904387}
+ m_Modifications:
+ - target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_Color.b
+ value: 0.013616921
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_Color.g
+ value: 0.013616921
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_Color.r
+ value: 0.9622642
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010468970738341, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_Name
+ value: Image
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 2641.5908
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 2056.9824
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -2614
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
--- !u!1001 &598739410
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1163,6 +1477,11 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1705879581494847332, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
m_PrefabInstance: {fileID: 199597654}
m_PrefabAsset: {fileID: 0}
+--- !u!224 &916199388 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ m_PrefabInstance: {fileID: 596799311}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &964600126
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1337,6 +1656,87 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f33cf3cdc7d9b2043bb8287db4107514, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1097822113
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1097822114}
+ - component: {fileID: 1097822116}
+ - component: {fileID: 1097822115}
+ m_Layer: 0
+ m_Name: Year
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1097822114
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097822113}
+ 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: []
+ m_Father: {fileID: 916199388}
+ m_RootOrder: 0
+ 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: 84, y: 31.051}
+ m_SizeDelta: {x: 331.2151, y: 62.1028}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1097822115
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097822113}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: '
+
+'
+--- !u!222 &1097822116
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097822113}
+ m_CullTransparentMesh: 1
--- !u!1 &1104949079
GameObject:
m_ObjectHideFlags: 0
@@ -9681,6 +10081,72 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1383502640
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1383502643}
+ - component: {fileID: 1383502642}
+ - component: {fileID: 1383502641}
+ m_Layer: 0
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1383502641
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1383502640}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
+--- !u!114 &1383502642
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1383502640}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 10
+--- !u!4 &1383502643
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1383502640}
+ 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: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 43
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1408464781
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10158,6 +10624,7 @@ MonoBehaviour:
dialogText: {fileID: 1364180986}
dialog: 0
dialogActive: 1
+ situation:
--- !u!1001 &1935144662
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10443,6 +10910,88 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
+--- !u!1 &2061597248
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2061597252}
+ - component: {fileID: 2061597251}
+ - component: {fileID: 2061597250}
+ - component: {fileID: 2061597249}
+ m_Layer: 0
+ m_Name: SceneController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!95 &2061597249
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2061597248}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 9b389855dca6c1a409f7f8c6b5762d70, 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
+--- !u!114 &2061597250
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2061597248}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5d888d62879d8e841bb450bce623de31, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &2061597251
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2061597248}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5dcebe77ef51f6b409b7e10aa9028a43, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ nextYear:
+ year: {fileID: 1097822115}
+ city: {fileID: 378742031}
+ scene: Menu
+ animmator: {fileID: 388904388}
+ name: GAME OVER
+--- !u!4 &2061597252
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2061597248}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 431.38956, y: 435.6071, z: -68.97981}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 45
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2081225286
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Player/PlayerNature.cs b/Assets/Scripts/Player/PlayerNature.cs
index bf5afe0c73ef897ed0cd934ad0b7e7cc99f20d33..b4ad989e1c86181ccfa689ea05bc8eab47a7d9f3 100644
--- a/Assets/Scripts/Player/PlayerNature.cs
+++ b/Assets/Scripts/Player/PlayerNature.cs
@@ -51,9 +51,6 @@ public class PlayerNature : MonoBehaviour
this.LooseNature(this.TimeDamage);
}
-
- if (this.currentNature < 0)
- GameOver();
}
// Perd un certain nombre de points de nature
@@ -75,14 +72,6 @@ public class PlayerNature : MonoBehaviour
this.natureBar.SetValue(this.currentNature);
}
- private void GameOver()
- {
-
- }
-
-
-
-
// Singleton
private void Awake()
diff --git a/Assets/Scripts/Scene/loadScene.cs b/Assets/Scripts/Scene/loadScene.cs
index 7870a38fa66dd3f1cca61b24d488a2869e0aeb71..4dce656f2efddd66b7cc863ac3bf41ee8bc1d4b9 100644
--- a/Assets/Scripts/Scene/loadScene.cs
+++ b/Assets/Scripts/Scene/loadScene.cs
@@ -1,11 +1,11 @@
using System.Collections;
using System.Collections.Generic;
+using System;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
-/// <summary>
-/// Ce script n'est plus utilisé
-/// </summary>
+
+
public class loadScene : MonoBehaviour
{
public string nextYear;
@@ -15,18 +15,23 @@ public class loadScene : MonoBehaviour
public string scene;
public Animator animmator;
public string name;
- public void ChargerScene() {
- animmator.SetBool("Change",true);
- year.text=""+nextYear;
- city.text=name;
+
+
+ public void ChargerScene()
+ {
+ animmator.SetBool("Change", true);
+ year.text = "" + nextYear;
+ city.text = name;
StartCoroutine(nextLevelTimer());
}
private IEnumerator nextLevelTimer()
{
yield return new WaitForSeconds(5);
+
SceneManager.LoadScene(scene);
+
}
@@ -37,7 +42,11 @@ public class loadScene : MonoBehaviour
// Update is called once per frame
void Update()
{
-
+ if(PlayerNature.instance.currentNature <= 0)
+ {
+ ChargerScene();
+ PlayerNature.instance.currentNature = 100;
+ }
}
public void ExitGame()