Skip to content

Commit dbcd322

Browse files
jilfranco-unityjilfranco-unity
committed
Fix for buttons on android not blocking input to movement, as well as some clean up for unneeded raycast targets on the lobby ui
1 parent 4813ced commit dbcd322

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

‎Assets/BossRoom/Prefabs/UI/IPPopup.prefab

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ MonoBehaviour:
351351
m_EditorClassIdentifier:
352352
m_Material: {fileID: 0}
353353
m_Color: {r: 1, g: 1, b: 1, a: 1}
354-
m_RaycastTarget: 1
354+
m_RaycastTarget: 0
355355
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
356356
m_Maskable: 1
357357
m_OnCullStateChanged:
@@ -1014,7 +1014,7 @@ MonoBehaviour:
10141014
m_EditorClassIdentifier:
10151015
m_Material: {fileID: 0}
10161016
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
1017-
m_RaycastTarget: 1
1017+
m_RaycastTarget: 0
10181018
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
10191019
m_Maskable: 1
10201020
m_OnCullStateChanged:
@@ -1105,7 +1105,7 @@ MonoBehaviour:
11051105
m_EditorClassIdentifier:
11061106
m_Material: {fileID: 0}
11071107
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
1108-
m_RaycastTarget: 1
1108+
m_RaycastTarget: 0
11091109
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
11101110
m_Maskable: 1
11111111
m_OnCullStateChanged:
@@ -2086,7 +2086,7 @@ MonoBehaviour:
20862086
m_EditorClassIdentifier:
20872087
m_Material: {fileID: 0}
20882088
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
2089-
m_RaycastTarget: 1
2089+
m_RaycastTarget: 0
20902090
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
20912091
m_Maskable: 1
20922092
m_OnCullStateChanged:
@@ -3057,7 +3057,7 @@ MonoBehaviour:
30573057
m_EditorClassIdentifier:
30583058
m_Material: {fileID: 0}
30593059
m_Color: {r: 1, g: 1, b: 1, a: 1}
3060-
m_RaycastTarget: 1
3060+
m_RaycastTarget: 0
30613061
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
30623062
m_Maskable: 1
30633063
m_OnCullStateChanged:
@@ -3558,7 +3558,7 @@ MonoBehaviour:
35583558
m_EditorClassIdentifier:
35593559
m_Material: {fileID: 0}
35603560
m_Color: {r: 1, g: 1, b: 1, a: 1}
3561-
m_RaycastTarget: 1
3561+
m_RaycastTarget: 0
35623562
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
35633563
m_Maskable: 1
35643564
m_OnCullStateChanged:
@@ -3633,7 +3633,7 @@ MonoBehaviour:
36333633
m_EditorClassIdentifier:
36343634
m_Material: {fileID: 0}
36353635
m_Color: {r: 1, g: 1, b: 1, a: 1}
3636-
m_RaycastTarget: 1
3636+
m_RaycastTarget: 0
36373637
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
36383638
m_Maskable: 1
36393639
m_OnCullStateChanged:
@@ -4513,7 +4513,7 @@ MonoBehaviour:
45134513
m_EditorClassIdentifier:
45144514
m_Material: {fileID: 0}
45154515
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
4516-
m_RaycastTarget: 1
4516+
m_RaycastTarget: 0
45174517
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
45184518
m_Maskable: 1
45194519
m_OnCullStateChanged:

‎Assets/BossRoom/Prefabs/UI/LobbyUI.prefab

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ MonoBehaviour:
127127
m_EditorClassIdentifier:
128128
m_Material: {fileID: 0}
129129
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
130-
m_RaycastTarget: 1
130+
m_RaycastTarget: 0
131131
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
132132
m_Maskable: 1
133133
m_OnCullStateChanged:
@@ -217,7 +217,7 @@ MonoBehaviour:
217217
m_EditorClassIdentifier:
218218
m_Material: {fileID: 0}
219219
m_Color: {r: 1, g: 1, b: 1, a: 1}
220-
m_RaycastTarget: 1
220+
m_RaycastTarget: 0
221221
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
222222
m_Maskable: 1
223223
m_OnCullStateChanged:
@@ -1465,7 +1465,7 @@ MonoBehaviour:
14651465
m_EditorClassIdentifier:
14661466
m_Material: {fileID: 0}
14671467
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
1468-
m_RaycastTarget: 1
1468+
m_RaycastTarget: 0
14691469
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
14701470
m_Maskable: 1
14711471
m_OnCullStateChanged:
@@ -2454,7 +2454,7 @@ MonoBehaviour:
24542454
m_EditorClassIdentifier:
24552455
m_Material: {fileID: 0}
24562456
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, a: 1}
2457-
m_RaycastTarget: 1
2457+
m_RaycastTarget: 0
24582458
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
24592459
m_Maskable: 1
24602460
m_OnCullStateChanged:
@@ -3074,7 +3074,7 @@ MonoBehaviour:
30743074
m_EditorClassIdentifier:
30753075
m_Material: {fileID: 0}
30763076
m_Color: {r: 1, g: 1, b: 1, a: 1}
3077-
m_RaycastTarget: 1
3077+
m_RaycastTarget: 0
30783078
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
30793079
m_Maskable: 1
30803080
m_OnCullStateChanged:
@@ -3149,7 +3149,7 @@ MonoBehaviour:
31493149
m_EditorClassIdentifier:
31503150
m_Material: {fileID: 0}
31513151
m_Color: {r: 1, g: 1, b: 1, a: 1}
3152-
m_RaycastTarget: 1
3152+
m_RaycastTarget: 0
31533153
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
31543154
m_Maskable: 1
31553155
m_OnCullStateChanged:
@@ -3834,7 +3834,7 @@ MonoBehaviour:
38343834
m_EditorClassIdentifier:
38353835
m_Material: {fileID: 0}
38363836
m_Color: {r: 1, g: 1, b: 1, a: 1}
3837-
m_RaycastTarget: 1
3837+
m_RaycastTarget: 0
38383838
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
38393839
m_Maskable: 1
38403840
m_OnCullStateChanged:
@@ -4298,7 +4298,7 @@ MonoBehaviour:
42984298
m_faceColor:
42994299
serializedVersion: 2
43004300
rgba: 4294967295
4301-
m_fontSize: 20.3
4301+
m_fontSize: 33
43024302
m_fontSizeBase: 36
43034303
m_fontWeight: 400
43044304
m_enableAutoSizing: 1
@@ -4460,7 +4460,7 @@ MonoBehaviour:
44604460
m_TargetGraphic: {fileID: 6773627913577560496}
44614461
m_HandleRect: {fileID: 2234904744820987572}
44624462
m_Direction: 2
4463-
m_Value: 0
4463+
m_Value: 1
44644464
m_Size: 1
44654465
m_NumberOfSteps: 0
44664466
m_OnValueChanged:
@@ -5105,7 +5105,7 @@ MonoBehaviour:
51055105
m_faceColor:
51065106
serializedVersion: 2
51075107
rgba: 4294967295
5108-
m_fontSize: 20.3
5108+
m_fontSize: 33
51095109
m_fontSizeBase: 36
51105110
m_fontWeight: 400
51115111
m_enableAutoSizing: 1
@@ -5783,7 +5783,7 @@ MonoBehaviour:
57835783
m_EditorClassIdentifier:
57845784
m_Material: {fileID: 0}
57855785
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, a: 1}
5786-
m_RaycastTarget: 1
5786+
m_RaycastTarget: 0
57875787
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
57885788
m_Maskable: 1
57895789
m_OnCullStateChanged:

‎Assets/BossRoom/Scripts/Client/Game/Character/ClientInputSender.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ void FixedUpdate()
161161
}
162162

163163
m_ActionRequestCount = 0;
164+
165+
if (EventSystem.current.IsPointerOverGameObject() || EventSystem.current.currentSelectedGameObject != null)
166+
{
167+
return;
168+
}
164169

165170
if (m_MoveRequest)
166171
{
@@ -169,12 +174,14 @@ void FixedUpdate()
169174
{
170175
m_LastSentMove = Time.time;
171176
var ray = m_MainCamera.ScreenPointToRay(Input.mousePosition);
172-
if (Physics.RaycastNonAlloc(ray, k_CachedHit, k_MouseInputRaycastDistance, k_GroundLayerMask) > 0)
173177
{
174-
m_NetworkCharacter.SendCharacterInputServerRpc(k_CachedHit[0].point);
178+
if (Physics.RaycastNonAlloc(ray, k_CachedHit, k_MouseInputRaycastDistance, k_GroundLayerMask) > 0)
179+
{
180+
m_NetworkCharacter.SendCharacterInputServerRpc(k_CachedHit[0].point);
175181

176-
//Send our client only click request
177-
ClientMoveEvent?.Invoke(k_CachedHit[0].point);
182+
//Send our client only click request
183+
ClientMoveEvent?.Invoke(k_CachedHit[0].point);
184+
}
178185
}
179186
}
180187
}

‎Assets/BossRoom/Scripts/Client/UI/Lobby/LobbyUIMediator.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ public class LobbyUIMediator : MonoBehaviour
1414
[SerializeField] CanvasGroup m_CanvasGroup;
1515
[SerializeField] LobbyJoiningUI m_LobbyJoiningUI;
1616
[SerializeField] LobbyCreationUI m_LobbyCreationUI;
17-
[SerializeField] UITinter m_JoinToggle;
1817
[SerializeField] UITinter m_JoinToggleHighlight;
1918
[SerializeField] UITinter m_JoinToggleTabBlocker;
20-
[SerializeField] UITinter m_CreateToggle;
2119
[SerializeField] UITinter m_CreateToggleHighlight;
2220
[SerializeField] UITinter m_CreateToggleTabBlocker;
2321
[SerializeField] TextMeshProUGUI m_PlayerNameLabel;
@@ -194,10 +192,8 @@ public void ToggleJoinLobbyUI()
194192
{
195193
m_LobbyJoiningUI.Show();
196194
m_LobbyCreationUI.Hide();
197-
m_JoinToggle.SetToColor(1);
198195
m_JoinToggleHighlight.SetToColor(1);
199196
m_JoinToggleTabBlocker.SetToColor(1);
200-
m_CreateToggle.SetToColor(0);
201197
m_CreateToggleHighlight.SetToColor(0);
202198
m_CreateToggleTabBlocker.SetToColor(0);
203199
}
@@ -206,10 +202,8 @@ public void ToggleCreateLobbyUI()
206202
{
207203
m_LobbyJoiningUI.Hide();
208204
m_LobbyCreationUI.Show();
209-
m_JoinToggle.SetToColor(0);
210205
m_JoinToggleHighlight.SetToColor(0);
211206
m_JoinToggleTabBlocker.SetToColor(0);
212-
m_CreateToggle.SetToColor(1);
213207
m_CreateToggleHighlight.SetToColor(1);
214208
m_CreateToggleTabBlocker.SetToColor(1);
215209
}

0 commit comments

Comments
 (0)