From e4967a9a0cdcb5c072ee606694bf6a7298a5f2e9 Mon Sep 17 00:00:00 2001
From: GIMENEZ TANGUY <tanguy.gimenez@etu.unistra.fr>
Date: Mon, 29 Mar 2021 11:54:06 +0200
Subject: [PATCH] Ajout d'un systeme de dialogue efficace
---
Assets/Import/Font/Fipps-Regular.otf | Bin 0 -> 34220 bytes
Assets/Import/Font/Fipps-Regular.otf.meta | 21 ++++++
Assets/Prefabs/GUI/BarreDenature.prefab | 21 +++++-
Assets/Scenes/Niveau2.unity | 8 +++
Assets/Scripts/GUI/Dialog.cs | 75 +++++++++++++++++++---
UserSettings/EditorUserSettings.asset | 10 +--
6 files changed, 116 insertions(+), 19 deletions(-)
create mode 100644 Assets/Import/Font/Fipps-Regular.otf
create mode 100644 Assets/Import/Font/Fipps-Regular.otf.meta
diff --git a/Assets/Import/Font/Fipps-Regular.otf b/Assets/Import/Font/Fipps-Regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..9334dad594277ba8339786217d75260e58436dc8
GIT binary patch
literal 34220
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
literal 0
HcmV?d00001
diff --git a/Assets/Import/Font/Fipps-Regular.otf.meta b/Assets/Import/Font/Fipps-Regular.otf.meta
new file mode 100644
index 0000000..b399743
--- /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 2adb2d8..40d6795 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/Niveau2.unity b/Assets/Scenes/Niveau2.unity
index 4bce237..c36e1fe 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 50e33bf..6d356c3 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 = {
@@ -34,7 +54,7 @@ public class Dialog : MonoBehaviour
"Raff est pas bo"
};
- this.ListDialogs.Add("sceneTanguy", DialogsLvl1);
+ this.ListDialogs.Add("start", DialogsLvl1);
string[] Dialogsraff = {
"Salut",
@@ -42,10 +62,26 @@ public class Dialog : MonoBehaviour
"Je te mange tes morts"
};
- this.ListDialogs.Add("Niveau2", Dialogsraff);
+ 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
@@ -58,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/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index eeb4112..60977e1 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,20 +12,14 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c71190012193f6c7a68252320092a
flags: 0
RecentlyUsedScenePath-2:
- value: 22424703114646680e0b0227036c71190012193f7e66333e243d04
+ value: 22424703114646680e0b0227036c72151802563f22213229
flags: 0
RecentlyUsedScenePath-3:
- value: 22424703114646680e0b0227036c72151a010124623d28393930
+ value: 22424703114646680e0b0227036c71190012193f7e66333e243d04
flags: 0
RecentlyUsedScenePath-4:
- value: 22424703114646680e0b0227036c72151802563f22213229
- flags: 0
- RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c71190012193f7d66333e243d04
flags: 0
- RecentlyUsedScenePath-4:
- value: 22424703114646680e0b0227036c72151802563f22213229
- flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
--
GitLab