Skip to content

Commit

Permalink
feat: Merge pull request #37 from Wizards-vs-Robots/dev
Browse files Browse the repository at this point in the history 
feat: progression and tests
  • Loading branch information
@4kills
4kills authored Jun 14, 2022
2 parents 09a5546 + dc05296 commit f0956d5
Show file tree
Hide file tree
Showing 30 changed files with 2,060 additions and 725 deletions.
2,145 changes: 1,550 additions & 595 deletions Assets/Scenes/Game.unity
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/Scenes/HighscoreView.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ 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: -855, y: 415}
m_AnchoredPosition: {x: -704, y: 415}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &611867282
Expand Down
72 changes: 36 additions & 36 deletions Assets/Scenes/KeyBindingMenu.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &71057673
Expand Down Expand Up @@ -717,7 +717,7 @@ 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: -56.967, y: -0.0000076293945}
m_AnchoredPosition: {x: 52, y: -0.0000076293945}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &132363230
Expand Down Expand Up @@ -1725,7 +1725,7 @@ 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: -371, y: 38}
m_AnchoredPosition: {x: -320, y: 38}
m_SizeDelta: {x: 760.4973, y: 824.8098}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &352570126
Expand Down Expand Up @@ -1774,7 +1774,7 @@ 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: -56.967, y: -0.0000076293945}
m_AnchoredPosition: {x: 49.000042, y: -0.0000076293945}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &367131084
Expand Down Expand Up @@ -2165,15 +2165,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 401607234}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 273802764}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &401607236
Expand Down Expand Up @@ -2334,7 +2334,7 @@ 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: -855, y: 415}
m_AnchoredPosition: {x: -710, y: 415}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &518388431
Expand Down Expand Up @@ -2469,15 +2469,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 544981113}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1957137051}
m_RootOrder: 0
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: -56.967, y: -0.0000076293945}
m_AnchoredPosition: {x: 52.00001, y: -0.0000076293945}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &544981115
Expand Down Expand Up @@ -2593,7 +2593,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49.000042, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &623979542
Expand Down Expand Up @@ -3066,7 +3066,7 @@ 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: -855, y: 300}
m_AnchoredPosition: {x: -710, y: 300}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &835128816
Expand Down Expand Up @@ -3225,15 +3225,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 885356598}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 10501179}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &885356600
Expand Down Expand Up @@ -3341,15 +3341,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907347335}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1609336666}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &907347337
Expand Down Expand Up @@ -3834,15 +3834,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1047214302}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 223937617}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1047214304
Expand Down Expand Up @@ -3921,7 +3921,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49.000042, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1051810732
Expand Down Expand Up @@ -4776,15 +4776,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252130009}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2123762071}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1252130011
Expand Down Expand Up @@ -5104,15 +5104,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1290849277}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1431566966}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1290849279
Expand Down Expand Up @@ -6385,7 +6385,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49.000042, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1529016992
Expand Down Expand Up @@ -6543,7 +6543,7 @@ 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: -56.967, y: -0.0000076293945}
m_AnchoredPosition: {x: 49.000042, y: -0.0000076293945}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1592231018
Expand Down Expand Up @@ -7186,15 +7186,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1781802790}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1026685647}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1781802792
Expand Down Expand Up @@ -7352,7 +7352,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49.000042, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1831266930
Expand Down Expand Up @@ -7440,7 +7440,7 @@ 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: 419, y: 37.999992}
m_AnchoredPosition: {x: 338, y: 37.999992}
m_SizeDelta: {x: 760.4973, y: 824.8098}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1843458606
Expand Down Expand Up @@ -7481,15 +7481,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1853365492}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1920797280}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1853365494
Expand Down Expand Up @@ -8128,7 +8128,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49.000042, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2030898722
Expand Down Expand Up @@ -8302,15 +8302,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2113114734}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2045049227}
m_RootOrder: 0
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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 52.00001, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2113114736
Expand Down Expand Up @@ -8426,7 +8426,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49.000042, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2124961454
Expand Down Expand Up @@ -8675,7 +8675,7 @@ 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: -56.967, y: -0.0000061989}
m_AnchoredPosition: {x: 49.000042, y: -0.0000061989}
m_SizeDelta: {x: 566.0659, y: 33.0079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2134985676
Expand Down Expand Up @@ -8719,4 +8719,4 @@ CanvasRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2134985674}
m_CullTransparentMesh: 1
m_CullTransparentMesh: 1
2 changes: 1 addition & 1 deletion Assets/Scenes/MainMenu.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1854,7 +1854,7 @@ 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: 3.2937, y: 37.899}
m_AnchoredPosition: {x: 3.2937, y: -17}
m_SizeDelta: {x: 577.9937, y: 443.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2078510932
Expand Down
6 changes: 3 additions & 3 deletions Assets/Scenes/OptionMenu.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &378796641
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -765,7 +765,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: 0, y: -150}
m_AnchoredPosition: {x: 0, y: -95}
m_SizeDelta: {x: 200, y: -300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1341531698
Expand Down Expand Up @@ -898,7 +898,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: 0.0025024414, y: 150}
m_AnchoredPosition: {x: 0.0025024414, y: 95}
m_SizeDelta: {x: -100.01001, y: -300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1436079391
Expand Down
Loading

0 comments on commit f0956d5

Please sign in to comment.