Skip to content

Commit 86191c1

Browse files
YuudachiXMMYYuudachiXMMY
committed
add exit game button in Event Menu. Limit group name display on each car to 5 letters. build 03.21_v0.3.9-demo.10~
1 parent 48dfedf commit 86191c1

14 files changed

Lines changed: 343 additions & 30 deletions

File tree

‎Assets/Prefabs/Cars/Car-1.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ RectTransform:
150150
m_AnchorMin: {x: 0.5, y: 0.5}
151151
m_AnchorMax: {x: 0.5, y: 0.5}
152152
m_AnchoredPosition: {x: 0, y: 0}
153-
m_SizeDelta: {x: 250, y: 100}
153+
m_SizeDelta: {x: 260, y: 100}
154154
m_Pivot: {x: 0.5, y: 0.5}
155155
--- !u!222 &5076825381520673673
156156
CanvasRenderer:
@@ -207,12 +207,12 @@ MonoBehaviour:
207207
m_faceColor:
208208
serializedVersion: 2
209209
rgba: 4294967295
210-
m_fontSize: 89.5
210+
m_fontSize: 86
211211
m_fontSizeBase: 36
212212
m_fontWeight: 400
213213
m_enableAutoSizing: 1
214214
m_fontSizeMin: 18
215-
m_fontSizeMax: 100
215+
m_fontSizeMax: 86
216216
m_fontStyle: 1
217217
m_HorizontalAlignment: 2
218218
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/Car-2.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ RectTransform:
150150
m_AnchorMin: {x: 0.5, y: 0.5}
151151
m_AnchorMax: {x: 0.5, y: 0.5}
152152
m_AnchoredPosition: {x: 0, y: 0}
153-
m_SizeDelta: {x: 250, y: 100}
153+
m_SizeDelta: {x: 270, y: 100}
154154
m_Pivot: {x: 0.5, y: 0.5}
155155
--- !u!222 &3950120296278310416
156156
CanvasRenderer:
@@ -207,12 +207,12 @@ MonoBehaviour:
207207
m_faceColor:
208208
serializedVersion: 2
209209
rgba: 4294967295
210-
m_fontSize: 89.5
210+
m_fontSize: 86
211211
m_fontSizeBase: 36
212212
m_fontWeight: 400
213213
m_enableAutoSizing: 1
214214
m_fontSizeMin: 18
215-
m_fontSizeMax: 100
215+
m_fontSizeMax: 86
216216
m_fontStyle: 1
217217
m_HorizontalAlignment: 2
218218
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/Car-3.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ RectTransform:
150150
m_AnchorMin: {x: 0.5, y: 0.5}
151151
m_AnchorMax: {x: 0.5, y: 0.5}
152152
m_AnchoredPosition: {x: 0, y: 0}
153-
m_SizeDelta: {x: 250, y: 100}
153+
m_SizeDelta: {x: 270, y: 100}
154154
m_Pivot: {x: 0.5, y: 0.5}
155155
--- !u!222 &7283769477230500302
156156
CanvasRenderer:
@@ -207,12 +207,12 @@ MonoBehaviour:
207207
m_faceColor:
208208
serializedVersion: 2
209209
rgba: 4294967295
210-
m_fontSize: 89.5
210+
m_fontSize: 86
211211
m_fontSizeBase: 36
212212
m_fontWeight: 400
213213
m_enableAutoSizing: 1
214214
m_fontSizeMin: 18
215-
m_fontSizeMax: 100
215+
m_fontSizeMax: 86
216216
m_fontStyle: 1
217217
m_HorizontalAlignment: 2
218218
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/Car-4.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ RectTransform:
150150
m_AnchorMin: {x: 0.5, y: 0.5}
151151
m_AnchorMax: {x: 0.5, y: 0.5}
152152
m_AnchoredPosition: {x: 0, y: 0}
153-
m_SizeDelta: {x: 250, y: 100}
153+
m_SizeDelta: {x: 270, y: 100}
154154
m_Pivot: {x: 0.5, y: 0.5}
155155
--- !u!222 &2066709259632838892
156156
CanvasRenderer:
@@ -207,12 +207,12 @@ MonoBehaviour:
207207
m_faceColor:
208208
serializedVersion: 2
209209
rgba: 4294967295
210-
m_fontSize: 89.5
210+
m_fontSize: 86
211211
m_fontSizeBase: 36
212212
m_fontWeight: 400
213213
m_enableAutoSizing: 1
214214
m_fontSizeMin: 18
215-
m_fontSizeMax: 100
215+
m_fontSizeMax: 86
216216
m_fontStyle: 1
217217
m_HorizontalAlignment: 2
218218
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/Car-5.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RectTransform:
3535
m_AnchorMin: {x: 0.5, y: 0.5}
3636
m_AnchorMax: {x: 0.5, y: 0.5}
3737
m_AnchoredPosition: {x: 0, y: 0}
38-
m_SizeDelta: {x: 250, y: 100}
38+
m_SizeDelta: {x: 270, y: 100}
3939
m_Pivot: {x: 0.5, y: 0.5}
4040
--- !u!222 &9107090621632763694
4141
CanvasRenderer:
@@ -92,12 +92,12 @@ MonoBehaviour:
9292
m_faceColor:
9393
serializedVersion: 2
9494
rgba: 4294967295
95-
m_fontSize: 89.5
95+
m_fontSize: 86
9696
m_fontSizeBase: 36
9797
m_fontWeight: 400
9898
m_enableAutoSizing: 1
9999
m_fontSizeMin: 18
100-
m_fontSizeMax: 100
100+
m_fontSizeMax: 86
101101
m_fontStyle: 1
102102
m_HorizontalAlignment: 2
103103
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/Car-6.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RectTransform:
3535
m_AnchorMin: {x: 0.5, y: 0.5}
3636
m_AnchorMax: {x: 0.5, y: 0.5}
3737
m_AnchoredPosition: {x: 0, y: 0}
38-
m_SizeDelta: {x: 250, y: 100}
38+
m_SizeDelta: {x: 250270, y: 100}
3939
m_Pivot: {x: 0.5, y: 0.5}
4040
--- !u!222 &4262344663736972146
4141
CanvasRenderer:
@@ -92,12 +92,12 @@ MonoBehaviour:
9292
m_faceColor:
9393
serializedVersion: 2
9494
rgba: 4294967295
95-
m_fontSize: 89.5
95+
m_fontSize: 86
9696
m_fontSizeBase: 36
9797
m_fontWeight: 400
9898
m_enableAutoSizing: 1
9999
m_fontSizeMin: 18
100-
m_fontSizeMax: 100
100+
m_fontSizeMax: 86
101101
m_fontStyle: 1
102102
m_HorizontalAlignment: 2
103103
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/Car-7.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RectTransform:
3535
m_AnchorMin: {x: 0.5, y: 0.5}
3636
m_AnchorMax: {x: 0.5, y: 0.5}
3737
m_AnchoredPosition: {x: 0, y: 0}
38-
m_SizeDelta: {x: 250, y: 100}
38+
m_SizeDelta: {x: 270, y: 100}
3939
m_Pivot: {x: 0.5, y: 0.5}
4040
--- !u!222 &2746468020081279948
4141
CanvasRenderer:
@@ -92,12 +92,12 @@ MonoBehaviour:
9292
m_faceColor:
9393
serializedVersion: 2
9494
rgba: 4294967295
95-
m_fontSize: 89.5
95+
m_fontSize: 86
9696
m_fontSizeBase: 36
9797
m_fontWeight: 400
9898
m_enableAutoSizing: 1
9999
m_fontSizeMin: 18
100-
m_fontSizeMax: 100
100+
m_fontSizeMax: 86
101101
m_fontStyle: 1
102102
m_HorizontalAlignment: 2
103103
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/Car-8.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ RectTransform:
150150
m_AnchorMin: {x: 0.5, y: 0.5}
151151
m_AnchorMax: {x: 0.5, y: 0.5}
152152
m_AnchoredPosition: {x: 0, y: 0}
153-
m_SizeDelta: {x: 250, y: 100}
153+
m_SizeDelta: {x: 270, y: 100}
154154
m_Pivot: {x: 0.5, y: 0.5}
155155
--- !u!222 &957812878094904729
156156
CanvasRenderer:
@@ -207,12 +207,12 @@ MonoBehaviour:
207207
m_faceColor:
208208
serializedVersion: 2
209209
rgba: 4294967295
210-
m_fontSize: 89.5
210+
m_fontSize: 86
211211
m_fontSizeBase: 36
212212
m_fontWeight: 400
213213
m_enableAutoSizing: 1
214214
m_fontSizeMin: 18
215-
m_fontSizeMax: 100
215+
m_fontSizeMax: 86
216216
m_fontStyle: 1
217217
m_HorizontalAlignment: 2
218218
m_VerticalAlignment: 512

‎Assets/Prefabs/Cars/GUIFacingPlayer.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,20 @@ public class GUIFacingPlayer : MonoBehaviour
1111
void Start()
1212
{
1313
_object = GameObject.Find("InstructorPlayer");
14-
this.transform.GetChild(0).gameObject.GetComponent<TMPro.TextMeshProUGUI>().text = this.transform.parent.gameObject.GetComponent<carSpec>().groupName;
14+
15+
string groupName = this.transform.parent.gameObject.GetComponent<carSpec>().groupName;
16+
this.transform.GetChild(0).gameObject.GetComponent<TMPro.TextMeshProUGUI>().text = Left(groupName, 5);
1517
}
1618

1719
// Update is called once per frame
1820
void Update()
1921
{
2022
transform.rotation = Quaternion.LookRotation(transform.position - _object.transform.position);
2123
}
24+
25+
private string Left(string str, int length)
26+
{
27+
return str.Substring(0, System.Math.Min(length, str.Length));
28+
}
29+
2230
}

‎Assets/Prefabs/Events/ButtonEvents.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@ public void Event_7()
176176
}
177177
}
178178

179+
public void QuitGame()
180+
{
181+
Application.Quit();
182+
Debug.Log("Game is exiting");
183+
//Just to make sure its working
184+
}
185+
179186

180187
private void ResetInputField(string GameObjectName)
181188
{

0 commit comments

Comments
 (0)