From e29da9770a7a27bffcbfcdddf3f50ad6650b9e95 Mon Sep 17 00:00:00 2001
From: Colin Girault <colin.girault@etu.unistra.fr>
Date: Wed, 15 Dec 2021 12:08:45 +0100
Subject: [PATCH] ui_update
---
T3-Unity/Assets/Scenes/Main_Menu.unity | 22 ++++-----
T3-Unity/Assets/Scenes/ui.unity | 24 +++++-----
T3-Unity/Assets/Scripts/GameManager.cs | 58 ++++++++++++++----------
T3-Unity/Assets/Scripts/bordel.cs | 23 ++++++++++
T3-Unity/Assets/Scripts/bordel.cs.meta | 11 +++++
T3-Unity/Assets/Scripts/changeminus.cs | 6 +--
T3-Unity/Assets/Scripts/changeplus.cs | 4 +-
T3-Unity/Assets/Scripts/diff_scale.cs | 8 ++--
T3-Unity/Assets/Scripts/motiv_scale.cs | 22 ++++-----
T3-Unity/Assets/Scripts/validate_game.cs | 16 +++----
10 files changed, 118 insertions(+), 76 deletions(-)
create mode 100644 T3-Unity/Assets/Scripts/bordel.cs
create mode 100644 T3-Unity/Assets/Scripts/bordel.cs.meta
diff --git a/T3-Unity/Assets/Scenes/Main_Menu.unity b/T3-Unity/Assets/Scenes/Main_Menu.unity
index 4153d50..1e6600d 100644
--- a/T3-Unity/Assets/Scenes/Main_Menu.unity
+++ b/T3-Unity/Assets/Scenes/Main_Menu.unity
@@ -160,10 +160,10 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_UiScaleMode: 0
+ m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
- m_ReferenceResolution: {x: 800, y: 600}
+ m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
@@ -248,8 +248,8 @@ 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: 0, y: 127}
- m_SizeDelta: {x: 200, y: 50}
+ m_AnchoredPosition: {x: 0.000015259, y: 144}
+ m_SizeDelta: {x: 238.67603, y: 80.927246}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &235183727
MonoBehaviour:
@@ -297,10 +297,10 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
- m_fontSize: 44.75
- m_fontSizeBase: 50
+ m_fontSize: 70
+ m_fontSizeBase: 70
m_fontWeight: 400
- m_enableAutoSizing: 1
+ m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
@@ -786,8 +786,8 @@ 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: -0.000030518, y: -102}
- m_SizeDelta: {x: 220.02325, y: 53.998764}
+ m_AnchoredPosition: {x: -0.00000047684, y: -157}
+ m_SizeDelta: {x: 252.59671, y: 77.79193}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1341493607
MonoBehaviour:
@@ -911,8 +911,8 @@ 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: 0, y: -26.999}
- m_SizeDelta: {x: 220.02325, y: 53.998764}
+ m_AnchoredPosition: {x: 0, y: -38.895966}
+ m_SizeDelta: {x: 252.5967, y: 77.79193}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1656747850
MonoBehaviour:
diff --git a/T3-Unity/Assets/Scenes/ui.unity b/T3-Unity/Assets/Scenes/ui.unity
index 03ded84..963658a 100644
--- a/T3-Unity/Assets/Scenes/ui.unity
+++ b/T3-Unity/Assets/Scenes/ui.unity
@@ -375,10 +375,10 @@ RectTransform:
m_Father: {fileID: 1135662973}
m_RootOrder: 2
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: -621.31, y: -9}
- m_SizeDelta: {x: 190.26874, y: 75.3916}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: -621.31, y: -258}
+ m_SizeDelta: {x: 190.2688, y: 75.3916}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &327182110
MonoBehaviour:
@@ -635,10 +635,10 @@ RectTransform:
m_Father: {fileID: 1135662973}
m_RootOrder: 3
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: -848, y: -8.9958}
- m_SizeDelta: {x: 199.99994, y: 75.383224}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: -848, y: -257.9958}
+ m_SizeDelta: {x: 199.99994, y: 75.38324}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &533486135
MonoBehaviour:
@@ -1940,10 +1940,10 @@ RectTransform:
m_Father: {fileID: 1135662973}
m_RootOrder: 6
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: 816.99994, y: -8.995794}
- m_SizeDelta: {x: 227.81909, y: 66.7671}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 816.99994, y: -257.9958}
+ m_SizeDelta: {x: 227.81909, y: 66.76709}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2062990734
MonoBehaviour:
diff --git a/T3-Unity/Assets/Scripts/GameManager.cs b/T3-Unity/Assets/Scripts/GameManager.cs
index 9b7da61..14dc146 100644
--- a/T3-Unity/Assets/Scripts/GameManager.cs
+++ b/T3-Unity/Assets/Scripts/GameManager.cs
@@ -3,29 +3,18 @@ using System.Collections.Generic;
using UnityEngine;
using Mapbox.Unity.Map;
using Mapbox.Examples;
+using System;
public class GameManager : MonoBehaviour
{
public GameObject[] waypoints;
public AbstractMap map;
public Canvas canvas;
-
-<<<<<<< HEAD
- public TextMeshProUGUI textMeshID;
- public GameObject room;
- public static float motiv;
- public static float difficulty;
- public static int fame;
- public static bool stop = false;
-
- // Start is called before the first frame update
- void Start()
- {
- _roomManager = this.room.GetComponent<RoomManager>();
- updateID(_roomManager.actualRoom, _roomManager.actualRoomColor );
-
-=======
- private bool locked = false;
+
+ [SerializeField] Transform objA;
+ [SerializeField] Transform objB;
+ [SerializeField] int nbWaypoint = 0;
+ [SerializeField] bool locked = false;
private Vector3 offset;
private Plane _yPlane;
@@ -33,26 +22,45 @@ public class GameManager : MonoBehaviour
void Start()
{
_yPlane = new Plane(Vector3.up, Vector3.zero);
->>>>>>> 9b79b293318bccaeaaace53c684466b45bb7930a
}
// Update is called once per frame
void Update()
{
- if (Input.GetKeyDown(KeyCode.Mouse0) && locked)
+ if (Input.GetKeyDown(KeyCode.Mouse0) && locked && nbWaypoint < 2)
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-<<<<<<< HEAD
-
-=======
float enter = 0.0f;
if (_yPlane.Raycast(ray, out enter))
{
- Instantiate(waypoints[0], ray.GetPoint(enter), new Quaternion(0, 0, 0, 0));
+ Instantiate(waypoints[nbWaypoint], ray.GetPoint(enter), new Quaternion(0, 0, 0, 0));
+ nbWaypoint++;
}
}
->>>>>>> 9b79b293318bccaeaaace53c684466b45bb7930a
+ }
+
+ IEnumerator setRouteTracer()
+ {
+ bool repeat = false;
+ try
+ {
+ objA = GameObject.FindGameObjectWithTag("start_wp").transform;
+ objB = GameObject.FindGameObjectWithTag("end_wp").transform;
+
+ //gameObject.AddComponent<RouteTracer>();
+ }
+ catch (NullReferenceException)
+ {
+ repeat = true;
+ }
+
+ if (repeat)
+ {
+ yield return setRouteTracer();
+ }
+
+ yield return null;
}
// Lock la map
@@ -62,4 +70,4 @@ public class GameManager : MonoBehaviour
canvas.GetComponentInChildren<Transform>().gameObject.SetActive(false);
locked = true;
}
-}
+}
\ No newline at end of file
diff --git a/T3-Unity/Assets/Scripts/bordel.cs b/T3-Unity/Assets/Scripts/bordel.cs
new file mode 100644
index 0000000..db8f2c1
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/bordel.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class bordel : MonoBehaviour
+{
+
+ public static float motiv;
+ public static float difficulty;
+ public static int fame;
+ public static bool stop = false;
+
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/T3-Unity/Assets/Scripts/bordel.cs.meta b/T3-Unity/Assets/Scripts/bordel.cs.meta
new file mode 100644
index 0000000..f8b7f39
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/bordel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1034c7539fe11f24fba4c4e8923eda2b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/T3-Unity/Assets/Scripts/changeminus.cs b/T3-Unity/Assets/Scripts/changeminus.cs
index c5aeb0e..ce012bd 100644
--- a/T3-Unity/Assets/Scripts/changeminus.cs
+++ b/T3-Unity/Assets/Scripts/changeminus.cs
@@ -7,11 +7,11 @@ using UnityEngine.UI;
public class changeminus : MonoBehaviour
{
- public static float plus = GameManager.motiv;
+ public static float plus = bordel.motiv;
public void changeMinus(string word)
{
- plus = GameManager.difficulty;
+ plus = bordel.difficulty;
plus--;
if (plus < 0)
@@ -19,6 +19,6 @@ public class changeminus : MonoBehaviour
plus = 0;
}
- GameManager.difficulty = plus;
+ bordel.difficulty = plus;
}
}
diff --git a/T3-Unity/Assets/Scripts/changeplus.cs b/T3-Unity/Assets/Scripts/changeplus.cs
index aad23cb..d4f8a0e 100644
--- a/T3-Unity/Assets/Scripts/changeplus.cs
+++ b/T3-Unity/Assets/Scripts/changeplus.cs
@@ -12,7 +12,7 @@ public class changeplus : MonoBehaviour
public void changePlus(string word)
{
- moins = GameManager.difficulty;
+ moins = bordel.difficulty;
moins++;
if (moins > 10)
@@ -20,7 +20,7 @@ public class changeplus : MonoBehaviour
moins = 10;
}
- GameManager.difficulty = moins;
+ bordel.difficulty = moins;
}
diff --git a/T3-Unity/Assets/Scripts/diff_scale.cs b/T3-Unity/Assets/Scripts/diff_scale.cs
index 452d461..3de9196 100644
--- a/T3-Unity/Assets/Scripts/diff_scale.cs
+++ b/T3-Unity/Assets/Scripts/diff_scale.cs
@@ -9,19 +9,19 @@ public class diff_scale : MonoBehaviour
// Start is called before the first frame update
void Start()
{
- GameManager.motiv = 5f;
+ bordel.motiv = 5f;
}
// Update is called once per frame
void Update()
{
- float ech = GameManager.difficulty/10;
+ float ech = bordel.difficulty/10;
transform.localScale = new Vector3 (ech,1,1);
- if (GameManager.difficulty < 0)
+ if (bordel.difficulty < 0)
{
- GameManager.difficulty = 0;
+ bordel.difficulty = 0;
}
diff --git a/T3-Unity/Assets/Scripts/motiv_scale.cs b/T3-Unity/Assets/Scripts/motiv_scale.cs
index 873f3be..8dbcdbc 100644
--- a/T3-Unity/Assets/Scripts/motiv_scale.cs
+++ b/T3-Unity/Assets/Scripts/motiv_scale.cs
@@ -14,41 +14,41 @@ public class motiv_scale : MonoBehaviour
void Update()
{
- if (GameManager.stop)
+ if (bordel.stop)
{
}
else
{
- float ech = GameManager.motiv / 10;
+ float ech = bordel.motiv / 10;
transform.localScale = new Vector3(ech, 1, 1);
- if (GameManager.motiv < 0)
+ if (bordel.motiv < 0)
{
- GameManager.motiv = 0;
+ bordel.motiv = 0;
}
- if (GameManager.motiv > 10)
+ if (bordel.motiv > 10)
{
- GameManager.motiv = 10;
+ bordel.motiv = 10;
}
- if (GameManager.difficulty < 2)
+ if (bordel.difficulty < 2)
{
- GameManager.motiv = GameManager.motiv - 0.003f;
+ bordel.motiv = bordel.motiv - 0.003f;
}
- else if (GameManager.difficulty > 4)
+ else if (bordel.difficulty > 4)
{
- GameManager.motiv = GameManager.motiv - 0.003f;
+ bordel.motiv = bordel.motiv - 0.003f;
}
else
{
- GameManager.motiv = GameManager.motiv + 0.003f;
+ bordel.motiv = bordel.motiv + 0.003f;
}
}
diff --git a/T3-Unity/Assets/Scripts/validate_game.cs b/T3-Unity/Assets/Scripts/validate_game.cs
index d3f4d0c..1e891fd 100644
--- a/T3-Unity/Assets/Scripts/validate_game.cs
+++ b/T3-Unity/Assets/Scripts/validate_game.cs
@@ -18,28 +18,28 @@ public class validate_game : MonoBehaviour
public void changeFame(string word)
{
- actual_fame = GameManager.fame;
+ actual_fame = bordel.fame;
- if (GameManager.motiv < 2.5)
+ if (bordel.motiv < 2.5)
{
actual_fame = actual_fame + 0;
}
- else if (GameManager.motiv <= 5)
+ else if (bordel.motiv <= 5)
{
- actual_fame = actual_fame +(10 + (int)GameManager.motiv);
+ actual_fame = actual_fame +(10 + (int)bordel.motiv);
}
- else if (GameManager.motiv > 5)
+ else if (bordel.motiv > 5)
{
- actual_fame = actual_fame +(15 + (int)GameManager.motiv);
+ actual_fame = actual_fame +(15 + (int)bordel.motiv);
}
textshowed.text = "Réputation : " + actual_fame.ToString(); ;
- GameManager.fame = actual_fame;
+ bordel.fame = actual_fame;
- GameManager.stop = true;
+ bordel.stop = true;
}
--
GitLab