From ec6d4c897fa056e04f36cf9124dfc5a9011e07d4 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Mon, 25 Nov 2024 02:55:54 -0500 Subject: [PATCH 1/6] fix(kilonet): updating the KBVE GameManager. --- packages/kilonet/kilonet/KBVEGameManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kilonet/kilonet/KBVEGameManager.cs b/packages/kilonet/kilonet/KBVEGameManager.cs index fbfe5fa57..0a761575e 100644 --- a/packages/kilonet/kilonet/KBVEGameManager.cs +++ b/packages/kilonet/kilonet/KBVEGameManager.cs @@ -6,9 +6,9 @@ namespace KBVE.Kilonet { - public class GameManager : MonoBehaviour + public class KBVEGameManager : MonoBehaviour { - public static GameManager Instance { get; private set; } + public static KBVEGameManager Instance { get; private set; } private StateMachine stateMachine; From 2923d345e7de2728883c218f42e8b41200d7f9a0 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Mon, 25 Nov 2024 02:56:18 -0500 Subject: [PATCH 2/6] fix(mmextensions): updating the GameLifetimeScope --- packages/mmextensions/Kbve.MMExtensions.asmdef | 2 +- packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/mmextensions/Kbve.MMExtensions.asmdef b/packages/mmextensions/Kbve.MMExtensions.asmdef index 523b385a1..e846f77ae 100644 --- a/packages/mmextensions/Kbve.MMExtensions.asmdef +++ b/packages/mmextensions/Kbve.MMExtensions.asmdef @@ -8,7 +8,7 @@ "MoreMountains.Tools", "MoreMountains.TopDownEngine", "VContainer", - "KBVE.Kilonet" + "Kbve.Kilonet" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index b5484e046..36008908e 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -1,6 +1,8 @@ using UnityEngine; using VContainer; using VContainer.Unity; +using MoreMountains.Tools; +using MoreMountains.TopDownEngine; using KBVE.Kilonet; namespace KBVE.MMExtensions.Shaco From a0f84e85f683fde7460489da617551b0fb9a06d4 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Mon, 25 Nov 2024 03:07:11 -0500 Subject: [PATCH 3/6] fix(mmextensions): updating the game lifetime scope. --- .../mmextensions/Shaco/GameLifetimeScope.cs | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 36008908e..04a9f0749 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -15,25 +15,26 @@ public class GameLifetimeScope : LifetimeScope [SerializeField] private GameObject remotePlayerPrefab; + [SerializeField] + private GameObject gameManagerPrefab; + + protected override void Configure(IContainerBuilder builder) { // Register GameManager - - builder - .RegisterComponentInHierarchy() - .OnInitialized( - (resolver, gameManager) => - { - gameManager.TargetFrameRate = 300; - gameManager.MaximumLives = 0; - gameManager.CurrentLives = 0; - gameManager.GameOverScene = "Title"; - gameManager.PauseGameWhenInventoryOpens = false; - } - ); - - - + builder.Register(Lifetime.Singleton, resolver => + { + var instance = Object.Instantiate(gameManagerPrefab).GetComponent(); + + // Set initial values + instance.TargetFrameRate = 60; + instance.MaximumLives = 3; + instance.CurrentLives = 3; + + DontDestroyOnLoad(instance.gameObject); + + return instance; + }); // builder.Register(Lifetime.Singleton); // builder.Register(Lifetime.Singleton); From 420e3e3f12757ae8a6e31df52568d0933230a04f Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Mon, 25 Nov 2024 03:28:31 -0500 Subject: [PATCH 4/6] feat(mmextensions): added entry point for game manager. --- .../mmextensions/Shaco/GameLifetimeScope.cs | 20 ++++++------- .../Shaco/GameManagerEntryPoint.cs | 28 +++++++++++++++++++ .../Shaco/GameManagerEntryPoint.cs.meta | 11 ++++++++ 3 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs create mode 100644 packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs.meta diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 04a9f0749..677b17709 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -21,21 +21,17 @@ public class GameLifetimeScope : LifetimeScope protected override void Configure(IContainerBuilder builder) { - // Register GameManager - builder.Register(Lifetime.Singleton, resolver => + // Register GameManager as a MonoBehaviour + builder.RegisterComponent(resolver => { - var instance = Object.Instantiate(gameManagerPrefab).GetComponent(); - - // Set initial values - instance.TargetFrameRate = 60; - instance.MaximumLives = 3; - instance.CurrentLives = 3; - - DontDestroyOnLoad(instance.gameObject); - - return instance; + var instance = Object.Instantiate(gameManagerPrefab).GetComponent(); + DontDestroyOnLoad(instance.gameObject); + return instance; }); + // Register the EntryPoint for initializing GameManager + builder.RegisterEntryPoint(); + // builder.Register(Lifetime.Singleton); // builder.Register(Lifetime.Singleton); diff --git a/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs new file mode 100644 index 000000000..aa5a81c1f --- /dev/null +++ b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs @@ -0,0 +1,28 @@ +using UnityEngine; +using VContainer; +using VContainer.Unity; +using MoreMountains.TopDownEngine; + +namespace KBVE.MMExtensions.Shaco +{ + public class GameManagerEntryPoint : IStartable + { + private readonly GameManager _gameManager; + + public GameManagerEntryPoint(GameManager gameManager) + { + _gameManager = gameManager; + } + + public void Start() + { + // Initialize GameManager values + _gameManager.TargetFrameRate = 60; + _gameManager.MaximumLives = 5; + _gameManager.CurrentLives = 5; + _gameManager.GameOverScene = "GameOver"; + + Debug.Log("GameManager initialized via EntryPoint!"); + } + } +} diff --git a/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs.meta b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs.meta new file mode 100644 index 000000000..b06f0d37b --- /dev/null +++ b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7996d33f9950466f87a6b2bb1b636b9d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file From 8fedaeffca0732704fac26b22b596be7d1a506d7 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Mon, 25 Nov 2024 04:05:34 -0500 Subject: [PATCH 5/6] fix(mmextensions): updating game lifetime scope. --- .../mmextensions/Shaco/GameLifetimeScope.cs | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 677b17709..917f1d202 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -18,27 +18,18 @@ public class GameLifetimeScope : LifetimeScope [SerializeField] private GameObject gameManagerPrefab; - protected override void Configure(IContainerBuilder builder) { - // Register GameManager as a MonoBehaviour - builder.RegisterComponent(resolver => + builder.UseComponents(components => { - var instance = Object.Instantiate(gameManagerPrefab).GetComponent(); - DontDestroyOnLoad(instance.gameObject); - return instance; + var gameManager = Object.Instantiate(gameManagerPrefab).GetComponent(); + DontDestroyOnLoad(gameManager.gameObject); + components.AddInstance(gameManager); + }); - // Register the EntryPoint for initializing GameManager + // Register the EntryPoint for GameManager initialization builder.RegisterEntryPoint(); - - // builder.Register(Lifetime.Singleton); - // builder.Register(Lifetime.Singleton); - - // builder.Register(Lifetime.Singleton).WithParameter(localPlayerPrefab); - // builder.Register(Lifetime.Singleton).WithParameter(remotePlayerPrefab); - - // builder.Register(Lifetime.Singleton).WithParameter(remotePlayerPrefab); } } } From 99d85a727d9dc78892d04076b9f9f6fd94efde36 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Mon, 25 Nov 2024 04:07:50 -0500 Subject: [PATCH 6/6] docs(kilonet): updating readme for a trigger. --- packages/kilonet/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kilonet/README.md b/packages/kilonet/README.md index 8dc269a88..41b5f11a3 100644 --- a/packages/kilonet/README.md +++ b/packages/kilonet/README.md @@ -22,7 +22,7 @@ Started the IFrame Interactions but need to fix the cross origin issue. Added the `com.unity.transport` to the packages. Preparing the Discord build - ETA 12 hours. Adding new tilemap generator script and fixed some asmdefs. -Triggering another build once more! +Triggering another build once more, oh boi, another docker build. - [KBVE](https://kbve.com/) - [RareIcon](https://rareicon.com/) \ No newline at end of file