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.

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

Jump to bottom
Merged
merged 66 commits into from
Apr 27, 2022
Merged

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

merged 66 commits into from
Apr 27, 2022

Conversation

LPLafontaineB
Copy link
Contributor

@LPLafontaineB LPLafontaineB commented Apr 8, 2022 •
edited
Loading

Description

This PR adds a simple in-game message feed and some message channels for in-game events. A message feed is added inside the CharSelect, BossRoom and PostGame scenes that subscribes to those messages to display them. No history is being kept.

The Feed itself is placed on the left side of the screen in the CharSelect scene, and on the right side in the BossRoom scene and the PostGame scene.

Each message is displayed individually and disappears after a specific amount of time.

Messages are published when players connect/disconnect from a game, when their lifestate changes, when the door opens/closes, when the boss is defeated and when a player uses a cheat.

This PR also uses those new message channels to simplify ServerBossRoomState, which no longer needs to register to every player character's NetworkedLifeState's OnValueChanged and no longer needs to use the GameEvent scriptable object to detect when the boss is defeated.

Issue Number(s)

MTT-2678 & MTT-2318

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • JIRA ticket ID is in the PR title or at least one commit message
  • Include the ticket ID number within the body message of the PR to create a hyperlink

@LPLafontaineB
Created simple message feed
a3464ff
@LPLafontaineB
Moving message feed as server-side only and adding message for connec…
5d29a9a 
…tion/disconnect
@LPLafontaineB
keeping background panel active
d7b00ac
@LPLafontaineB
moved message feed to a better location
18c1711
@LPLafontaineB
Split message feed code in two classes
c8537f3 
* MessageFeedHandler keeps the message history, persists accross scenes and is the class through which messages are sent. It should be called server-side.
* UIMessageFeed receives messages from MessageFeedHandler and displays them on the client
@LPLafontaineB
Merge branch 'develop' into feature/in-game-feed
2eb47a5
@LPLafontaineB
Moved UIFeedMessage instances to each in-game scenes' canvas
e0cd8fe
@LPLafontaineB
used DI to link UIMessageFeed and MessageFeedHandler
db39fc3
@LPLafontaineB
adding messages for player lifestate changes
fb3abd1
@LPLafontaineB
fixing wrong name displayed on reconnection
3d91754
@LPLafontaineB
fixing bug where message feed would not update if already displaying
eb4efc3
@LPLafontaineB
cleaning up and adding comments
d7caf58
@LPLafontaineB LPLafontaineB added the 1-Needs Review PR needs attention from the assignee and reviewers label Apr 8, 2022
@LPLafontaineB LPLafontaineB marked this pull request as draft April 8, 2022 18:04
SamuelBellomo
SamuelBellomo reviewed Apr 8, 2022
View reviewed changes
@LPLafontaineB LPLafontaineB changed the title feat: in-game message feed [MTT-2678] feat: in-game message feed [MTT-2678] [MTT-2318] Apr 8, 2022
@LPLafontaineB LPLafontaineB force-pushed the feature/networked-message-channel branch from 15d6c9e to 59139d7 Compare April 21, 2022 20:11
@LPLafontaineB LPLafontaineB marked this pull request as ready for review April 25, 2022 18:15
pdeschain
pdeschain previously approved these changes Apr 26, 2022
View reviewed changes
@pdeschain pdeschain added 3-Good to Merge and removed 1-Needs Review PR needs attention from the assignee and reviewers labels Apr 26, 2022
Base automatically changed from feature/networked-message-channel to develop April 26, 2022 19:04
@LPLafontaineB LPLafontaineB added 2-One More Review One review in, one to go and removed 3-Good to Merge labels Apr 27, 2022
@SamuelBellomo SamuelBellomo added the 0-URGENT Blocker for a release and needs to be merged ASAP label Apr 27, 2022
@LPLafontaineB LPLafontaineB merged commit c8b10f2 into develop Apr 27, 2022
@LPLafontaineB LPLafontaineB deleted the feature/in-game-feed branch April 27, 2022 19:35
SamuelBellomo added a commit that referenced this pull request Apr 28, 2022
@SamuelBellomo
Merge branch 'develop' into feature/bump-2021
23ba989 
* develop:
  generated files as well
  tmp commit for merge
  feat: test utilities script including Playmode test helpers (#484)
  feat: bump to pre.8 and fix compile issues [MTT-3413] (#631)
  feat: client network transform move to samples [MTT-3406] (#629)
  feat: in-game message feed [MTT-2678] [MTT-2318] (#601)
  feat: networked message channel (#605)
  Fixed Z Fighting of Floor Tiles Near Edge of Main Boss Room (#616)
  fix: SceneBootstrapper detects and allows TestRunner launches (#483)
  removed feature to set all players unready in char select when a player leaves or joins (#625)
  removed setting disconnect reason to UserRequested on clients entering post-game (#626)
  Disallowing portait orientation for auto rotation (#627)
  chore: removing QoS (#623)

# Conflicts:
#	Assets/BossRoom/Material/Characters/Character_Shadow.mat
#	Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat
#	Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat
#	Assets/BossRoom/Material/Characters/Hero_Eyes_sheet.mat
#	Assets/BossRoom/Material/Characters/Hero_Mouth_sheet.mat
#	Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Girl.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Boss.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Imp.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Mage_Boy.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Mage_Girl.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Rogue_Girl.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Tank_Boy.mat
#	Assets/BossRoom/Material/Characters/Toon/Torso_Archer.mat
#	Assets/BossRoom/Material/Characters/Toon/Torso_Mage_Boy.mat
#	Assets/BossRoom/Material/Characters/Toon/Torso_Tank.mat
#	Assets/BossRoom/Material/Characters/Toon/Weapons_Archer.mat
#	Assets/BossRoom/Material/Characters/Toon/Weapons_Mage.mat
#	Assets/BossRoom/Material/Dungeon/env_spiderweb.mat
#	Assets/BossRoom/Scenes/BossRoom.unity
#	Assets/BossRoom/Scenes/CharSelect.unity
#	Assets/BossRoom/Scenes/PostGame.unity
#	Assets/BossRoom/Scenes/Startup.unity
#	Assets/BossRoom/URP/UniversalRenderPipelineAsset.asset
#	Assets/BossRoom/URP/UniversalRenderPipelineAsset_Renderer.asset
#	Assets/BossRoom/VFX/Materials/FX_Crystal.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Flame.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Flash_01.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Glow_10.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Glow_12.mat
#	Assets/BossRoom/VFX/Materials/FX_M_GroundCrack_2.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Shockwave.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Slash_01.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Slash_02.mat
#	Assets/BossRoom/VFX/Materials/FX_M_StylizeSmoke_2.mat
#	Assets/BossRoom/VFX/Materials/FX_M_TargetingSphere_InRange.mat
#	Assets/BossRoom/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat
#	Assets/BossRoom/VFX/Materials/FX_M_TorchFire.mat
#	Assets/BossRoom/VFX/Materials/FX_Slash_01.mat
#	Assets/BossRoom/VFX/Materials/FX_SmokeDissolve.mat
#	Assets/BossRoom/VFX/Materials/FX_SmokeDissolve_Additive.mat
#	Assets/BossRoom/VFX/Materials/FX_Star.mat
#	Assets/BossRoom/VFX/Materials/GroundClick.mat
#	Assets/BossRoom/VFX/Materials/M_Archer_arrow.mat
#	Assets/BossRoom/VFX/Materials/M_MotionFlash.mat
#	Assets/BossRoom/VFX/Materials/TargetReticuleFriendly.mat
#	Assets/BossRoom/VFX/Materials/TargetReticuleHostile.mat
#	Assets/BossRoom/VFX/Materials/fx_mat_Chest.mat
#	Assets/BossRoom/VFX/Materials/fx_mat_GlowLine.mat
#	Assets/BossRoom/VFX/Materials/fx_mat_GlowLine_2.mat
#	Assets/BossRoom/VFX/Materials/spawndoor.mat
#	Assets/UniversalRenderPipelineGlobalSettings.asset.meta
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/GraphicsSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	ProjectSettings/ProjectVersion.txt
SamuelBellomo added a commit that referenced this pull request Apr 28, 2022
@SamuelBellomo
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
9fad5c0 
…fooding

* feature/bump-2021:
  material update
  update with right package lock
  generated files as well
  tmp commit for merge
  feat: test utilities script including Playmode test helpers (#484)
  feat: bump to pre.8 and fix compile issues [MTT-3413] (#631)
  feat: client network transform move to samples [MTT-3406] (#629)
  feat: in-game message feed [MTT-2678] [MTT-2318] (#601)
  feat: networked message channel (#605)
  Fixed Z Fighting of Floor Tiles Near Edge of Main Boss Room (#616)
  fix: SceneBootstrapper detects and allows TestRunner launches (#483)
  removed feature to set all players unready in char select when a player leaves or joins (#625)
  removed setting disconnect reason to UserRequested on clients entering post-game (#626)
  Disallowing portait orientation for auto rotation (#627)
  chore: removing QoS (#623)

# Conflicts:
#	Assets/BossRoom/Scenes/Startup.unity
#	Packages/manifest.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jilfranco-unity jilfranco-unity jilfranco-unity left review comments

@SamuelBellomo SamuelBellomo SamuelBellomo approved these changes

@fernando-cortez fernando-cortez fernando-cortez approved these changes

@pdeschain pdeschain pdeschain left review comments

Assignees

@pdeschain pdeschain

@jilfranco-unity jilfranco-unity

Labels
0-URGENT Blocker for a release and needs to be merged ASAP 2-One More Review One review in, one to go
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@LPLafontaineB @pdeschain @SamuelBellomo @fernando-cortez @jilfranco-unity