Skip to content

fix: unready button not clickable on wide screens #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2022
Merged

fix: unready button not clickable on wide screens #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
237b925
Adjusted animation and clickable zone on character selection button
pdeschain Mar 15, 2022
b349748
Made the top-right info display slightly more compact in char select …
pdeschain Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/BossRoom/Models/UI_LobbyBox_LockedIn.anim
View file
Open in desktop
Git LFS file not shown
10 changes: 5 additions & 5 deletions Assets/BossRoom/Prefabs/UI/CharacterSelectCanvas.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -26, y: -22}
m_SizeDelta: {x: 360, y: 370}
m_SizeDelta: {x: 360, y: 334.8134}
m_Pivot: {x: 1, y: 1}
--- !u!222 &5940892340808018830
CanvasRenderer:
Expand Down Expand Up @@ -1833,7 +1833,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -110, y: -220}
m_AnchoredPosition: {x: -110, y: -201.2}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5940892341571103607
Expand Down Expand Up @@ -2571,7 +2571,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40, y: -220}
m_AnchoredPosition: {x: 40, y: -201.2}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5940892342366699524
Expand Down Expand Up @@ -2662,7 +2662,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -34.09987, y: -220}
m_AnchoredPosition: {x: -34.09987, y: -201.2}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5940892342369331860
Expand Down Expand Up @@ -3141,7 +3141,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down
19 changes: 10 additions & 9 deletions Assets/BossRoom/Prefabs/UI/PlayerSeatTemplate.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -211,7 +211,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -286,7 +286,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -572,7 +572,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -623,8 +623,8 @@ 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: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -30.530191}
m_SizeDelta: {x: 0, y: -61.0604}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6395838069626678129
CanvasRenderer:
Expand Down Expand Up @@ -860,7 +860,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -1152,6 +1152,7 @@ MonoBehaviour:
m_Button: {fileID: 7451589453558463903}
m_Animator: {fileID: 6724969306933167588}
m_AnimatorTriggerWhenLockedIn: LockedIn
m_AnimatorTriggerWhenUnlocked: Unlocked
m_CharacterClass: 0
--- !u!1 &8178652671128446346
GameObject:
Expand Down Expand Up @@ -1212,7 +1213,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -1287,7 +1288,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down