Skip to content

Fix: Removed pop-up issues during loading screen in Boss Room [MTT-3787] [MTT-5711] #879

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 18 commits into from
Mar 18, 2024
Merged

Fix: Removed pop-up issues during loading screen in Boss Room [MTT-3787] [MTT-5711] #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
218a3c7
changed sort layer of popup panel to bring it to the front
Elfi0Kuhndorf Feb 27, 2024
e375d12
panel sort order adjustments to fix RNSM hidden under loading screen …
Elfi0Kuhndorf Feb 28, 2024
125948f
fix settings UI order
Elfi0Kuhndorf Feb 28, 2024
d399dc8
changed UI canvas sort order to -1 to fix small issue
Elfi0Kuhndorf Feb 28, 2024
1b827f7
Merge branch 'develop' into fix/popups-hidden-under-loading-screen
Elfi0Kuhndorf Mar 4, 2024
650c69e
Update CHANGELOG.md
Elfi0Kuhndorf Mar 5, 2024
c6dae9b
Update CHANGELOG.md with PR number
Elfi0Kuhndorf Mar 5, 2024
dc40b81
Revert "changed UI canvas sort order to -1 to fix small issue"
Elfi0Kuhndorf Mar 8, 2024
a050988
changed MainMenu UI Canvas to -1
Elfi0Kuhndorf Mar 8, 2024
872c0e7
Merge branch 'develop' into fix/popups-hidden-under-loading-screen
Elfi0Kuhndorf Mar 8, 2024
884916c
adjusted sort order according to jils suggestion
Elfi0Kuhndorf Mar 11, 2024
c1bd72e
update NetStatsMonitorPrefab sort order to -3
Elfi0Kuhndorf Mar 11, 2024
11a9119
updated CharacterSelectCanvas sort order to -2
Elfi0Kuhndorf Mar 12, 2024
f439c62
Merge branch 'develop' into fix/popups-hidden-under-loading-screen
Elfi0Kuhndorf Mar 12, 2024
8a520f5
changed NSMPCanvas to scale with screen size and adjusted text size t…
Elfi0Kuhndorf Mar 12, 2024
e4f3a5a
addressed feedback and adjusted RNSM size, created UIRoot prefab
Elfi0Kuhndorf Mar 14, 2024
3fcac12
added UI toolkit theme to make new RNSMSettings asset work
Elfi0Kuhndorf Mar 14, 2024
67c6ffa
enabled sort order override and adjusted sorting order of MessageWind…
Elfi0Kuhndorf Mar 15, 2024
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
60 changes: 41 additions & 19 deletions Assets/Prefabs/UI/BossRoomHudCanvas.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -162,9 +162,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -237,9 +237,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.16555557, y: 0.79600006}
m_AnchorMax: {x: 0.8277778, y: 1}
Expand Down Expand Up @@ -371,6 +371,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1142675600423431063}
- {fileID: 236614809161763873}
Expand All @@ -388,7 +389,6 @@ RectTransform:
- {fileID: 3813561709073635053}
- {fileID: 8097037972272021611}
m_Father: {fileID: 5277713031684110775}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -461,9 +461,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
Expand Down Expand Up @@ -537,10 +537,10 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1177926205616708043}
m_Father: {fileID: 873334740239139040}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.404, y: 0}
m_AnchorMax: {x: 0.6007507, y: 0.10055374}
Expand Down Expand Up @@ -669,9 +669,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
Expand Down Expand Up @@ -744,9 +744,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -878,9 +878,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1.4999999, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -1012,9 +1012,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -1146,9 +1146,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -1281,6 +1281,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 103977269980398715}
- {fileID: 5277713031123338908}
Expand All @@ -1289,7 +1290,6 @@ RectTransform:
- {fileID: 3433386668875250805}
- {fileID: 9010914333762435528}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand All @@ -1313,9 +1313,11 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: -3
m_TargetDisplay: 0
--- !u!114 &5277713031684110769
MonoBehaviour:
Expand Down Expand Up @@ -1385,9 +1387,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
Expand Down Expand Up @@ -1460,9 +1462,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
Expand Down Expand Up @@ -1536,9 +1538,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -1667,9 +1669,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -1742,9 +1744,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 873334740239139040}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
Expand Down Expand Up @@ -1817,9 +1819,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3813561709073635053}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -1928,6 +1930,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5277713031684110775}
m_Modifications:
- target: {fileID: 7109257143461247492, guid: 7562e0bb2a96dfc4996f8ab34f4a0cee, type: 3}
Expand Down Expand Up @@ -2119,6 +2122,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7562e0bb2a96dfc4996f8ab34f4a0cee, type: 3}
--- !u!224 &5277713031219212452 stripped
RectTransform:
Expand All @@ -2135,6 +2141,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5277713031684110775}
m_Modifications:
- target: {fileID: 167653451897872314, guid: df0d6828f44fdd64bb311a3f19236959, type: 3}
Expand Down Expand Up @@ -2390,6 +2397,9 @@ PrefabInstance:
value: 36
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: df0d6828f44fdd64bb311a3f19236959, type: 3}
--- !u!224 &9010914333762435528 stripped
RectTransform:
Expand All @@ -2401,6 +2411,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5277713031684110775}
m_Modifications:
- target: {fileID: 1201613408548134179, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
Expand Down Expand Up @@ -2624,6 +2635,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
--- !u!224 &5277713031123338908 stripped
RectTransform:
Expand All @@ -2635,6 +2649,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5277713031684110775}
m_Modifications:
- target: {fileID: 797167611908236020, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3}
Expand Down Expand Up @@ -2730,6 +2745,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3}
--- !u!224 &3433386668875250805 stripped
RectTransform:
Expand All @@ -2752,6 +2770,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5277713031684110775}
m_Modifications:
- target: {fileID: 5210474333085558483, guid: 8b2306d4cfca3b642afa5534b0ba275a, type: 3}
Expand Down Expand Up @@ -2867,6 +2886,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8b2306d4cfca3b642afa5534b0ba275a, type: 3}
--- !u!224 &103977269980398715 stripped
RectTransform:
Expand Down
Loading