Skip to content

Fix/UI blocking pass #578

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 6 commits into from
Mar 29, 2022
Merged

Fix/UI blocking pass #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbcd322
Fix for buttons on android not blocking input to movement, as well as…
jilfranco-unity Mar 23, 2022
a816709
Removed unneeded components, as well as a small edit to IP UI Mediato…
jilfranco-unity Mar 23, 2022
1e367a9
Fixed some weird formatting leftover from testing
jilfranco-unity Mar 23, 2022
be4251b
More formatting fixes, whitespace is hard
jilfranco-unity Mar 23, 2022
493f33d
Tiny simplification of the event system check stuff--just changed it …
jilfranco-unity Mar 23, 2022
f7c3170
Changed the background of the pop up panel to be a raycast target so …
jilfranco-unity Mar 29, 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
50 changes: 8 additions & 42 deletions Assets/BossRoom/Prefabs/UI/IPPopup.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,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 @@ -1014,7 +1014,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, 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 @@ -1105,7 +1105,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, 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 @@ -1226,7 +1226,6 @@ GameObject:
- component: {fileID: 2057931095918228162}
- component: {fileID: 3217480593287788585}
- component: {fileID: 2242940246583725761}
- component: {fileID: 5835693888197301866}
- component: {fileID: 4351232040011826679}
m_Layer: 5
m_Name: JoinButton
Expand Down Expand Up @@ -1295,21 +1294,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1.5
--- !u!114 &5835693888197301866
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3825292631697100053}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 1, g: 1, b: 1, a: 1}
- {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &4351232040011826679
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2086,7 +2070,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, 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 @@ -2991,10 +2975,8 @@ MonoBehaviour:
m_PlayerNameLabel: {fileID: 7328528642576607773}
m_IPJoiningUI: {fileID: 4035387343632270047}
m_IPHostingUI: {fileID: 6512829474060433337}
m_JoinTabButtonTinter: {fileID: 5835693888197301866}
m_JoinTabButtonHighlightTinter: {fileID: 3300828701031786671}
m_JoinTabButtonTabBlockerTinter: {fileID: 3953053990258396426}
m_HostTabButtonTinter: {fileID: 8675839305897455978}
m_HostTabButtonHighlightTinter: {fileID: 1839781279224386958}
m_HostTabButtonTabBlockerTinter: {fileID: 8260437346995034578}
m_SignInSpinner: {fileID: 8543714399569277319}
Expand Down Expand Up @@ -3057,7 +3039,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 @@ -3558,7 +3540,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 @@ -3633,7 +3615,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 @@ -4029,7 +4011,6 @@ GameObject:
- component: {fileID: 4258862478995995494}
- component: {fileID: 1519931548906777285}
- component: {fileID: 4083683571038336106}
- component: {fileID: 8675839305897455978}
- component: {fileID: 996135322976812024}
m_Layer: 5
m_Name: CreateButton
Expand Down Expand Up @@ -4098,21 +4079,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1.5
--- !u!114 &8675839305897455978
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8406754363237041140}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 1, g: 1, b: 1, a: 1}
- {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &996135322976812024
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4513,7 +4479,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, 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
56 changes: 11 additions & 45 deletions Assets/BossRoom/Prefabs/UI/LobbyUI.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, 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 @@ -217,7 +217,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 @@ -995,7 +995,6 @@ GameObject:
- component: {fileID: 4996778416574021528}
- component: {fileID: 1242736280487814429}
- component: {fileID: 6028373986916100015}
- component: {fileID: 6915400021973830416}
- component: {fileID: 60699266497995633}
m_Layer: 5
m_Name: JoinButton
Expand Down Expand Up @@ -1064,21 +1063,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1.5
--- !u!114 &6915400021973830416
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2280189352372853816}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 1, g: 1, b: 1, a: 1}
- {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &60699266497995633
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1465,7 +1449,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, 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 @@ -1664,7 +1648,6 @@ GameObject:
- component: {fileID: 282255004005152861}
- component: {fileID: 5754057292363824191}
- component: {fileID: 6125749772841147739}
- component: {fileID: 7081295359045549679}
- component: {fileID: 1477683225176343646}
m_Layer: 5
m_Name: CreateButton
Expand Down Expand Up @@ -1733,21 +1716,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1.5
--- !u!114 &7081295359045549679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3672577566589301672}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 1, g: 1, b: 1, a: 1}
- {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &1477683225176343646
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2454,7 +2422,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.023529414, b: 0.04705883, 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 @@ -3074,7 +3042,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 @@ -3149,7 +3117,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 @@ -3834,7 +3802,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 @@ -4077,10 +4045,8 @@ MonoBehaviour:
m_CanvasGroup: {fileID: 6889764071769254414}
m_LobbyJoiningUI: {fileID: 3432713757992463987}
m_LobbyCreationUI: {fileID: 5370165130166260100}
m_JoinToggle: {fileID: 6915400021973830416}
m_JoinToggleHighlight: {fileID: 6752777071945805011}
m_JoinToggleTabBlocker: {fileID: 4806072236846957327}
m_CreateToggle: {fileID: 7081295359045549679}
m_CreateToggleHighlight: {fileID: 4585101913867269799}
m_CreateToggleTabBlocker: {fileID: 1276364547110863194}
m_PlayerNameLabel: {fileID: 7676773602323508701}
Expand Down Expand Up @@ -4298,7 +4264,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20.3
m_fontSize: 33
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -4460,7 +4426,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 6773627913577560496}
m_HandleRect: {fileID: 2234904744820987572}
m_Direction: 2
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
Expand Down Expand Up @@ -5105,7 +5071,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20.3
m_fontSize: 33
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -5783,7 +5749,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.17835717, g: 0.3161786, b: 0.45400003, 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
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Expand Down
5 changes: 5 additions & 0 deletions Assets/BossRoom/Scripts/Client/Game/Character/ClientInputSender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ void FixedUpdate()
}

m_ActionRequestCount = 0;

if (EventSystem.current.currentSelectedGameObject != null)
{
return;
}

if (m_MoveRequest)
{
Expand Down
8 changes: 0 additions & 8 deletions Assets/BossRoom/Scripts/Client/UI/IPUIMediator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@ public class IPUIMediator : MonoBehaviour

[SerializeField] IPHostingUI m_IPHostingUI;

[SerializeField] UITinter m_JoinTabButtonTinter;

[SerializeField] UITinter m_JoinTabButtonHighlightTinter;

[SerializeField] UITinter m_JoinTabButtonTabBlockerTinter;

[SerializeField] UITinter m_HostTabButtonTinter;

[SerializeField] UITinter m_HostTabButtonHighlightTinter;

[SerializeField] UITinter m_HostTabButtonTabBlockerTinter;
Expand Down Expand Up @@ -122,10 +118,8 @@ public void ToggleJoinIPUI()
{
m_IPJoiningUI.Show();
m_IPHostingUI.Hide();
m_JoinTabButtonTinter.SetToColor(1);
m_JoinTabButtonHighlightTinter.SetToColor(1);
m_JoinTabButtonTabBlockerTinter.SetToColor(1);
m_HostTabButtonTinter.SetToColor(0);
m_HostTabButtonHighlightTinter.SetToColor(0);
m_HostTabButtonTabBlockerTinter.SetToColor(0);
}
Expand All @@ -134,10 +128,8 @@ public void ToggleCreateIPUI()
{
m_IPJoiningUI.Hide();
m_IPHostingUI.Show();
m_JoinTabButtonTinter.SetToColor(0);
m_JoinTabButtonHighlightTinter.SetToColor(0);
m_JoinTabButtonTabBlockerTinter.SetToColor(0);
m_HostTabButtonTinter.SetToColor(1);
m_HostTabButtonHighlightTinter.SetToColor(1);
m_HostTabButtonTabBlockerTinter.SetToColor(1);
}
Expand Down
Loading