Skip to content
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

Smoother embark and game screens refactor #1213

Conversation

joaoburatto
Copy link
Contributor

Summary

This PR reworks how the game screens work internally, adds a fade out when the player enters the game, creates a ScriptableSettings script to define how general UI works. Reorder objects around the game scene, and creates prefabs from a few objects on the game scene.

cosmiccoincidence

This comment was marked as resolved.

Copy link
Contributor

@stilnat stilnat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few changes to do, seems to work fine with host (I need to mess around more), not tested with client yet. Also need to check if there's conflict with the inventory rework, probably minor ones but please let's do that before any merge, I don't my whole work wasted.


namespace SS3D.Systems.Screens
{
public static class GameScreens
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the sake of clarity, it'd be nice if you could add the [Server] [Client] [ServerOrClient] attributes on relevant methods. That way we understand better what execute what and it limits error due to server or client calling methods they're not supposed to.

@@ -12,72 +14,51 @@ namespace SS3D.Systems.Screens
/// </summary>
public class GameScreen : Actor
{
[SerializeField] private ScreenType _screenType;
public ScreenType ScreenType;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this stay private ?

using SS3D.Systems.Entities.Events;
using UnityEngine;

namespace SS3D.Systems.Entities.UI
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this script for, please add comments

@stilnat
Copy link
Contributor

stilnat commented Jul 23, 2023

Client breaks the container UI, please check if this happen on develop already, and if not, please fix before merge
image

Copy link
Contributor

@stilnat stilnat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to go

@stilnat stilnat dismissed cosmiccoincidence’s stale review July 26, 2023 07:50

requested changes have been made

@stilnat stilnat merged commit 311dbf0 into RE-SS3D:develop Jul 26, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants