diff --git a/Assets/Prefabs/RowWave.prefab b/Assets/Prefabs/RowWave.prefab
index ef073f2b7f207c76679cca335c41c59d672829b2..c489e793d01bda1a39a6f67d4566731c6c5378ba 100644
--- a/Assets/Prefabs/RowWave.prefab
+++ b/Assets/Prefabs/RowWave.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3909319267358269152
+--- !u!1 &1082195114080779873
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,9 +8,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 3445816564838367392}
- - component: {fileID: 514297644432782625}
- - component: {fileID: 3869426408607624391}
+ - component: {fileID: 9165649473504675487}
+ - component: {fileID: 4685327055991709653}
+ - component: {fileID: 4926436715420128509}
m_Layer: 5
m_Name: wave
m_TagString: Untagged
@@ -18,40 +18,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &3445816564838367392
+--- !u!224 &9165649473504675487
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3909319267358269152}
+ m_GameObject: {fileID: 1082195114080779873}
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: 2669897712603762496}
+ m_Father: {fileID: 2768178394727199198}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 67.995514, y: 0}
+ m_AnchoredPosition: {x: 80.7, y: 0}
m_SizeDelta: {x: -400.571, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &514297644432782625
+--- !u!222 &4685327055991709653
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3909319267358269152}
+ m_GameObject: {fileID: 1082195114080779873}
m_CullTransparentMesh: 1
---- !u!114 &3869426408607624391
+--- !u!114 &4926436715420128509
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3909319267358269152}
+ m_GameObject: {fileID: 1082195114080779873}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -93,8 +93,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 15
- m_fontSizeBase: 15
+ m_fontSize: 13
+ m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -135,7 +135,7 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &4610330692803885118
+--- !u!1 &2633805350096233670
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -143,8 +143,8 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2669897712603762496}
- - component: {fileID: 902704291003200355}
+ - component: {fileID: 2768178394727199198}
+ - component: {fileID: 2963588941778501062}
m_Layer: 5
m_Name: RowWave
m_TagString: Untagged
@@ -152,21 +152,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &2669897712603762496
+--- !u!224 &2768178394727199198
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4610330692803885118}
+ m_GameObject: {fileID: 2633805350096233670}
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:
- - {fileID: 765418416899279269}
- - {fileID: 1580527794628800909}
- - {fileID: 3445816564838367392}
- - {fileID: 278611708307940343}
+ - {fileID: 7978261025892270013}
+ - {fileID: 4130050366602835508}
+ - {fileID: 9165649473504675487}
+ - {fileID: 7402679691153555747}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -175,23 +175,23 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &902704291003200355
+--- !u!114 &2963588941778501062
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4610330692803885118}
+ m_GameObject: {fileID: 2633805350096233670}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2728626ca0ae73e4d9395d41bfde7bd3, type: 3}
m_Name:
m_EditorClassIdentifier:
- pos: {fileID: 3577774896698406688}
- name: {fileID: 3966432595941077339}
- wave: {fileID: 3869426408607624391}
- score: {fileID: 6576578536362756561}
---- !u!1 &6069306447677267398
+ pos: {fileID: 8237039815854820081}
+ name: {fileID: 7646473655643210983}
+ wave: {fileID: 4926436715420128509}
+ score: {fileID: 2477124848006619994}
+--- !u!1 &2648031573860174119
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -199,9 +199,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 765418416899279269}
- - component: {fileID: 3132258092456511527}
- - component: {fileID: 3577774896698406688}
+ - component: {fileID: 7978261025892270013}
+ - component: {fileID: 4383413578448492704}
+ - component: {fileID: 8237039815854820081}
m_Layer: 5
m_Name: pos
m_TagString: Untagged
@@ -209,40 +209,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &765418416899279269
+--- !u!224 &7978261025892270013
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6069306447677267398}
+ m_GameObject: {fileID: 2648031573860174119}
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: 2669897712603762496}
+ m_Father: {fileID: 2768178394727199198}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -197.19, y: 0.4267292}
+ m_AnchoredPosition: {x: -197.19, y: 0.4267273}
m_SizeDelta: {x: -394.378, y: 0.85346}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3132258092456511527
+--- !u!222 &4383413578448492704
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6069306447677267398}
+ m_GameObject: {fileID: 2648031573860174119}
m_CullTransparentMesh: 1
---- !u!114 &3577774896698406688
+--- !u!114 &8237039815854820081
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6069306447677267398}
+ m_GameObject: {fileID: 2648031573860174119}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -286,8 +286,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 15
- m_fontSizeBase: 15
+ m_fontSize: 13
+ m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -328,7 +328,7 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6311882770532248927
+--- !u!1 &3704117846302821632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -336,9 +336,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 278611708307940343}
- - component: {fileID: 5370402050992168300}
- - component: {fileID: 6576578536362756561}
+ - component: {fileID: 7402679691153555747}
+ - component: {fileID: 5692876830108734781}
+ - component: {fileID: 2477124848006619994}
m_Layer: 5
m_Name: score
m_TagString: Untagged
@@ -346,18 +346,18 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &278611708307940343
+--- !u!224 &7402679691153555747
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6311882770532248927}
+ m_GameObject: {fileID: 3704117846302821632}
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: 2669897712603762496}
+ m_Father: {fileID: 2768178394727199198}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -365,21 +365,21 @@ RectTransform:
m_AnchoredPosition: {x: 200.28548, y: 0}
m_SizeDelta: {x: -400.571, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5370402050992168300
+--- !u!222 &5692876830108734781
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6311882770532248927}
+ m_GameObject: {fileID: 3704117846302821632}
m_CullTransparentMesh: 1
---- !u!114 &6576578536362756561
+--- !u!114 &2477124848006619994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6311882770532248927}
+ m_GameObject: {fileID: 3704117846302821632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -423,8 +423,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 15
- m_fontSizeBase: 15
+ m_fontSize: 13
+ m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -465,7 +465,7 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &7473428498346191102
+--- !u!1 &3754915663111729949
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -473,9 +473,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1580527794628800909}
- - component: {fileID: 7782509975578161584}
- - component: {fileID: 3966432595941077339}
+ - component: {fileID: 4130050366602835508}
+ - component: {fileID: 8647865092985351357}
+ - component: {fileID: 7646473655643210983}
m_Layer: 5
m_Name: name
m_TagString: Untagged
@@ -483,40 +483,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1580527794628800909
+--- !u!224 &4130050366602835508
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7473428498346191102}
+ m_GameObject: {fileID: 3754915663111729949}
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: 2669897712603762496}
+ m_Father: {fileID: 2768178394727199198}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -65.8, y: 0}
- m_SizeDelta: {x: -398.5067, y: 0}
+ m_AnchoredPosition: {x: -55.103577, y: 0}
+ m_SizeDelta: {x: -324.7872, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7782509975578161584
+--- !u!222 &8647865092985351357
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7473428498346191102}
+ m_GameObject: {fileID: 3754915663111729949}
m_CullTransparentMesh: 1
---- !u!114 &3966432595941077339
+--- !u!114 &7646473655643210983
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7473428498346191102}
+ m_GameObject: {fileID: 3754915663111729949}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -560,8 +560,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 15
- m_fontSizeBase: 15
+ m_fontSize: 13
+ m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
diff --git a/Assets/Prefabs/rowZen.prefab b/Assets/Prefabs/rowZen.prefab
index 2b9fb4216bec90b85187829b004b3889c3435918..5b82ab58c71f248a62cd76961d4cf9a8025c5a94 100644
--- a/Assets/Prefabs/rowZen.prefab
+++ b/Assets/Prefabs/rowZen.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &6315690778453220348
+--- !u!1 &124998065710621604
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,50 +8,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6315690778453220349}
- - component: {fileID: 6315690778453220347}
- - component: {fileID: 6315690778453220346}
+ - component: {fileID: 6886895535143853388}
+ - component: {fileID: 6344652417343431844}
+ - component: {fileID: 5879948962663441007}
m_Layer: 5
- m_Name: pos
+ m_Name: time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &6315690778453220349
+--- !u!224 &6886895535143853388
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690778453220348}
+ m_GameObject: {fileID: 124998065710621604}
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: 6315690780063725166}
- m_RootOrder: 0
+ m_Father: {fileID: 421609571720676612}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 47.324844, y: 0}
- m_SizeDelta: {x: 94.64969, y: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -46.277496, y: 0}
+ m_SizeDelta: {x: 92.55499, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6315690778453220347
+--- !u!222 &6344652417343431844
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690778453220348}
+ m_GameObject: {fileID: 124998065710621604}
m_CullTransparentMesh: 1
---- !u!114 &6315690778453220346
+--- !u!114 &5879948962663441007
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690778453220348}
+ m_GameObject: {fileID: 124998065710621604}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -65,7 +65,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 'pos
+ m_text: 'time
'
m_isRightToLeft: 0
@@ -95,8 +95,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 15
- m_fontSizeBase: 15
+ m_fontSize: 13
+ m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -131,13 +131,13 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 1.4672852, y: -1.4650574, z: 0.921875, w: -1.0431519}
+ m_margin: {x: 1.4672852, y: -1.4650574, z: 0.921875, w: -0.0009460449}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6315690778580790669
+--- !u!1 &2449321289717057983
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -145,50 +145,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6315690778580790666}
- - component: {fileID: 6315690778580790664}
- - component: {fileID: 6315690778580790667}
+ - component: {fileID: 8108497489648380714}
+ - component: {fileID: 6410660071317436686}
+ - component: {fileID: 8049363517905623455}
m_Layer: 5
- m_Name: time
+ m_Name: name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &6315690778580790666
+--- !u!224 &8108497489648380714
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690778580790669}
+ m_GameObject: {fileID: 2449321289717057983}
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: 6315690780063725166}
- m_RootOrder: 2
+ m_Father: {fileID: 421609571720676612}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -46.277496, y: 0}
- m_SizeDelta: {x: 92.55499, y: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0.000011802, y: 0}
+ m_SizeDelta: {x: 214.6729, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6315690778580790664
+--- !u!222 &6410660071317436686
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690778580790669}
+ m_GameObject: {fileID: 2449321289717057983}
m_CullTransparentMesh: 1
---- !u!114 &6315690778580790667
+--- !u!114 &8049363517905623455
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690778580790669}
+ m_GameObject: {fileID: 2449321289717057983}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -202,7 +202,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 'time
+ m_text: 'name
'
m_isRightToLeft: 0
@@ -232,8 +232,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 15
- m_fontSizeBase: 15
+ m_fontSize: 13
+ m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -274,7 +274,7 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6315690779960099469
+--- !u!1 &2536761012418181940
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -282,50 +282,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6315690779960099466}
- - component: {fileID: 6315690779960099464}
- - component: {fileID: 6315690779960099467}
+ - component: {fileID: 2952053704515104758}
+ - component: {fileID: 2296404046453397700}
+ - component: {fileID: 3393229973538289317}
m_Layer: 5
- m_Name: name
+ m_Name: pos
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &6315690779960099466
+--- !u!224 &2952053704515104758
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690779960099469}
+ m_GameObject: {fileID: 2536761012418181940}
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: 6315690780063725166}
- m_RootOrder: 1
+ m_Father: {fileID: 421609571720676612}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 89.428894, y: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 47.324844, y: 0}
+ m_SizeDelta: {x: 94.64969, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6315690779960099464
+--- !u!222 &2296404046453397700
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690779960099469}
+ m_GameObject: {fileID: 2536761012418181940}
m_CullTransparentMesh: 1
---- !u!114 &6315690779960099467
+--- !u!114 &3393229973538289317
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690779960099469}
+ m_GameObject: {fileID: 2536761012418181940}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -339,7 +339,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 'name
+ m_text: 'pos
'
m_isRightToLeft: 0
@@ -369,8 +369,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 15
- m_fontSizeBase: 15
+ m_fontSize: 13
+ m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -405,13 +405,13 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 1.4672852, y: -1.4650574, z: 0.921875, w: -0.0009460449}
+ m_margin: {x: 1.4672852, y: -1.4650574, z: 0.921875, w: -1.0431519}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6315690780063725169
+--- !u!1 &7641950425958921102
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -419,8 +419,8 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6315690780063725166}
- - component: {fileID: 697804499352742820}
+ - component: {fileID: 421609571720676612}
+ - component: {fileID: 8327529731398035604}
m_Layer: 5
m_Name: rowZen
m_TagString: Untagged
@@ -428,20 +428,20 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &6315690780063725166
+--- !u!224 &421609571720676612
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690780063725169}
+ m_GameObject: {fileID: 7641950425958921102}
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:
- - {fileID: 6315690778453220349}
- - {fileID: 6315690779960099466}
- - {fileID: 6315690778580790666}
+ - {fileID: 2952053704515104758}
+ - {fileID: 8108497489648380714}
+ - {fileID: 6886895535143853388}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -450,18 +450,18 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &697804499352742820
+--- !u!114 &8327529731398035604
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6315690780063725169}
+ m_GameObject: {fileID: 7641950425958921102}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7cff41c0d15660b4ba5e92a10aaed51c, type: 3}
m_Name:
m_EditorClassIdentifier:
- pos: {fileID: 6315690778453220346}
- name: {fileID: 6315690779960099467}
- time: {fileID: 6315690778580790667}
+ pos: {fileID: 3393229973538289317}
+ name: {fileID: 8049363517905623455}
+ time: {fileID: 5879948962663441007}
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index a29944bbb74f6134df3bc23709a7b301a535b5eb..b682769b458f918c5d0316e539e2c4e8038ecc2a 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -345,7 +345,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2034325381}
- m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp
+ m_TargetAssemblyTypeName: GameMode, Assembly-CSharp
m_MethodName: PlayGameZen
m_Mode: 1
m_Arguments:
@@ -576,6 +576,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+ - m_Target: {fileID: 1270903342}
+ m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp
+ m_MethodName: PlayGame
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!114 &105559912
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -806,7 +818,7 @@ MonoBehaviour:
m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 1
- m_CellSize: {x: 489.8399, y: 20}
+ m_CellSize: {x: 489.8399, y: 17}
m_Spacing: {x: 0, y: 0}
m_Constraint: 1
m_ConstraintCount: 1
@@ -822,8 +834,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 913ab001ef00ad8408748e7c6ae0d820, type: 3}
m_Name:
m_EditorClassIdentifier:
- rowUi: {fileID: 697804499352742820, guid: 2ac6f7a7409e6c846bbc88ce3d922c0f, type: 3}
- scoreManagerLBZen: {fileID: 1681325032}
+ rowUi: {fileID: 8327529731398035604, guid: 2ac6f7a7409e6c846bbc88ce3d922c0f, type: 3}
--- !u!1 &207246283
GameObject:
m_ObjectHideFlags: 0
@@ -1301,7 +1312,7 @@ MonoBehaviour:
m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 1
- m_CellSize: {x: 489.8399, y: 20}
+ m_CellSize: {x: 489.8399, y: 17}
m_Spacing: {x: 0, y: 0}
m_Constraint: 1
m_ConstraintCount: 1
@@ -1317,8 +1328,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f7d1aef7357f4f498f7b96106bdb4a4, type: 3}
m_Name:
m_EditorClassIdentifier:
- rowUi: {fileID: 902704291003200355, guid: 77524c1ffb1ff08459066ebbd17a82cf, type: 3}
- scoreManagerLBWave: {fileID: 1047215557}
+ rowUi: {fileID: 2963588941778501062, guid: 77524c1ffb1ff08459066ebbd17a82cf, type: 3}
--- !u!1 &438901920
GameObject:
m_ObjectHideFlags: 0
@@ -1404,7 +1414,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2034325381}
- m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp
+ m_TargetAssemblyTypeName: GameMode, Assembly-CSharp
m_MethodName: PlayGameWave
m_Mode: 1
m_Arguments:
@@ -2120,7 +2130,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -67.004456, y: 0}
+ m_AnchoredPosition: {x: -55.9, y: 0}
m_SizeDelta: {x: -400.571, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &840293741
@@ -2876,7 +2886,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 67.995544, y: 0}
+ m_AnchoredPosition: {x: 79.1, y: 0}
m_SizeDelta: {x: -400.571, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1199610376
@@ -3982,7 +3992,7 @@ GameObject:
- component: {fileID: 1501508070}
- component: {fileID: 1501508069}
m_Layer: 5
- m_Name: InputField (TMP)
+ m_Name: InputName
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -4994,7 +5004,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2034325379}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1e4c93e2e14aff646ac6f4bf1e5e9f14, type: 3}
+ m_Script: {fileID: 11500000, guid: 834ef040cd4c58548bc6455a0dac8d91, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2052411761
diff --git a/Assets/Scenes/Wave.unity b/Assets/Scenes/Wave.unity
index 23026c3e6da1575325aa6bcddeefd8798870005f..ca42c3060aab3271edefbc3423ea9b523b676d1e 100644
--- a/Assets/Scenes/Wave.unity
+++ b/Assets/Scenes/Wave.unity
@@ -151,7 +151,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
--- !u!1001 &33458243
PrefabInstance:
@@ -570,7 +570,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 16
+ m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0}
--- !u!1 &38786124
GameObject:
@@ -766,7 +766,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &240257946
GameObject:
@@ -797,7 +797,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &240257952
MonoBehaviour:
@@ -846,7 +846,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0}
--- !u!1 &581701014 stripped
GameObject:
@@ -6427,7 +6427,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 17
+ m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &1109176447
GameObject:
@@ -6532,7 +6532,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1200747991
GameObject:
@@ -6818,7 +6818,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 20
+ m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1401845282
GameObject:
@@ -7006,7 +7006,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 22
+ m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1500595053
GameObject:
@@ -7144,6 +7144,49 @@ LightingSettings:
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
+--- !u!1 &1564018685
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1564018687}
+ - component: {fileID: 1564018686}
+ m_Layer: 0
+ m_Name: LeaderboardManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1564018686
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1564018685}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: baef1aaf399ba1a4287298bbb000cb19, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &1564018687
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1564018685}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 3.0024414, y: 0.8076172, z: 1.6347656}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1610549459
GameObject:
m_ObjectHideFlags: 0
@@ -7172,7 +7215,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 19
+ m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1687477066
PrefabInstance:
@@ -7561,7 +7604,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1851137271
GameObject:
@@ -7609,7 +7652,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1959653980
GameObject:
@@ -7639,7 +7682,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 21
+ m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2045825618
GameObject:
@@ -7669,7 +7712,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 18
+ m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &2077147800
GameObject:
@@ -7716,5 +7759,5 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/Zen.unity b/Assets/Scenes/Zen.unity
index 6c891df84c0d0268d86a309df8bd69a85a832bd0..c71155669b1648e3339b2509256ca6cb1396d64f 100644
--- a/Assets/Scenes/Zen.unity
+++ b/Assets/Scenes/Zen.unity
@@ -151,7 +151,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
--- !u!1001 &33458243
PrefabInstance:
@@ -570,7 +570,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 16
+ m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0}
--- !u!1 &38786124
GameObject:
@@ -858,7 +858,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &240257946
GameObject:
@@ -889,7 +889,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &240257951
MonoBehaviour:
@@ -941,7 +941,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0}
--- !u!1 &581701014 stripped
GameObject:
@@ -6321,6 +6321,49 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 857069320}
m_CullTransparentMesh: 0
+--- !u!1 &986199840
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 986199841}
+ - component: {fileID: 986199842}
+ m_Layer: 0
+ m_Name: LeaderboardManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &986199841
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 986199840}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 3.0024414, y: 0.8076172, z: 1.6347656}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &986199842
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 986199840}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cb04a887e43a1d5499ffbf7c4c76060f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &994121186
GameObject:
m_ObjectHideFlags: 0
@@ -6522,7 +6565,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 17
+ m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &1109176447
GameObject:
@@ -6627,7 +6670,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1200747991
GameObject:
@@ -6913,7 +6956,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 20
+ m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1401845282
GameObject:
@@ -7101,7 +7144,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 22
+ m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1500595053
GameObject:
@@ -7267,7 +7310,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 19
+ m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1687477066
PrefabInstance:
@@ -7564,7 +7607,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1851137271
GameObject:
@@ -7612,7 +7655,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1959653980
GameObject:
@@ -7642,7 +7685,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 21
+ m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2045825618
GameObject:
@@ -7672,7 +7715,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 18
+ m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &2077147800
GameObject:
@@ -7719,5 +7762,5 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scripts/Leaderboard/WAVE/ScoreManagerLBWave.cs b/Assets/Scripts/Leaderboard/WAVE/ScoreManagerLBWave.cs
index d80eb6415d18ec93fae3ebe56edeae6966c15788..6d6cc14e8b259fcf508b00fee53ae59185d4ac5b 100644
--- a/Assets/Scripts/Leaderboard/WAVE/ScoreManagerLBWave.cs
+++ b/Assets/Scripts/Leaderboard/WAVE/ScoreManagerLBWave.cs
@@ -5,13 +5,12 @@ using System.Linq;
public class ScoreManagerLBWave : MonoBehaviour
{
- public PlayerPrefs playerstat;
private ScoreWaveData swd;
+ public static ScoreManagerLBWave scoreManagerLBWave;
void Awake()
{
+ scoreManagerLBWave = this;
var json = PlayerPrefs.GetString("scores", "{}");
- Debug.Log("Awake Wave");
- Debug.Log(json);
swd = JsonUtility.FromJson<ScoreWaveData>(json);
}
@@ -33,8 +32,6 @@ public class ScoreManagerLBWave : MonoBehaviour
public void SaveScoreWave()
{
var json = JsonUtility.ToJson(swd);
- Debug.Log("Destroy wave");
- Debug.Log(json);
PlayerPrefs.SetString("scores", json);
}
diff --git a/Assets/Scripts/Leaderboard/WAVE/ScoreUIWave.cs b/Assets/Scripts/Leaderboard/WAVE/ScoreUIWave.cs
index b08ec3313f3b8bdfcbc3ffa1432fa3ba534df98f..2bd5224c3d72793f4ccba92aeab5450f7592552d 100644
--- a/Assets/Scripts/Leaderboard/WAVE/ScoreUIWave.cs
+++ b/Assets/Scripts/Leaderboard/WAVE/ScoreUIWave.cs
@@ -6,22 +6,18 @@ using UnityEngine;
public class ScoreUIWave : MonoBehaviour
{
public RowUIWave rowUi;
- public ScoreManagerLBWave scoreManagerLBWave;
void Start()
{
- scoreManagerLBWave.AddScoreWave(new ScoreWave("Chris", 6, 1500));
- scoreManagerLBWave.AddScoreWave(new ScoreWave("Bryan", 4, 1939));
- scoreManagerLBWave.AddScoreWave(new ScoreWave("Max", 7, 15090));
- var scores = scoreManagerLBWave.GetHighestScore().ToArray();
+ var scores = ScoreManagerLBWave.scoreManagerLBWave.GetHighestScore().ToArray();
var countWave = 0;
- if(scores.Length< 9)
+ if(scores.Length< 10)
{
countWave = scores.Length;
}
else
{
- countWave = 9;
+ countWave = 10;
}
for (int i = 0; i < countWave; i++)
{
@@ -29,7 +25,7 @@ public class ScoreUIWave : MonoBehaviour
row.pos.text = (i + 1).ToString();
row.name.text = scores[i].name;
row.wave.text = scores[i].wave.ToString();
- row.score.text = scores[i].wave.ToString();
+ row.score.text = scores[i].score.ToString();
}
}
}
diff --git a/Assets/Scripts/Leaderboard/WAVE/ScoreWave.cs b/Assets/Scripts/Leaderboard/WAVE/ScoreWave.cs
index 684b1f67e43088eacfa79e2c0cd1650538f02a08..6ade2fb72d45e4475232bb57b0547ea57a6a6fcc 100644
--- a/Assets/Scripts/Leaderboard/WAVE/ScoreWave.cs
+++ b/Assets/Scripts/Leaderboard/WAVE/ScoreWave.cs
@@ -7,10 +7,10 @@ using System;
public class ScoreWave
{
public string name;
- public float wave;
+ public int wave;
public float score;
- public ScoreWave(string name, float wave, float score)
+ public ScoreWave(string name, int wave, float score)
{
this.name = name;
this.wave = wave;
diff --git a/Assets/Scripts/Leaderboard/ZEN/ScoreManagerLBZen.cs b/Assets/Scripts/Leaderboard/ZEN/ScoreManagerLBZen.cs
index c8b047e8a26809a9759aba3e0c1d0422946d2be9..cb06bd7c2d4318b744a08c6adbbd138ba0f5728a 100644
--- a/Assets/Scripts/Leaderboard/ZEN/ScoreManagerLBZen.cs
+++ b/Assets/Scripts/Leaderboard/ZEN/ScoreManagerLBZen.cs
@@ -5,13 +5,12 @@ using System.Linq;
public class ScoreManagerLBZen : MonoBehaviour
{
-
private ScoreTimeData std;
+ public static ScoreManagerLBZen scoreManagerLBZen;
void Awake()
{
+ scoreManagerLBZen = this;
var json = PlayerPrefs.GetString("times", "{}");
- Debug.Log("Awake Zen");
- Debug.Log(json);
std = JsonUtility.FromJson<ScoreTimeData>(json);
}
@@ -33,14 +32,11 @@ public class ScoreManagerLBZen : MonoBehaviour
public void SaveScoreZen()
{
var json = JsonUtility.ToJson(std);
- Debug.Log("Destroy Zen");
- Debug.Log(json);
PlayerPrefs.SetString("times", json);
}
public void ClearScoreZen()
{
- var json = JsonUtility.ToJson(std);
Debug.Log("Clear Zen");
PlayerPrefs.SetString("times", "{}");
}
diff --git a/Assets/Scripts/Leaderboard/ZEN/ScoreUIZen.cs b/Assets/Scripts/Leaderboard/ZEN/ScoreUIZen.cs
index 2e39cb8776a4a4718f43877221c3334c69477b3f..8f0a2d45b5c9055ca194a3bd293f8ee9234f05c3 100644
--- a/Assets/Scripts/Leaderboard/ZEN/ScoreUIZen.cs
+++ b/Assets/Scripts/Leaderboard/ZEN/ScoreUIZen.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -6,26 +7,30 @@ using UnityEngine;
public class ScoreUIZen : MonoBehaviour
{
public RowUIZen rowUi;
- public ScoreManagerLBZen scoreManagerLBZen;
+ private TimeSpan timePlaying;
void Start()
{
- var times = scoreManagerLBZen.GetLongestTime().ToArray();
+ var times = ScoreManagerLBZen.scoreManagerLBZen.GetLongestTime().ToArray();
var countZen = 0;
- if (times.Length < 9)
+ if (times.Length < 10)
{
countZen = times.Length;
}
else
{
- countZen = 9;
+ countZen = 10;
}
for (int i = 0; i < countZen; i++)
{
var row = Instantiate(rowUi, transform).GetComponent<RowUIZen>();
row.pos.text = (i + 1).ToString();
row.name.text = times[i].name;
- row.time.text = times[i].time.ToString();
+
+ //Convert to time
+ timePlaying = TimeSpan.FromSeconds(times[i].time);
+ string timePlayingStr = timePlaying.ToString("mm':'ss");
+ row.time.text = timePlayingStr;
}
}
}
diff --git a/Assets/Scripts/MainMenu/GameMode.cs b/Assets/Scripts/MainMenu/GameMode.cs
new file mode 100644
index 0000000000000000000000000000000000000000..32c6ff68427773ef9f1c2ee8a3d0690f66340219
--- /dev/null
+++ b/Assets/Scripts/MainMenu/GameMode.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class GameMode : MonoBehaviour
+{
+ public void PlayGameZen()
+ {
+ SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1);
+ }
+
+ public void PlayGameWave()
+ {
+ SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 2);
+ }
+}
diff --git a/Assets/Scripts/MainMenu/GameMode.cs.meta b/Assets/Scripts/MainMenu/GameMode.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4d727cd4f516de07eb9da2541497c86888ab9c98
--- /dev/null
+++ b/Assets/Scripts/MainMenu/GameMode.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 834ef040cd4c58548bc6455a0dac8d91
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/MainMenu/MainMenu.cs b/Assets/Scripts/MainMenu/MainMenu.cs
index e8a4306ee02d5925cf04c94f55d4bdb61f61344b..d31c8300df46b1b0a8603f6c367ba02ecb9c78ce 100644
--- a/Assets/Scripts/MainMenu/MainMenu.cs
+++ b/Assets/Scripts/MainMenu/MainMenu.cs
@@ -1,18 +1,23 @@
using System.Collections;
using System.Collections.Generic;
+using TMPro;
using UnityEngine;
-using UnityEngine.SceneManagement;
+
public class MainMenu : MonoBehaviour
{
- public void PlayGameZen ()
+ public static TMP_InputField inputName;
+
+ private void Awake()
{
- SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1);
+ inputName = transform.Find("InputName").GetComponent<TMP_InputField>();
+
+ inputName.text = "Player 1";
}
- public void PlayGameWave()
+ public void PlayGame()
{
- SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 2);
+ PlayerPrefs.SetString("player_name", inputName.text);
}
public void QuitGame ()
diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManager.cs
index 180bf687404e563176de539fe4aa503b3c1d9f55..acc261641140b3ace7948788eba02a28e7f926a2 100644
--- a/Assets/Scripts/Managers/GameOverManager.cs
+++ b/Assets/Scripts/Managers/GameOverManager.cs
@@ -23,13 +23,24 @@ public class GameOverManager : MonoBehaviour
{
if (playerHealth.currentHealth <= 0)
{
- TimerController.instance.EndTimer();
+ if (SceneManager.GetActiveScene().buildIndex == 1)
+ {
+ TimerController.instance.EndTimer();
+ }
anim.SetTrigger("GameOver");
restartTimer += Time.deltaTime;
if (restartTimer >= restartDelay)
{
+ if (SceneManager.GetActiveScene().buildIndex == 1)
+ {
+ ScoreManagerLBZen.scoreManagerLBZen.AddScoreTime(new ScoreTime(PlayerPrefs.GetString("player_name"), TimerController.elapsedTime));
+ }
+ else if (SceneManager.GetActiveScene().buildIndex == 2)
+ {
+ ScoreManagerLBWave.scoreManagerLBWave.AddScoreWave(new ScoreWave(PlayerPrefs.GetString("player_name"), WaveManager.wave, ScoreManager.score));
+ }
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex - SceneManager.GetActiveScene().buildIndex);
}
}
diff --git a/Assets/Scripts/Managers/TimerController.cs b/Assets/Scripts/Managers/TimerController.cs
index 4b4b943f398ff7a03c709bb043fb08cd28b50d8e..0e9d02d197369fdb5b23033091c0aa6a71dd5099 100644
--- a/Assets/Scripts/Managers/TimerController.cs
+++ b/Assets/Scripts/Managers/TimerController.cs
@@ -13,7 +13,7 @@ public class TimerController : MonoBehaviour
private TimeSpan timePlaying;
private bool timerGoing;
- private float elapsedTime;
+ public static float elapsedTime;
private void Awake()
{
diff --git a/Assets/Scripts/Managers/WaveManager.cs b/Assets/Scripts/Managers/WaveManager.cs
new file mode 100644
index 0000000000000000000000000000000000000000..fef93a82471bab6ad933698c1156745b7a85b067
--- /dev/null
+++ b/Assets/Scripts/Managers/WaveManager.cs
@@ -0,0 +1,24 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System.Collections;
+
+public class WaveManager : MonoBehaviour
+{
+ public static int wave;
+
+
+ Text text;
+
+
+ void Awake()
+ {
+ text = GetComponent<Text>();
+ wave = 0;
+ }
+
+
+ void Update()
+ {
+ text.text = "Wave: " + wave;
+ }
+}
diff --git a/Assets/Scripts/Managers/WaveManager.cs.meta b/Assets/Scripts/Managers/WaveManager.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..975441da46441079d83893896ed3488c1a55f9cc
--- /dev/null
+++ b/Assets/Scripts/Managers/WaveManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ee047f1f4ba32f94888278b21b63beb0
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Spawner/EnemySpawnerWave.cs b/Assets/Scripts/Spawner/EnemySpawnerWave.cs
index f29817bff5780c8af87c75c0f1912d5d198e04a3..0a5e33fefbe1f95957d6f7802c5414ea1fefd27b 100644
--- a/Assets/Scripts/Spawner/EnemySpawnerWave.cs
+++ b/Assets/Scripts/Spawner/EnemySpawnerWave.cs
@@ -36,6 +36,7 @@ public class EnemySpawnerWave : MonoBehaviour
StartCoroutine(SpawnEnemy(0, 0, zombunnyCount));
StartCoroutine(SpawnEnemy(1, 1, zombearCount));
StartCoroutine(SpawnEnemy(2, 2, hellephantCount));
+ WaveManager.wave = waveCount;
}
void NextWave()
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index e37f88e17cf7554ae7b5608db21ba494191eefad..8ba837e29417056e0d6341fd0f88e91a84945b2d 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,16 +12,16 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7315001214157c7968252320092a
flags: 0
RecentlyUsedScenePath-2:
- value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+ value: 22424703114646680e0b0227036c651518590d24253c3f
flags: 0
RecentlyUsedScenePath-3:
- value: 22424703114646680e0b0227036c651518590d24253c3f
+ value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0
RecentlyUsedScenePath-4:
- value: 22424703114646680e0b0227036c68110012563f22213229
+ value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0
RecentlyUsedScenePath-5:
- value: 22424703114646680e0b0227036c651518590d24253c3f
+ value: 22424703114646680e0b0227036c68110012563f22213229
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650