Skip to content

Commit 221ed46

Browse files
Finishing touches and small fixes.
1 parent c6a05a9 commit 221ed46

24 files changed

+42
-51
lines changed
0 Bytes
Binary file not shown.
Binary file not shown.

TrafficWizard/Assets/MyAssets/Scripts/Director.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public class Director : MonoBehaviour {
1414
public GameObject TargetsGO;
1515
public AudioClip coin;
1616
public AudioClip modeChangeSound;
17-
public UnityEngine.UI.Image testImage;
1817

1918
enum AppMode
2019
{
@@ -46,11 +45,9 @@ void Start () {
4645
trafficSignsDAO = new FileParserTrafficSignsData();
4746
trafficSignsQuestionsDAO = new FileParserTrafficSignsQuestions();
4847
audioSource = GetComponent<AudioSource>();
49-
string s = "¿características guardadas?";
50-
VersionText.text = s;
48+
ChangeAppMode(1);
5149
}
5250

53-
5451
public void ChangeAppMode(int settingsUIId)
5552
{
5653
AppMode previousAppMode = currentAppMode;

TrafficWizard/Assets/MyAssets/Sprites/Traffic_Signs.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

TrafficWizard/Assets/StreamingAssets/TrafficSign_QuestionsFile.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
1;Adelantamiento prohibido para camiones;Sign_R-306;Sign_R-501;Sign_R-2
44
1;Fin de la limitaci�n de velocidad;Sign_R-501;Sign_R-308e;Sign_R-301_30kmph
55
1;Intersecci�n de sentido giratorio-obligatorio;Sign_R-402;Sign_R-2;Sign_R-501
6-
2;Sign_R-301_50kmph;Velocidad m�xima;Fin de la limitaci�n de velocidad;Detenci�n obligatoria o stop
6+
2;Sign_R-301_50kmph;Velocidad m�xima;Fin de la limitaci�n de velocidad;Detenci�n obligatoria o stop
7+
2;Sign_R-410;Camino reservado para peatones;Intersecci�n de sentido giratorio-obligatorio;Adelantamiento prohibido para camiones
8+
2;Sign_R-402;Intersecci�n de sentido giratorio-obligatorio;Estacionamiento prohibido en vado;Camino reservado para peatones

TrafficWizard/Library/CurrentLayout.dwlt

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ MonoBehaviour:
4242
y: 30
4343
width: 2560
4444
height: 1317
45-
m_MinSize: {x: 683, y: 342}
46-
m_MaxSize: {x: 12008, y: 8042}
45+
m_MinSize: {x: 683, y: 492}
46+
m_MaxSize: {x: 14004, y: 14042}
4747
vertical: 0
48-
controlID: 51
48+
controlID: 26
4949
--- !u!114 &3
5050
MonoBehaviour:
5151
m_ObjectHideFlags: 52
@@ -88,7 +88,7 @@ MonoBehaviour:
8888
x: 0
8989
y: 0
9090
width: 469
91-
height: 697
91+
height: 1050
9292
m_MinSize: {x: 200, y: 200}
9393
m_MaxSize: {x: 4000, y: 4000}
9494
m_ActualView: {fileID: 15}
@@ -111,17 +111,17 @@ MonoBehaviour:
111111
m_Position:
112112
serializedVersion: 2
113113
x: 0
114-
y: 697
114+
y: 1050
115115
width: 2258
116-
height: 620
117-
m_MinSize: {x: 100, y: 100}
118-
m_MaxSize: {x: 4000, y: 4000}
119-
m_ActualView: {fileID: 18}
116+
height: 267
117+
m_MinSize: {x: 232, y: 271}
118+
m_MaxSize: {x: 10002, y: 10021}
119+
m_ActualView: {fileID: 13}
120120
m_Panes:
121121
- {fileID: 13}
122122
- {fileID: 18}
123-
m_Selected: 1
124-
m_LastSelected: 0
123+
m_Selected: 0
124+
m_LastSelected: 1
125125
--- !u!114 &6
126126
MonoBehaviour:
127127
m_ObjectHideFlags: 52
@@ -206,10 +206,10 @@ MonoBehaviour:
206206
y: 0
207207
width: 2258
208208
height: 1317
209-
m_MinSize: {x: 406, y: 342}
210-
m_MaxSize: {x: 8006, y: 8042}
209+
m_MinSize: {x: 406, y: 492}
210+
m_MaxSize: {x: 10002, y: 14042}
211211
vertical: 1
212-
controlID: 52
212+
controlID: 27
213213
--- !u!114 &10
214214
MonoBehaviour:
215215
m_ObjectHideFlags: 52
@@ -229,11 +229,11 @@ MonoBehaviour:
229229
x: 0
230230
y: 0
231231
width: 2258
232-
height: 697
232+
height: 1050
233233
m_MinSize: {x: 406, y: 221}
234234
m_MaxSize: {x: 8006, y: 4021}
235235
vertical: 0
236-
controlID: 11
236+
controlID: 28
237237
--- !u!114 &11
238238
MonoBehaviour:
239239
m_ObjectHideFlags: 52
@@ -251,7 +251,7 @@ MonoBehaviour:
251251
x: 469
252252
y: 0
253253
width: 1789
254-
height: 697
254+
height: 1050
255255
m_MinSize: {x: 204, y: 221}
256256
m_MaxSize: {x: 4004, y: 4021}
257257
m_ActualView: {fileID: 16}
@@ -311,9 +311,9 @@ MonoBehaviour:
311311
m_Pos:
312312
serializedVersion: 2
313313
x: 0
314-
y: 789
314+
y: 1142
315315
width: 2256
316-
height: 599
316+
height: 246
317317
m_PersistentViewDataDictionary: {fileID: 0}
318318
m_SearchFilter:
319319
m_NameFilter:
@@ -327,18 +327,18 @@ MonoBehaviour:
327327
m_ShowAllHits: 0
328328
m_SearchArea: 0
329329
m_Folders:
330-
- Assets/MyAssets/Scripts
330+
- Assets/Resources
331331
m_ViewMode: 1
332332
m_StartGridSize: 16
333333
m_LastFolders:
334-
- Assets/MyAssets/Scripts
334+
- Assets/Resources
335335
m_LastFoldersGridSize: 16
336336
m_LastProjectPath: C:\UnityProjects\TrafficWizard\TrafficWizard
337337
m_IsLocked: 0
338338
m_FolderTreeState:
339-
scrollPos: {x: 0, y: 0}
340-
m_SelectedIDs: 842a0000
341-
m_LastClickedID: 10884
339+
scrollPos: {x: 0, y: 123}
340+
m_SelectedIDs: 542b0000
341+
m_LastClickedID: 11092
342342
m_ExpandedIDs: 0000000082290000a0290000a2290000ac290000ec2a00004a2b0000562b000000ca9a3bffffff7f
343343
m_RenameOverlay:
344344
m_UserAcceptedRename: 0
@@ -481,13 +481,13 @@ MonoBehaviour:
481481
x: 0
482482
y: 92
483483
width: 467
484-
height: 676
484+
height: 1029
485485
m_PersistentViewDataDictionary: {fileID: 0}
486486
m_TreeViewState:
487487
scrollPos: {x: 0, y: 0}
488488
m_SelectedIDs:
489489
m_LastClickedID: 0
490-
m_ExpandedIDs: d2cfffffa2d0ffffced2ffff9cfbffff00000000
490+
m_ExpandedIDs: de7cffffb87dffffe87fffff08f6ffffbaf6ffffeaf8ffff9cfbffff00000000
491491
m_RenameOverlay:
492492
m_UserAcceptedRename: 0
493493
m_Name:
@@ -535,7 +535,7 @@ MonoBehaviour:
535535
x: 471
536536
y: 92
537537
width: 1785
538-
height: 676
538+
height: 1029
539539
m_PersistentViewDataDictionary: {fileID: 0}
540540
m_SceneLighting: 1
541541
lastFramingTime: 327.2008343
@@ -612,7 +612,7 @@ MonoBehaviour:
612612
x: 471
613613
y: 92
614614
width: 1785
615-
height: 676
615+
height: 1029
616616
m_PersistentViewDataDictionary: {fileID: 0}
617617
m_MaximizeOnPlay: 0
618618
m_Gizmos: 0
@@ -624,8 +624,8 @@ MonoBehaviour:
624624
m_VRangeLocked: 0
625625
m_HBaseRangeMin: -892.5
626626
m_HBaseRangeMax: 892.5
627-
m_VBaseRangeMin: -329.5
628-
m_VBaseRangeMax: 329.5
627+
m_VBaseRangeMin: -506
628+
m_VBaseRangeMax: 506
629629
m_HAllowExceedBaseRangeMin: 1
630630
m_HAllowExceedBaseRangeMax: 1
631631
m_VAllowExceedBaseRangeMin: 1
@@ -643,24 +643,24 @@ MonoBehaviour:
643643
x: 0
644644
y: 17
645645
width: 1785
646-
height: 659
646+
height: 1012
647647
m_Scale: {x: 1, y: 1}
648-
m_Translation: {x: 892.5, y: 329.5}
648+
m_Translation: {x: 892.5, y: 506}
649649
m_MarginLeft: 0
650650
m_MarginRight: 0
651651
m_MarginTop: 0
652652
m_MarginBottom: 0
653653
m_LastShownAreaInsideMargins:
654654
serializedVersion: 2
655655
x: -892.5
656-
y: -329.5
656+
y: -506
657657
width: 1785
658-
height: 659
658+
height: 1012
659659
m_MinimalGUI: 1
660660
m_defaultScale: 1
661661
m_TargetTexture: {fileID: 0}
662662
m_CurrentColorSpace: 0
663-
m_LastWindowPixelSize: {x: 1785, y: 676}
663+
m_LastWindowPixelSize: {x: 1785, y: 1029}
664664
m_ClearInEditMode: 1
665665
m_NoCameraWarning: 1
666666
m_LowResolutionForAspectRatios: 01000000000100000100
@@ -687,7 +687,7 @@ MonoBehaviour:
687687
m_Pos:
688688
serializedVersion: 2
689689
x: 0
690-
y: 789
690+
y: 1142
691691
width: 2256
692-
height: 599
692+
height: 246
693693
m_PersistentViewDataDictionary: {fileID: 0}
0 Bytes
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)