Skip to content

Commit f9abb3c

Browse files
committed
fix: unready button not clickable on wide screens (#552)
* Adjusted animation and clickable zone on character selection button * Made the top-right info display slightly more compact in char select scene
1 parent 9a6d601 commit f9abb3c

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1bc7905b3d3e1909976a255d8cdebeaf45cdeb0f7398db5591431c57ad937223
2+
oid sha256:038a2df2a177de24ef8ae5860f9967b0a8dcbc98fdc46a33a87fabd422d13a20
33
size 4134

Assets/BossRoom/Prefabs/UI/CharacterSelectCanvas.prefab

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ RectTransform:
658658
m_AnchorMin: {x: 1, y: 1}
659659
m_AnchorMax: {x: 1, y: 1}
660660
m_AnchoredPosition: {x: -26, y: -22}
661-
m_SizeDelta: {x: 360, y: 370}
661+
m_SizeDelta: {x: 360, y: 334.8134}
662662
m_Pivot: {x: 1, y: 1}
663663
--- !u!222 &5940892340808018830
664664
CanvasRenderer:
@@ -1833,7 +1833,7 @@ RectTransform:
18331833
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18341834
m_AnchorMin: {x: 1, y: 1}
18351835
m_AnchorMax: {x: 1, y: 1}
1836-
m_AnchoredPosition: {x: -110, y: -220}
1836+
m_AnchoredPosition: {x: -110, y: -201.2}
18371837
m_SizeDelta: {x: 70, y: 70}
18381838
m_Pivot: {x: 0, y: 1}
18391839
--- !u!222 &5940892341571103607
@@ -2571,7 +2571,7 @@ RectTransform:
25712571
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
25722572
m_AnchorMin: {x: 0, y: 1}
25732573
m_AnchorMax: {x: 0, y: 1}
2574-
m_AnchoredPosition: {x: 40, y: -220}
2574+
m_AnchoredPosition: {x: 40, y: -201.2}
25752575
m_SizeDelta: {x: 70, y: 70}
25762576
m_Pivot: {x: 0, y: 1}
25772577
--- !u!222 &5940892342366699524
@@ -2662,7 +2662,7 @@ RectTransform:
26622662
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
26632663
m_AnchorMin: {x: 0.5, y: 1}
26642664
m_AnchorMax: {x: 0.5, y: 1}
2665-
m_AnchoredPosition: {x: -34.09987, y: -220}
2665+
m_AnchoredPosition: {x: -34.09987, y: -201.2}
26662666
m_SizeDelta: {x: 70, y: 70}
26672667
m_Pivot: {x: 0, y: 1}
26682668
--- !u!222 &5940892342369331860
@@ -3141,7 +3141,7 @@ MonoBehaviour:
31413141
m_EditorClassIdentifier:
31423142
m_Material: {fileID: 0}
31433143
m_Color: {r: 1, g: 1, b: 1, a: 1}
3144-
m_RaycastTarget: 1
3144+
m_RaycastTarget: 0
31453145
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
31463146
m_Maskable: 1
31473147
m_OnCullStateChanged:

Assets/BossRoom/Prefabs/UI/PlayerSeatTemplate.prefab

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ MonoBehaviour:
134134
m_EditorClassIdentifier:
135135
m_Material: {fileID: 0}
136136
m_Color: {r: 1, g: 1, b: 1, a: 1}
137-
m_RaycastTarget: 1
137+
m_RaycastTarget: 0
138138
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
139139
m_Maskable: 1
140140
m_OnCullStateChanged:
@@ -211,7 +211,7 @@ MonoBehaviour:
211211
m_EditorClassIdentifier:
212212
m_Material: {fileID: 0}
213213
m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
214-
m_RaycastTarget: 1
214+
m_RaycastTarget: 0
215215
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
216216
m_Maskable: 1
217217
m_OnCullStateChanged:
@@ -286,7 +286,7 @@ MonoBehaviour:
286286
m_EditorClassIdentifier:
287287
m_Material: {fileID: 0}
288288
m_Color: {r: 1, g: 1, b: 1, a: 1}
289-
m_RaycastTarget: 1
289+
m_RaycastTarget: 0
290290
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
291291
m_Maskable: 1
292292
m_OnCullStateChanged:
@@ -572,7 +572,7 @@ MonoBehaviour:
572572
m_EditorClassIdentifier:
573573
m_Material: {fileID: 0}
574574
m_Color: {r: 1, g: 1, b: 1, a: 1}
575-
m_RaycastTarget: 1
575+
m_RaycastTarget: 0
576576
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
577577
m_Maskable: 1
578578
m_OnCullStateChanged:
@@ -623,8 +623,8 @@ RectTransform:
623623
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
624624
m_AnchorMin: {x: 0, y: 0}
625625
m_AnchorMax: {x: 1, y: 1}
626-
m_AnchoredPosition: {x: 0, y: 0}
627-
m_SizeDelta: {x: 0, y: 0}
626+
m_AnchoredPosition: {x: 0, y: -30.530191}
627+
m_SizeDelta: {x: 0, y: -61.0604}
628628
m_Pivot: {x: 0.5, y: 0.5}
629629
--- !u!222 &6395838069626678129
630630
CanvasRenderer:
@@ -860,7 +860,7 @@ MonoBehaviour:
860860
m_EditorClassIdentifier:
861861
m_Material: {fileID: 0}
862862
m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
863-
m_RaycastTarget: 1
863+
m_RaycastTarget: 0
864864
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
865865
m_Maskable: 1
866866
m_OnCullStateChanged:
@@ -1152,6 +1152,7 @@ MonoBehaviour:
11521152
m_Button: {fileID: 7451589453558463903}
11531153
m_Animator: {fileID: 6724969306933167588}
11541154
m_AnimatorTriggerWhenLockedIn: LockedIn
1155+
m_AnimatorTriggerWhenUnlocked: Unlocked
11551156
m_CharacterClass: 0
11561157
--- !u!1 &8178652671128446346
11571158
GameObject:
@@ -1212,7 +1213,7 @@ MonoBehaviour:
12121213
m_EditorClassIdentifier:
12131214
m_Material: {fileID: 0}
12141215
m_Color: {r: 1, g: 1, b: 1, a: 1}
1215-
m_RaycastTarget: 1
1216+
m_RaycastTarget: 0
12161217
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
12171218
m_Maskable: 1
12181219
m_OnCullStateChanged:
@@ -1287,7 +1288,7 @@ MonoBehaviour:
12871288
m_EditorClassIdentifier:
12881289
m_Material: {fileID: 0}
12891290
m_Color: {r: 1, g: 1, b: 1, a: 1}
1290-
m_RaycastTarget: 1
1291+
m_RaycastTarget: 0
12911292
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
12921293
m_Maskable: 1
12931294
m_OnCullStateChanged:

0 commit comments

Comments
 (0)