diff --git a/Assets/Animations/Transition/CircleSwipe.anim b/Assets/Animations/Transition/CircleSwipe.anim
index b583ceb829b71a348f72d0859c45a81292a4303d..50eb8c856261c27a757afde2658c714f2cbb1777 100644
--- a/Assets/Animations/Transition/CircleSwipe.anim
+++ b/Assets/Animations/Transition/CircleSwipe.anim
@@ -22,7 +22,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -989
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -30,8 +30,36 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1.4166666
- value: -21
+ time: 1.1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_AnchoredPosition.y
+ path: Image
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2203
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.1
+ value: -65
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -60,13 +88,20 @@ AnimationClip:
typeID: 224
customType: 28
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 83635035
+ attribute: 538195251
+ script: {fileID: 0}
+ typeID: 224
+ customType: 28
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1.4166666
+ m_StopTime: 1.1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -87,7 +122,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -989
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_AnchoredPosition.y
+ path: Image
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2203
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -95,8 +158,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1.4166666
- value: -21
+ time: 1.1
+ value: -65
inSlope: 0
outSlope: 0
tangentMode: 136
diff --git a/Assets/Import/Font/Fipps-Regular.otf b/Assets/Import/Font/Fipps-Regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..9334dad594277ba8339786217d75260e58436dc8
Binary files /dev/null and b/Assets/Import/Font/Fipps-Regular.otf differ
diff --git a/Assets/Import/Font/Fipps-Regular.otf.meta b/Assets/Import/Font/Fipps-Regular.otf.meta
new file mode 100644
index 0000000000000000000000000000000000000000..b399743a4cc02dd0c6d20d6d040a062c93307ab0
--- /dev/null
+++ b/Assets/Import/Font/Fipps-Regular.otf.meta
@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: f87b456a2cdbb5140a790b3e369cb961
+TrueTypeFontImporter:
+ externalObjects: {}
+ serializedVersion: 4
+ fontSize: 16
+ forceTextureCase: -2
+ characterSpacing: 0
+ characterPadding: 1
+ includeFontData: 1
+ fontNames:
+ - Fipps
+ fallbackFontReferences: []
+ customCharacters:
+ fontRenderingMode: 0
+ ascentCalculationMode: 1
+ useLegacyBoundsCalculation: 0
+ shouldRoundAdvanceValue: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/GUI/BarreDenature.prefab b/Assets/Prefabs/GUI/BarreDenature.prefab
index 2adb2d8d52a5773cd907911a60043c89856d3535..40d6795ea274d1688ea906d8b2b24ea10e9129c7 100644
--- a/Assets/Prefabs/GUI/BarreDenature.prefab
+++ b/Assets/Prefabs/GUI/BarreDenature.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 1835591788233434329}
- component: {fileID: 7952431289706890423}
- component: {fileID: 1778026432316727230}
+ - component: {fileID: 1755674381398346320}
m_Layer: 5
m_Name: TexteDeLaBulle
m_TagString: Untagged
@@ -79,6 +80,24 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Je mange tes morts sale batard
+--- !u!114 &1755674381398346320
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 512403696824737883}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 96efccd7704b37949a51739ed18bbd7d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ dialogBox: {fileID: 1705879581494847332}
+ dialogText: {fileID: 1778026432316727230}
+ cr: {fileID: 4793196200597776703}
+ dialog: 0
+ dialogActive: 1
+ situation:
--- !u!1 &1705879581494847332
GameObject:
m_ObjectHideFlags: 0
@@ -104,7 +123,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1705879581494847332}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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:
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
index e1ad7e826ac1f956096c8e4d91a75bd815f594dc..1fb56e57b86109f95df77999a38bbeb123f485ca 100644
--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -413,7 +413,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: 3, y: 33}
+ m_AnchoredPosition: {x: 84, y: 31.051}
m_SizeDelta: {x: 331.2151, y: 62.1028}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1075515019
@@ -450,7 +450,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: 3, y: -37}
+ m_AnchoredPosition: {x: 84, y: -42}
m_SizeDelta: {x: 331.2151, y: 62.1028}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1075515021
@@ -759,7 +759,7 @@ MonoBehaviour:
nextYear: 1875
year: {fileID: 672131795}
city: {fileID: 1075515021}
- scene: Melvyn
+ scene: Niveau1
animmator: {fileID: 1460786684}
--- !u!4 &1459655252
Transform:
@@ -1189,11 +1189,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
propertyPath: m_SizeDelta.x
- value: 1118.2858
+ value: 2641.5908
objectReference: {fileID: 0}
- target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
propertyPath: m_SizeDelta.y
- value: 1153.8844
+ value: 2056.9824
objectReference: {fileID: 0}
- target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
propertyPath: m_LocalPosition.x
@@ -1225,7 +1225,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
propertyPath: m_AnchoredPosition.x
- value: -989
+ value: -2608
objectReference: {fileID: 0}
- target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
propertyPath: m_AnchoredPosition.y
diff --git a/Assets/Scenes/Niveau1.unity b/Assets/Scenes/Niveau1.unity
index 09c50d7523e9d030c25a69a0253afc7d0d4ff33b..f40afec5aaf0bb09a189d70b9aec2c97536936b5 100644
--- a/Assets/Scenes/Niveau1.unity
+++ b/Assets/Scenes/Niveau1.unity
@@ -3171,6 +3171,87 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
+--- !u!1 &256649259
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 256649263}
+ - component: {fileID: 256649262}
+ - component: {fileID: 256649261}
+ - component: {fileID: 256649260}
+ m_Layer: 0
+ m_Name: SceneController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!95 &256649260
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 256649259}
+ 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 &256649261
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 256649259}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5d888d62879d8e841bb450bce623de31, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &256649262
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 256649259}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5dcebe77ef51f6b409b7e10aa9028a43, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ nextYear: 1876
+ year: {fileID: 1841673933}
+ city: {fileID: 1393222696}
+ scene: Niveau2
+ animmator: {fileID: 920174281}
+--- !u!4 &256649263
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 256649259}
+ 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: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &286967853
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3757,6 +3838,108 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 212950525}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &878493811
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 920174280}
+ m_Modifications:
+ - 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: -2608
+ 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!224 &878493812 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+ m_PrefabInstance: {fileID: 878493811}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &879636828
GameObject:
m_ObjectHideFlags: 0
@@ -14451,6 +14634,126 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 893700138}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &920174276
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 920174280}
+ - component: {fileID: 920174279}
+ - component: {fileID: 920174278}
+ - component: {fileID: 920174277}
+ - component: {fileID: 920174281}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &920174277
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 920174276}
+ 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 &920174278
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 920174276}
+ 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 &920174279
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 920174276}
+ 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 &920174280
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 920174276}
+ 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: 878493812}
+ m_Father: {fileID: 0}
+ m_RootOrder: 8
+ 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 &920174281
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 920174276}
+ 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 &961806637
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15009,6 +15312,87 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 1389445376}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1393222695
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1393222698}
+ - component: {fileID: 1393222697}
+ - component: {fileID: 1393222696}
+ m_Layer: 5
+ m_Name: City
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1393222696
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1393222695}
+ 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 &1393222697
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1393222695}
+ m_CullTransparentMesh: 1
+--- !u!224 &1393222698
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1393222695}
+ 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: 878493812}
+ 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!1001 &1450573067
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15078,6 +15462,72 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+--- !u!1 &1464490954
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1464490957}
+ - component: {fileID: 1464490956}
+ - component: {fileID: 1464490955}
+ m_Layer: 0
+ m_Name: EventSystem (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1464490955
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1464490954}
+ 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 &1464490956
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1464490954}
+ 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 &1464490957
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1464490954}
+ 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: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1511605078 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
@@ -15360,6 +15810,87 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 1839207176}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1841673930
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1841673931}
+ - component: {fileID: 1841673932}
+ - component: {fileID: 1841673933}
+ m_Layer: 0
+ m_Name: Year
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1841673931
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841673930}
+ 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: 878493812}
+ 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!222 &1841673932
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841673930}
+ m_CullTransparentMesh: 1
+--- !u!114 &1841673933
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841673930}
+ 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!1001 &1914953549
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15479,6 +16010,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 480113695441922077, guid: 9cdcd3ac7314fd649bf366c8fd2a4460, type: 3}
m_PrefabInstance: {fileID: 1255072614}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1986186788 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1705879581494847332, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 1097604857}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &2003690271
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15541,6 +16077,38 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 2003690271}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2023540884 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 512403696824737883, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 1097604857}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &2023540886 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 1778026432316727230, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 1097604857}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2023540884}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &2023540888
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2023540884}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 96efccd7704b37949a51739ed18bbd7d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ dialogBox: {fileID: 1986186788}
+ dialogText: {fileID: 2023540886}
+ dialog: 0
+ dialogActive: 1
--- !u!4 &2053511971 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
diff --git a/Assets/Scenes/Niveau2.unity b/Assets/Scenes/Niveau2.unity
index 4bce2378c07d0f59a0dadc569e7f71399c86e755..c36e1fe6df768d730793263cc5d8764964236f27 100644
--- a/Assets/Scenes/Niveau2.unity
+++ b/Assets/Scenes/Niveau2.unity
@@ -254,10 +254,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+ propertyPath: period
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: natureBar
value:
objectReference: {fileID: 965246246}
+ - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+ propertyPath: TimeDamage
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 1206561506436264874, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_Size.y
value: 1.0000005
diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs
index e2f18be75c89e02cd821d69be74a4d46dc61b57e..d12ef42ba9238178732749b46d35fcc1a911f903 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -10,10 +10,29 @@ using UnityEngine.SceneManagement;
public class Dialog : MonoBehaviour
{
+
+ // singleton
+ public static Dialog instance;
+
+ private void Awake()
+ {
+ if (instance != null)
+ {
+ Debug.LogWarning("Il y a + d'une instance de PlayerNature");
+ return;
+ }
+
+ instance = this;
+ }
+
+
+
public GameObject dialogBox;
public Text dialogText;
+ public CanvasRenderer cr;
public int dialog;
public bool dialogActive;
+ public string situation;
// clé : nom de la scène
@@ -23,6 +42,7 @@ public class Dialog : MonoBehaviour
// Start is called before the first frame update
void Start()
{
+
this.dialog = 0;
string[] DialogsLvl1 = {
@@ -30,13 +50,38 @@ public class Dialog : MonoBehaviour
"Je fais un test pour le niveau 1",
"Ca marche bien nan ?",
"Melvyn t moch",
- "Valentin aussi"
+ "Valentin aussi",
+ "Raff est pas bo"
};
- this.ListDialogs.Add("Niveau2", DialogsLvl1);
+
+ 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[] DialogMarchand = {
+ "Ouvrir le menu c'est avec",
+ "la touche E chacal"
+ };
+
+ this.ListDialogs.Add("marchand", DialogMarchand);
if (this.dialogActive)
- this.dialogText.text = this.ListDialogs[SceneManager.GetActiveScene().name][0];
+ this.Situation("start");
}
// Update is called once per frame
@@ -49,26 +94,45 @@ public class Dialog : MonoBehaviour
if ((Input.GetKeyDown(KeyCode.H) || Input.GetKeyDown("joystick button 1")))
this.dialogActive = !this.dialogActive;
- if (!dialogActive)
+ // DEBUG
+ if (Input.GetKeyDown(KeyCode.F))
+ {
+ Debug.Log("tut");
+
+ this.Situation("marchand");
+ }
+
+ if(this.dialogActive)
{
- this.dialogBox.SetActive(false);
+ this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);
+ this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(1f);
}
else
{
- this.dialogBox.SetActive(true);
+ this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
}
void Next()
{
- string sceneActuelle = SceneManager.GetActiveScene().name;
-
- if (this.dialog >= this.ListDialogs[sceneActuelle].Length)
+ if (this.dialog >= this.ListDialogs[this.situation].Length)
this.dialogActive = false;
else
{
- this.dialogText.text = this.ListDialogs[sceneActuelle][this.dialog];
+ this.dialogText.text = this.ListDialogs[this.situation][this.dialog];
this.dialog++;
}
}
+
+ // Ouvre une bulle de dialogue dans une situation donnée
+ void Situation(string sit)
+ {
+ this.situation = sit;
+ this.dialog = 0;
+
+ this.dialogActive = true;
+
+ this.Next();
+ }
}
diff --git a/Assets/Scripts/Player/PlayerNature.cs b/Assets/Scripts/Player/PlayerNature.cs
index 0a8043a1d3a4eb0fbb5b10288062428f7855c1da..095bbefac0d6357da983650bc264c15ef007087a 100644
--- a/Assets/Scripts/Player/PlayerNature.cs
+++ b/Assets/Scripts/Player/PlayerNature.cs
@@ -44,7 +44,7 @@ public class PlayerNature : MonoBehaviour
void Update()
{
- //on
+ //toutes les x secondes => on perd un certain nombre de secondes
if (Time.time > nextActionTime)
{
nextActionTime += period;
@@ -57,10 +57,13 @@ public class PlayerNature : MonoBehaviour
}
// Perd un certain nombre de points de nature
-
public void LooseNature(int damage)
{
this.currentNature -= damage;
+
+ if(this.currentNature < 0)
+ this.currentNature = 0;
+
this.natureBar.SetValue(this.currentNature);
}
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 14c9dbfecd7f793aab4aea8b5d3dd50f055a5b5a..89b0f497d0f3e76481400d7b2c2b240387a7da42 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -17,4 +17,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Valentin.unity
guid: 8c9ceab1c999ea749aa0fe2b0c87b0bf
+ - enabled: 1
+ path: Assets/Scenes/Niveau2.unity
+ guid: 4ae30febc4f91474fa9164b85521aaf5
m_configObjects: {}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index b617ba25065511056f1671bbb0c1b85e5c636f13..60977e126b12269c58895567176b8b3cd7bd9c67 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,13 +12,13 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c71190012193f6c7a68252320092a
flags: 0
RecentlyUsedScenePath-2:
- value: 22424703114646680e0b0227036c71190012193f7d66333e243d04
+ value: 22424703114646680e0b0227036c72151802563f22213229
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c71190012193f7e66333e243d04
flags: 0
RecentlyUsedScenePath-4:
- value: 22424703114646680e0b0227036c4c1313191d182d2e203128255326ece92021
+ value: 22424703114646680e0b0227036c71190012193f7d66333e243d04
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650