Skip to content

Commit 3fdf11a

Browse files
authored
fix: folders and assemblies refactor MTT-2623, MTT-2615 (#628)
* wip refactor of the code folder and assembly structure * further moves and assembly changes * Adjustments to asmdefs
1 parent 7f039f3 commit 3fdf11a

File tree

452 files changed

+58
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

452 files changed

+58
-99
lines changed

Assets/BossRoom/Scripts/Client/com.unity.multiplayer.samples.bossroom.client.asmdef

Lines changed: 0 additions & 25 deletions
This file was deleted.

Assets/BossRoom/Scripts/Editor/com.unity.multiplayer.samples.bossroom.editor.asmdef

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "Unity.Multiplayer.Samples.BossRoom.Editor",
33
"rootNamespace": "",
44
"references": [
5-
"Unity.Multiplayer.Samples.BossRoom.Shared",
6-
"Unity.Netcode.Runtime"
5+
"Unity.Netcode.Runtime",
6+
"Unity.Multiplayer.Samples.BossRoom.Gameplay"
77
],
88
"includePlatforms": [
99
"Editor"
@@ -16,4 +16,4 @@
1616
"defineConstraints": [],
1717
"versionDefines": [],
1818
"noEngineReferences": false
19-
}
19+
}

Assets/BossRoom/Scripts/Shared/Game.meta renamed to Assets/BossRoom/Scripts/Game.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/BossRoom/Scripts/Client/UI/UnityServicesUIHandler.cs renamed to Assets/BossRoom/Scripts/Game/Client/UI/UnityServicesUIHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void HandleLobbyError(UnityServiceErrorMessage error)
6363
break;
6464
case LobbyExceptionReason.LobbyConflict:
6565
// LobbyConflict can have multiple causes. Let's add other solutions here if there's other situations that arise for this.
66-
Debug.LogError($"Got service error {error.Message} with LobbyConflict. Possible conflict cause: Trying to play with two builds on the " +
66+
UnityEngine.Debug.LogError($"Got service error {error.Message} with LobbyConflict. Possible conflict cause: Trying to play with two builds on the " +
6767
$"same machine. Please use command line arg '{ProfileManager.AuthProfileCommandLineArg} someName' to set a different auth profile.\n");
6868
PopupManager.ShowPopupPanel("Failed to join Lobby", "Failed to join Lobby due to a conflict. See logs for more details.");
6969
break;

Assets/BossRoom/Scripts/DebugCheats/DebugCheatsManager.cs renamed to Assets/BossRoom/Scripts/Game/DebugCheats/DebugCheatsManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using UnityEngine;
77
using UnityEngine.SceneManagement;
88

9-
namespace Unity.Multiplayer.Samples.BossRoom.Debug
9+
namespace Unity.Multiplayer.Samples.BossRoom.Game.Cheats
1010
{
1111
/// <summary>
1212
/// Handles debug cheat events, applies them on the server and logs them on all clients. This class is only

0 commit comments

Comments
 (0)