diff --git a/Assets/Prefabs/GUI/BarreDenature.prefab b/Assets/Prefabs/GUI/BarreDenature.prefab
index 40d6795ea274d1688ea906d8b2b24ea10e9129c7..d6a26f3193274e2ddffd0e120d13ea93f4da32a9 100644
--- a/Assets/Prefabs/GUI/BarreDenature.prefab
+++ b/Assets/Prefabs/GUI/BarreDenature.prefab
@@ -35,7 +35,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.1984, y: 1.5992}
+ m_AnchoredPosition: {x: 3.1984, y: 1}
m_SizeDelta: {x: 783.7002, y: 106.7631}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7952431289706890423
@@ -67,7 +67,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_Font: {fileID: 12800000, guid: a8169677ec9bc574faafaf47e65e2238, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
@@ -77,9 +77,10 @@ MonoBehaviour:
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
+ m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: Je mange tes morts sale batard
+ m_Text: "ceci est un texte de test pour voir \xE0 quel point on peut \xE9crire
+ des choses, on est au bout l\xE0"
--- !u!114 &1755674381398346320
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -94,7 +95,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
dialogBox: {fileID: 1705879581494847332}
dialogText: {fileID: 1778026432316727230}
- cr: {fileID: 4793196200597776703}
+ instructionText: {fileID: 422283776695013040}
dialog: 0
dialogActive: 1
situation:
@@ -128,6 +129,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1835591788233434329}
+ - {fileID: 8867886190291889678}
m_Father: {fileID: 9185901235847042339}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -174,6 +176,101 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4828849328277852504
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8867886190291889678}
+ - component: {fileID: 6308161532840785029}
+ - component: {fileID: 422283776695013040}
+ - component: {fileID: 8222045683807769845}
+ m_Layer: 5
+ m_Name: instructions
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8867886190291889678
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4828849328277852504}
+ 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: 1360714821386396631}
+ 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: 385, y: -103}
+ m_SizeDelta: {x: 783.7002, y: 106.7631}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6308161532840785029
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4828849328277852504}
+ m_CullTransparentMesh: 1
+--- !u!114 &422283776695013040
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4828849328277852504}
+ 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: a8169677ec9bc574faafaf47e65e2238, type: 3}
+ m_FontSize: 25
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: Press space to continue...
+--- !u!114 &8222045683807769845
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4828849328277852504}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ 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_UseGraphicAlpha: 1
--- !u!1 &9185901234779189292
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Parcelles/Melvyn_usine.prefab b/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
index 74d706045e4b32edaff493c98bede1b3451f65c5..f150acf91691ce79d113334d6a8ade35ed8b0cf8 100644
--- a/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
@@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 2973155800191798711}
m_Layer: 0
m_Name: Melvyn_usine
- m_TagString: Untagged
+ m_TagString: factory
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs
index 85c946eec97f8309c79baa4a18cc22f2f558af26..96880fc798fc3d762808ced89f884e722668d707 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -29,6 +29,7 @@ public class Dialog : MonoBehaviour
public GameObject dialogBox;
public Text dialogText;
+ public Text instructionText;
public int dialog;
public bool dialogActive;
public string situation;
@@ -99,12 +100,12 @@ public class Dialog : MonoBehaviour
string[] borderChaussure = {
- "NEIN NEIN NEIN !", "Il fa me falloir des chaussures", "pour marcher plus loin !"
+ "NEIN NEIN NEIN ! Il fa me falloir des chaussures pour marcher plus loin !"
};
this.ListDialogs.Add("borderChaussure", borderChaussure);
string[] borderBaton = {
- "ACH SCHEISSE !", "Ch'ai ouplié mes","patons te marches !","Che suis trop fatigué !"
+ "ACH SCHEISSE !", "Ch'ai ouplié mes patons te marches ! Che suis trop fatigué !"
};
this.ListDialogs.Add("borderBaton", borderBaton);
@@ -145,11 +146,13 @@ public class Dialog : MonoBehaviour
{
this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);
this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(1f);
+ this.instructionText.GetComponent<CanvasRenderer>().SetAlpha(1f);
}
else
{
this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(0f);
this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ this.instructionText.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
}