diff --git a/Assets/Scripts/GameManager/GameMaster.cs b/Assets/Scripts/GameManager/GameMaster.cs index be96b03..f79a0f3 100644 --- a/Assets/Scripts/GameManager/GameMaster.cs +++ b/Assets/Scripts/GameManager/GameMaster.cs @@ -2,12 +2,14 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; + public class GameMaster : MonoBehaviour { [Header("GameMaster")] [SerializeField] private List teams = new List(); private void Start() { + CreateTeam("Orange"); CreateTeam("Blue"); } diff --git a/Packages/manifest.json b/Packages/manifest.json index 92fbc90..f6d92fe 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,6 +4,7 @@ "com.unity.ide.rider": "3.0.7", "com.unity.ide.visualstudio": "2.0.11", "com.unity.ide.vscode": "1.2.4", + "com.unity.multiplayer.mlapi": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi#release/0.1.0", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.5.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index c143c2a..534effd 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -39,6 +39,24 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.multiplayer.mlapi": { + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi#release/0.1.0", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.nuget.mono-cecil": "1.10.1-preview.1" + }, + "hash": "3e3aef6aa02c2a25359898319e5bd49d3518b57b" + }, + "com.unity.nuget.mono-cecil": { + "version": "1.10.1-preview.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.29", "depth": 0, diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 102c612..80329fe 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -12,12 +12,12 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreReleasePackages: 0 + m_EnablePreReleasePackages: 1 m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 - oneTimeWarningShown: 0 + oneTimeWarningShown: 1 m_Registries: - m_Id: main m_Name: diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file