Skip to content

[DO NOT MERGE! Work is parked currently] [MTT-8685] Feat: UIToolkit for BossRoom: PostGame UI #900

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

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from
Open

[DO NOT MERGE! Work is parked currently] [MTT-8685] Feat: UIToolkit for BossRoom: PostGame UI #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
42baf89
add SettingsPanelCanvas uxml and uss and relevant folders
Elfi0Kuhndorf Feb 5, 2025
5ae1ba8
WIP adding old functionality in extra script and adjusting old script…
Elfi0Kuhndorf Feb 5, 2025
90d7176
WIP fixing volume distortion issue and trying to debug failing of UIQ…
Elfi0Kuhndorf Feb 10, 2025
282324f
fix: cleaning up UI USS, creating general USS for reusability and add…
Elfi0Kuhndorf Feb 12, 2025
39a5e85
feat: add PostGameUICanvas UI toolkit prefab plus its related uxml an…
Elfi0Kuhndorf Feb 13, 2025
47d5840
fix: remove auto in MessageFeed USS and change panelSettings to scale…
Elfi0Kuhndorf Feb 13, 2025
f6db0cc
fix: add messageFeed UI, cleanup scripts, rename Prefabs
Elfi0Kuhndorf Feb 14, 2025
5cd1a22
Fix: add SettingsPanelCanvasUITK to PostGameState prefab and fix comp…
Elfi0Kuhndorf Feb 17, 2025
a51b164
WIP adding message feed functionality
Elfi0Kuhndorf Feb 19, 2025
d75a01f
WIP: adjustments for MessageFeed (functionality within one new script…
Elfi0Kuhndorf Feb 20, 2025
815effe
registration of components to the scene state context builder
fernando-cortez Feb 21, 2025
1e01173
fix: changing styling, layering and size of settingPanelCanvasUITK U…
Elfi0Kuhndorf Feb 21, 2025
ba5336d
fix: fixing new MessageFeed so it displays messages dynamically
Elfi0Kuhndorf Feb 21, 2025
224e28c
feat: add fly in animation to message feed messaged
Elfi0Kuhndorf Feb 24, 2025
5fbb0f9
fix: remove unneeded message feed scripts
Elfi0Kuhndorf Feb 24, 2025
2f565c9
cleanup
kalmanbalint Feb 25, 2025
65ed04f
deleting some code
kalmanbalint Feb 25, 2025
ca29629
update
kalmanbalint Feb 25, 2025
969aa22
cleanup
kalmanbalint Feb 25, 2025
bc22328
Debugging and adjusting fade-in animation as well as moving message f…
Elfi0Kuhndorf Feb 27, 2025
0fdffa8
Fix: adding SettingPanelCanvasUITK to all relevant scene states and s…
Elfi0Kuhndorf Feb 28, 2025
46076cc
Merge branch 'UTIK_suggestions' into feat_boss_room_PostGameUI_settin…
Elfi0Kuhndorf Feb 28, 2025
26cf57c
fix: remove old UIMessageFeed
Elfi0Kuhndorf Feb 28, 2025
9a6f801
removal of old post game scripts
Elfi0Kuhndorf Feb 28, 2025
faa6677
fix: removal old SettingsPanelCanvas prefab
Elfi0Kuhndorf Feb 28, 2025
0e2f3e8
removal of old PostGameUI prefab
Elfi0Kuhndorf Feb 28, 2025
cd0780c
fix: remove whitespace issues
Elfi0Kuhndorf Feb 28, 2025
79e8592
Update CHANGELOG.md
Elfi0Kuhndorf Feb 28, 2025
009d1fb
fix: adding suggestions from PR, turning ListView into VisualElement …
Elfi0Kuhndorf Mar 3, 2025
9725f38
fix: remove context menu before release
Elfi0Kuhndorf Mar 3, 2025
755a9bd
fix: extracting boss room title to uss class
Elfi0Kuhndorf Mar 3, 2025
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
32 changes: 21 additions & 11 deletions Assets/Prefabs/State/BossRoomState.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 297185343939699586}
serializedVersion: 2
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}
Expand All @@ -40,7 +41,6 @@ Transform:
- {fileID: 8725901042666772653}
- {fileID: 7239491272522478247}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3608714310874968837
MonoBehaviour:
Expand All @@ -54,13 +54,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 3855040645
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 1
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &5762482089640033414
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -76,7 +82,10 @@ MonoBehaviour:
parentReference:
TypeName: Unity.BossRoom.ApplicationLifecycle.ApplicationController
autoRun: 1
autoInjectGameObjects: []
autoInjectGameObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_NetcodeHooks: {fileID: 1290852967062359934}
m_PlayerPrefab: {fileID: 6009713983291384767, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
m_PlayerSpawnPoints:
Expand All @@ -100,6 +109,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
--- !u!1 &1088799320945899822
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -123,13 +133,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088799320945899822}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -1, y: 0, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &1514641935926907818
GameObject:
Expand All @@ -154,13 +164,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1514641935926907818}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 8, y: 0, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &1963938774227499709
GameObject:
Expand All @@ -185,13 +195,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1963938774227499709}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 4, y: 0, z: 4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &4557113922522348671
GameObject:
Expand All @@ -216,13 +226,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4557113922522348671}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 7, y: 0, z: 4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &6672739281842085047
GameObject:
Expand All @@ -247,13 +257,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6672739281842085047}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -2, y: 0, z: 4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &7050848846150978064
GameObject:
Expand All @@ -278,13 +288,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7050848846150978064}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 5, y: 0, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &7682807672526693023
GameObject:
Expand All @@ -309,13 +319,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7682807672526693023}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 1, y: 0, z: 4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &9086465339882682673
GameObject:
Expand All @@ -340,11 +350,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9086465339882682673}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 2, y: 0, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5655447013084909147}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
18 changes: 14 additions & 4 deletions Assets/Prefabs/State/CharSelectState.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565665953789623672}
serializedVersion: 2
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1092063945021251778
MonoBehaviour:
Expand All @@ -48,13 +48,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 2612316768
InScenePlacedSourceGlobalObjectIdHash: 2959094212
DeferredDespawnTick: 0
Ownership: 1
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &3565665953789623675
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -87,7 +93,9 @@ MonoBehaviour:
parentReference:
TypeName: Unity.BossRoom.ApplicationLifecycle.ApplicationController
autoRun: 1
autoInjectGameObjects: []
autoInjectGameObjects:
- {fileID: 0}
- {fileID: 0}
m_NetcodeHooks: {fileID: 8494646029522094751}
m_NetworkCharSelection: {fileID: 3565665953789623673}
m_AnimationTriggerOnCharSelect: BeginRevive
Expand Down Expand Up @@ -126,7 +134,7 @@ MonoBehaviour:
m_UIElementsForSeatChosen:
- {fileID: 0}
- {fileID: 0}
m_UIElementsForLobbyEnding:
m_UIElementsForSessionEnding:
- {fileID: 0}
m_UIElementsForFatalError:
- {fileID: 0}
Expand All @@ -144,6 +152,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3b117c7cd3ae70e458a5b755a4096609, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
AvatarConfiguration:
- {fileID: 11400000, guid: 20beed451a65c364eb413c7ef6ebb8fa, type: 2}
- {fileID: 11400000, guid: 732834deb1e677541bd1c2aef937f608, type: 2}
Expand All @@ -165,3 +174,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
10 changes: 7 additions & 3 deletions Assets/Prefabs/State/MainMenuState.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,15 @@ MonoBehaviour:
parentReference:
TypeName: Unity.BossRoom.ApplicationLifecycle.ApplicationController
autoRun: 1
autoInjectGameObjects: []
autoInjectGameObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_NameGenerationData: {fileID: 11400000, guid: cc0e4025ad893614a8db0d9c10bf7c4f, type: 2}
m_LobbyUIMediator: {fileID: 0}
m_SessionUIMediator: {fileID: 0}
m_IPUIMediator: {fileID: 0}
m_LobbyButton: {fileID: 0}
m_SessionButton: {fileID: 0}
m_SignInSpinner: {fileID: 0}
m_UIProfileSelector: {fileID: 0}
m_UGSSetupTooltipDetector: {fileID: 0}
Expand Down
15 changes: 12 additions & 3 deletions Assets/Prefabs/State/PostGameState.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7475764267130300177}
serializedVersion: 2
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-1007214952234040975
MonoBehaviour:
Expand All @@ -47,13 +47,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 4221458659
InScenePlacedSourceGlobalObjectIdHash: 2795900295
DeferredDespawnTick: 0
Ownership: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &7475764267130300178
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -73,7 +79,8 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
m_NetcodeHooks: {fileID: 6576822806953781696}
networkPostGame: {fileID: 6889826313803109754}
m_NetworkPostGame: {fileID: 6889826313803109754}
m_PostGameUI: {fileID: 0}
--- !u!114 &6576822806953781696
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -86,6 +93,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
--- !u!114 &6889826313803109754
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -98,5 +106,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d063751a18954cf1a9b98fc7a437b48d, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
WinState:
m_InternalValue: 0
Loading