Skip to content

Commit

Permalink
Fixed UI Bug Where Max Score Displayed "10"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jalen Jackson committed Feb 8, 2019
1 parent 32fff4f commit 832c1e8
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 22 deletions.
Binary file modified .vs/Pong/v15/Server/sqlite3/storage.ide-shm
Binary file not shown.
Binary file modified .vs/Pong/v15/Server/sqlite3/storage.ide-wal
Binary file not shown.
4 changes: 2 additions & 2 deletions Assets/Resources/Prefabs/Max Score Slider.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,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: 440, y: 0}
m_SizeDelta: {x: 80, y: 40}
m_AnchoredPosition: {x: 420, y: 0}
m_SizeDelta: {x: 130, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224587829721607772
RectTransform:
Expand Down
4 changes: 2 additions & 2 deletions Assets/Resources/Prefabs/Volume Slider.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,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: 430, y: 0}
m_SizeDelta: {x: 100, y: 40}
m_AnchoredPosition: {x: 420, y: 0}
m_SizeDelta: {x: 130, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224808177282300374
RectTransform:
Expand Down
28 changes: 10 additions & 18 deletions Assets/Scenes/StartMenu.unity
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &248309200
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -553,7 +553,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &529635909
RectTransform:
m_ObjectHideFlags: 0
Expand All @@ -571,7 +571,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: -445, y: -40}
m_AnchoredPosition: {x: -445, y: 0}
m_SizeDelta: {x: 50, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &529635910
Expand Down Expand Up @@ -754,7 +754,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1226278973
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -926,7 +926,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1351692115
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1127,10 +1127,6 @@ Prefab:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1142325843100562, guid: 9232b5cd01ac6454da9aeec942d944d9, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 9232b5cd01ac6454da9aeec942d944d9, type: 2}
m_IsPrefabParent: 0
Expand All @@ -1150,7 +1146,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1510134198
RectTransform:
m_ObjectHideFlags: 0
Expand All @@ -1168,7 +1164,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: 445, y: -40}
m_AnchoredPosition: {x: 445, y: 0}
m_SizeDelta: {x: 50, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1510134199
Expand Down Expand Up @@ -1388,7 +1384,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: 10, y: -100}
m_AnchoredPosition: {x: 10, y: 75}
m_SizeDelta: {x: 1200, y: 500}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1585757302
Expand Down Expand Up @@ -1461,7 +1457,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1693043907
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1550,7 +1546,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1717323977
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1782,10 +1778,6 @@ Prefab:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1621073098362250, guid: bbf20bcd6ef285b4f8873890aea3cb25, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: bbf20bcd6ef285b4f8873890aea3cb25, type: 2}
m_IsPrefabParent: 0
Expand Down
Binary file modified Builds/Windows/Pong_Data/globalgamemanagers
Binary file not shown.
Binary file modified Builds/Windows/Pong_Data/level0
Binary file not shown.
Binary file modified Builds/Windows/Pong_Data/level1
Binary file not shown.
Binary file modified Builds/Windows/Pong_Data/resources.assets
Binary file not shown.

0 comments on commit 832c1e8

Please sign in to comment.