Skip to content

feat: in-game message feed [MTT-2678] [MTT-2318] #601

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.

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 66 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
a3464ff
Created simple message feed
LPLafontaineB Apr 7, 2022
5d29a9a
Moving message feed as server-side only and adding message for connec…
LPLafontaineB Apr 7, 2022
d7b00ac
keeping background panel active
LPLafontaineB Apr 7, 2022
18c1711
moved message feed to a better location
LPLafontaineB Apr 8, 2022
c8537f3
Split message feed code in two classes
LPLafontaineB Apr 8, 2022
2eb47a5
Merge branch 'develop' into feature/in-game-feed
LPLafontaineB Apr 8, 2022
e0cd8fe
Moved UIFeedMessage instances to each in-game scenes' canvas
LPLafontaineB Apr 8, 2022
db39fc3
used DI to link UIMessageFeed and MessageFeedHandler
LPLafontaineB Apr 8, 2022
fb3abd1
adding messages for player lifestate changes
LPLafontaineB Apr 8, 2022
3d91754
fixing wrong name displayed on reconnection
LPLafontaineB Apr 8, 2022
eb4efc3
fixing bug where message feed would not update if already displaying
LPLafontaineB Apr 8, 2022
d7caf58
cleaning up and adding comments
LPLafontaineB Apr 8, 2022
356f315
clearing feed history when connection ends
LPLafontaineB Apr 8, 2022
9dff89d
Adding message for when door is opened
LPLafontaineB Apr 8, 2022
1a86639
Adding message for when boss is defeated [MTT-2318]
LPLafontaineB Apr 8, 2022
6ff7f3d
reinitializing message text labels as empty when no message to display
LPLafontaineB Apr 8, 2022
3698f17
Merge branch 'develop' into feature/in-game-feed
LPLafontaineB Apr 8, 2022
e526738
Creating NetworkedMessageChannel
LPLafontaineB Apr 11, 2022
1cb14bb
adding class description to NetworkedMessageChannel
LPLafontaineB Apr 11, 2022
18cf7c9
Now only clients register message handlers and unregister them when d…
LPLafontaineB Apr 11, 2022
088e063
adding basic usage example
LPLafontaineB Apr 11, 2022
1fed09a
A first pass on ui re-setup for animated messages :)
jilfranco-unity Apr 12, 2022
1c935fd
Revert "adding basic usage example"
LPLafontaineB Apr 13, 2022
43c8456
inferring name from type T
LPLafontaineB Apr 13, 2022
e7ecc6c
Merge branch 'develop' into feature/in-game-feed
LPLafontaineB Apr 14, 2022
2bfe141
removing old feed ui leftovers
LPLafontaineB Apr 14, 2022
30cbf17
only register to the custom networked messages on clients
LPLafontaineB Apr 14, 2022
1dd5d0d
Adding support to animate each message slot in code
LPLafontaineB Apr 14, 2022
b64f049
Adding animation event to mark message slots available only after end…
LPLafontaineB Apr 14, 2022
2eb9673
removed unneeded CanvasGroup components
LPLafontaineB Apr 19, 2022
6e84832
Merge branch 'feature/networked-message-channel' into feature/in-game…
LPLafontaineB Apr 19, 2022
6f25f84
Adding game event message types
LPLafontaineB Apr 19, 2022
d069d5e
adding publishing of LifeStateChangedEventMessage from PlayerCharacter
LPLafontaineB Apr 19, 2022
ca66e4b
replacing old MessageFeedHandler with new message channels
LPLafontaineB Apr 19, 2022
05df9d3
making messagefeed not block raycasts
LPLafontaineB Apr 19, 2022
42c7eb5
removing test coroutine
LPLafontaineB Apr 19, 2022
4e413c5
injecting into ClientDoorVisualization
LPLafontaineB Apr 19, 2022
9bc8cd9
Creating PublishMessageOnLifeChange to simplify ServerBossRoomState
LPLafontaineB Apr 19, 2022
01f5c39
making sure subscription is properly done when spawning and disposed …
LPLafontaineB Apr 19, 2022
e16ffb3
Merge branch 'develop' into feature/networked-message-channel
LPLafontaineB Apr 19, 2022
4f7548b
Merge branch 'feature/networked-message-channel' into feature/in-game…
LPLafontaineB Apr 19, 2022
465c3a1
removing debug log
LPLafontaineB Apr 19, 2022
ec6c621
made message slots bigger
LPLafontaineB Apr 19, 2022
8e4e19a
Adding MessageSlot variants to have them slide in from the right side…
LPLafontaineB Apr 20, 2022
6ca9036
repositioning message feeds
LPLafontaineB Apr 20, 2022
c2e0cdb
replaced m_BufferSize field with call to FastBufferWriter.GetWriteSize()
LPLafontaineB Apr 20, 2022
1af220c
Merge branch 'feature/networked-message-channel' into feature/in-game…
LPLafontaineB Apr 20, 2022
ca65e29
fixing conflict
LPLafontaineB Apr 20, 2022
3de07c8
reverting unneeded changes
LPLafontaineB Apr 20, 2022
02f50c5
Merge branch 'develop' into feature/in-game-feed
LPLafontaineB Apr 21, 2022
c3a1e61
making message slot instances' scale relative to parent
LPLafontaineB Apr 21, 2022
16bcc14
Merge branch 'develop' into feature/networked-message-channel
LPLafontaineB Apr 21, 2022
4019e5f
fixing wrong name used for custom named message registering
LPLafontaineB Apr 21, 2022
ecce2ac
Merge branch 'feature/networked-message-channel' into feature/in-game…
LPLafontaineB Apr 21, 2022
f5c919f
Adding cheat usage to message feed
LPLafontaineB Apr 21, 2022
f74f736
Adding check for gameover when player disconnects
LPLafontaineB Apr 21, 2022
26f2a80
adding wait for next frame to check for gameover when client disconne…
LPLafontaineB Apr 21, 2022
15d6c9e
added unregistering of custom named message on dispose
LPLafontaineB Apr 21, 2022
7c7b692
Merge branch 'feature/networked-message-channel' into feature/in-game…
LPLafontaineB Apr 21, 2022
59139d7
added unregistering of custom named message on dispose
LPLafontaineB Apr 21, 2022
3596730
Merge branch 'feature/networked-message-channel' into feature/in-game…
LPLafontaineB Apr 21, 2022
90e66af
Rescaled the UI elements of the char select UI after switching target…
jilfranco-unity Apr 22, 2022
b87c481
fixing SettingsPanelCanvas not injected into in PostGame scene
LPLafontaineB Apr 25, 2022
bba4d1d
removing unused fields
LPLafontaineB Apr 25, 2022
d8e6a66
moved NumPlayersBox and RoomNameBox a bit lower
LPLafontaineB Apr 25, 2022
e553f62
Adding canvas to MessageWindow prefab
LPLafontaineB Apr 26, 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
8 changes: 8 additions & 0 deletions Assets/BossRoom/Animations.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/BossRoom/Animations/UI.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

217 changes: 217 additions & 0 deletions Assets/BossRoom/Animations/UI/AnimController_UI_Message.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8271959049630102114
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8336730943762134427}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-6517374293630203477
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 8773687198468971542}
m_Position: {x: 30, y: 280, z: 0}
- serializedVersion: 1
m_State: {fileID: -2660560960858769395}
m_Position: {x: 326.7693, y: 29.06958, z: 0}
- serializedVersion: 1
m_State: {fileID: 8336730943762134427}
m_Position: {x: 320, y: 280, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 6947869538029660717}
- {fileID: -2135654591094134350}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 10, y: -60, z: 0}
m_EntryPosition: {x: -100, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8336730943762134427}
--- !u!1102 &-2660560960858769395
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Anim_UI_Message_Hide
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: cbf7c4f341ab3e84ca34f98d4b245587, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-2135654591094134350
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Display
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8773687198468971542}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AnimController_UI_Message
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Display
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Hide
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -6517374293630203477}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &6947869538029660717
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Hide
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2660560960858769395}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8336730943762134427
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Anim_UI_Message_Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6d66bf3633728c04aadb53681ac668c9, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8773687198468971542
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Anim_UI_Message_Slide
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -8271959049630102114}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: de98af101c5af20458ab3499237d078c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/Animations/UI/Anim_UI_Message_Hide.anim
Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/Animations/UI/Anim_UI_Message_Idle.anim
Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/Animations/UI/Anim_UI_Message_Slide.anim
Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 15 additions & 4 deletions Assets/BossRoom/Prefabs/Character/ImpBoss.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2936679228580278264 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3914205191616059012, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2203142923062114684}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3688950541947916333}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4a3a07abfb44d50469112a0db6a202b2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3035161527766636097
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -214,7 +225,7 @@ MonoBehaviour:
m_TransformToTrack: {fileID: 2561745155600296936}
m_VerticalWorldOffset: 0
m_VerticalScreenOffset: -50
--- !u!114 &7678927093694714386
--- !u!114 &7653970338354900554
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -223,12 +234,12 @@ MonoBehaviour:
m_GameObject: {fileID: 3688950541947916333}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3bd6676b274afaf4fb21df4c5baaee78, type: 3}
m_Script: {fileID: 11500000, guid: b7ee3f8e8fb4491495b03f890258082e, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Event: {fileID: 11400000, guid: 9fb31cde6d024114488a5bf48fff8a86, type: 2}
m_NetworkLifeState: {fileID: 3889605435075370027}
m_RaiseCondition: 2
m_CharacterName: The Boss
m_CharacterClass: {fileID: 2936679228580278264}
--- !u!114 &8073394427373638825
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
27 changes: 26 additions & 1 deletion Assets/BossRoom/Prefabs/Character/PlayerAvatar.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6173771494986166194 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: -5107732197415868221, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
m_PrefabInstance: {fileID: 7831782662127126385}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6009713983291384756}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5230418375993597025 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: -6618539813679097072, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
Expand Down Expand Up @@ -330,7 +341,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 331c67f15523ad7419792662b9768f44, type: 3}
m_Name:
m_EditorClassIdentifier:
moveRate: 0.05
m_CharacterClassContainer: {fileID: 5230418375993597025}
m_PhysicsWrapper: {fileID: 6116655102486013040}
--- !u!114 &5043718152237111612
Expand Down Expand Up @@ -373,3 +383,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_FeedbackPrefab: {fileID: 9137928905311479176, guid: 5d22c1d86e0e5604cbe14004bf924827, type: 3}
--- !u!114 &4887850889182527394
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6009713983291384756}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b7ee3f8e8fb4491495b03f890258082e, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NetworkLifeState: {fileID: 6173771494986166194}
m_CharacterName:
m_CharacterClass: {fileID: 5230418375993597025}
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ PrefabInstance:
propertyPath: m_RuntimeNetworkObjectsSeparator
value:
objectReference: {fileID: 0}
- target: {fileID: 5762482089640033414, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
propertyPath: m_GameObjectsThatWillBeInjectedAutomatically.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5762482089640033414, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
propertyPath: m_GameObjectsThatWillBeInjectedAutomatically.Array.data[0]
value:
objectReference: {fileID: 8528489606206953337}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
--- !u!4 &6803673045227533488 stripped
Expand Down Expand Up @@ -167,6 +175,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d026428052f506a4a99ce1b7c94c4d45, type: 3}
--- !u!1 &8528489606206953337 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 776943915682426285, guid: d026428052f506a4a99ce1b7c94c4d45, type: 3}
m_PrefabInstance: {fileID: 8976529767578041044}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6432827414648884918 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2726635115303138402, guid: d026428052f506a4a99ce1b7c94c4d45, type: 3}
Expand Down
Loading