From a1bf7426fdb23df779983580b3293a7e44b828a7 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 01:59:47 -0500 Subject: [PATCH 01/24] fix(mmextensions): added vcontainer configuration. --- .../mmextensions/Shaco/GameLifetimeScope.cs | 15 +++------------ .../mmextensions/Shaco/GameManagerEntryPoint.cs | 4 ++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 6eb723a90..a2d086b9d 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -16,22 +16,13 @@ public class GameLifetimeScope : LifetimeScope private GameObject remotePlayerPrefab; [SerializeField] - private GameObject gameManagerPrefab; + private GameManager gameManagerPrefab; protected override void Configure(IContainerBuilder builder) { - builder.UseComponents(components => - { - var gameManager = Object.Instantiate(gameManagerPrefab).GetComponent(); - DontDestroyOnLoad(gameManager.gameObject); - components.AddInstance(gameManager); + + builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); - }); - - // builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); - - - // Register the EntryPoint for GameManager initialization builder.RegisterEntryPoint(); } } diff --git a/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs index aa5a81c1f..b8c7b15f3 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs @@ -18,8 +18,8 @@ public void Start() { // Initialize GameManager values _gameManager.TargetFrameRate = 60; - _gameManager.MaximumLives = 5; - _gameManager.CurrentLives = 5; + _gameManager.MaximumLives = 1; + _gameManager.CurrentLives = 1; _gameManager.GameOverScene = "GameOver"; Debug.Log("GameManager initialized via EntryPoint!"); From 80a7769afdd8bd1f67f609685eacac80aadd8195 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 02:19:40 -0500 Subject: [PATCH 02/24] fix(mmextensions): added MMTimeManager as a prefab. --- .../mmextensions/mmextensions/Shaco/GameLifetimeScope.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index a2d086b9d..aac34f599 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -18,10 +18,16 @@ public class GameLifetimeScope : LifetimeScope [SerializeField] private GameManager gameManagerPrefab; + [SerializeField] + private MMTimeManager timeManagerPrefab; + + [SerializeField] + private MMTimeManager timeManagerPrefab; protected override void Configure(IContainerBuilder builder) { builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); + builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); builder.RegisterEntryPoint(); } From 602edba80d83edcaafda2ade0b0ace11cbe59eb4 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 02:20:51 -0500 Subject: [PATCH 03/24] fix(mmextensions): updating the gameover scene. --- .../mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs index b8c7b15f3..4ec852b2b 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameManagerEntryPoint.cs @@ -16,11 +16,10 @@ public GameManagerEntryPoint(GameManager gameManager) public void Start() { - // Initialize GameManager values _gameManager.TargetFrameRate = 60; _gameManager.MaximumLives = 1; _gameManager.CurrentLives = 1; - _gameManager.GameOverScene = "GameOver"; + _gameManager.GameOverScene = "Title"; Debug.Log("GameManager initialized via EntryPoint!"); } From ca0a9ebf5ff55b52d0b446e2e44d999fccfba2a9 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 02:39:00 -0500 Subject: [PATCH 04/24] fix(mmextensions): added the feedback to the assembly reference. --- packages/mmextensions/Kbve.MMExtensions.asmdef | 1 + packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/mmextensions/Kbve.MMExtensions.asmdef b/packages/mmextensions/Kbve.MMExtensions.asmdef index e846f77ae..d34b02092 100644 --- a/packages/mmextensions/Kbve.MMExtensions.asmdef +++ b/packages/mmextensions/Kbve.MMExtensions.asmdef @@ -7,6 +7,7 @@ "Unity.Collections", "MoreMountains.Tools", "MoreMountains.TopDownEngine", + "MoreMountains.Feedbacks", "VContainer", "Kbve.Kilonet" ], diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index aac34f599..245d8d1d1 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -3,6 +3,7 @@ using VContainer.Unity; using MoreMountains.Tools; using MoreMountains.TopDownEngine; +using MoreMountains.Feedbacks; using KBVE.Kilonet; namespace KBVE.MMExtensions.Shaco @@ -18,9 +19,6 @@ public class GameLifetimeScope : LifetimeScope [SerializeField] private GameManager gameManagerPrefab; - [SerializeField] - private MMTimeManager timeManagerPrefab; - [SerializeField] private MMTimeManager timeManagerPrefab; protected override void Configure(IContainerBuilder builder) From 7c9668de61eab69bd181f8e15704c730c726310b Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 02:46:38 -0500 Subject: [PATCH 05/24] fix(mmextensions): added the time manager. --- .../mmextensions/Shaco/GameLifetimeScope.cs | 1 + .../Shaco/TimeManagerEntryPoint.cs | 28 +++++++++++++++++++ .../Shaco/TimeManagerEntryPoint.cs.meta | 11 ++++++++ 3 files changed, 40 insertions(+) create mode 100644 packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs create mode 100644 packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs.meta diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 245d8d1d1..e3113b8f7 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -28,6 +28,7 @@ protected override void Configure(IContainerBuilder builder) builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); builder.RegisterEntryPoint(); + builder.RegisterEntryPoint(); } } } diff --git a/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs new file mode 100644 index 000000000..3b73f3196 --- /dev/null +++ b/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs @@ -0,0 +1,28 @@ +using VContainer; +using VContainer.Unity; +using MoreMountains.Feedbacks; +using MoreMountains.Tools; +using MoreMountains.TopDownEngine; + +namespace KBVE.MMExtensions.Shaco +{ + public class TimeManagerEntryPoint : IStartable + { + private readonly MMTimeManager _timeManager; + + public TimeManagerEntryPoint(MMTimeManager timeManager) + { + _timeManager = timeManager; + } + + public void Start() + { + // Example Initialization Logic + _timeManager.NormalTimeScale = 1f; + _timeManager.UpdateTimescale = true; + _timeManager.UpdateFixedDeltaTime = true; + _timeManager.UpdateMaximumDeltaTime = true; + Debug.Log("MMTimeManager initialized in TimeManagerEntryPoint"); + } + } +} diff --git a/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs.meta b/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs.meta new file mode 100644 index 000000000..9fee21b28 --- /dev/null +++ b/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 153d8a3f91d1478699519cb6bcc80d06 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file From 4850d89b524302204f00e8be766856e5ede4d535 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 02:57:20 -0500 Subject: [PATCH 06/24] fix(mmextensions): updating the camera system. --- .../mmextensions/mmextensions/Shaco/GameLifetimeScope.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index e3113b8f7..7bc7f33f6 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -21,6 +21,11 @@ public class GameLifetimeScope : LifetimeScope [SerializeField] private MMTimeManager timeManagerPrefab; + + [SerializeField] + private GameObject cameraPrefab; + + protected override void Configure(IContainerBuilder builder) { From 2712fb6453d3386c98b908b5e6543e2f5c04a618 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:02:36 -0500 Subject: [PATCH 07/24] fix(mmextensions): updating the time manager entry point. --- .../mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs index 3b73f3196..e7df80bd7 100644 --- a/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs +++ b/packages/mmextensions/mmextensions/Shaco/TimeManagerEntryPoint.cs @@ -1,8 +1,7 @@ +using UnityEngine; using VContainer; using VContainer.Unity; using MoreMountains.Feedbacks; -using MoreMountains.Tools; -using MoreMountains.TopDownEngine; namespace KBVE.MMExtensions.Shaco { From d87165f0179f003f876bb2e2f16341335654bbea Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:18:28 -0500 Subject: [PATCH 08/24] feat(mmextensions): better camera system. --- .../Shaco/CameraManagerEntryPoint.cs | 21 +++++++++++++++++++ .../Shaco/CameraManagerEntryPoint.cs.meta | 11 ++++++++++ .../mmextensions/Shaco/GameLifetimeScope.cs | 12 ++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs create mode 100644 packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs.meta diff --git a/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs new file mode 100644 index 000000000..bb2ce37ae --- /dev/null +++ b/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs @@ -0,0 +1,21 @@ +using UnityEngine; +using VContainer; +using VContainer.Unity; + +namespace KBVE.MMExtensions.Shaco +{ + public class CameraManagerEntryPoint : IStartable + { + private readonly GameObject _cameraSystem; + + public CameraManagerEntryPoint(GameObject cameraSystem) + { + _cameraSystem = cameraSystem; + } + + public void Start() + { + Debug.Log("Camera System initialized."); + } + } +} diff --git a/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs.meta b/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs.meta new file mode 100644 index 000000000..03ea0cc8f --- /dev/null +++ b/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d7ecea6b3644ec9af22c9a1850442ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 7bc7f33f6..c1649b8bf 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -28,12 +28,22 @@ public class GameLifetimeScope : LifetimeScope protected override void Configure(IContainerBuilder builder) { - + + // Instantiate and Register Camera Prefab + var cameraInstance = Object.Instantiate(cameraPrefab); + builder.RegisterComponentInHierarchy(cameraInstance.GetComponent()); + cameraInstance.transform.parent = null; // TODO: swap out the parent. + DontDestroyOnLoad(cameraInstance); + + builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); + // builder.RegisterComponentInNewPrefab(cameraPrefab, Lifetime.Singleton).DontDestroyOnLoad(); builder.RegisterEntryPoint(); builder.RegisterEntryPoint(); + // builder.RegisterEntryPoint(); + } } } From ecad812302c8600ff3a388e7ab04afd1cd314504 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 03:27:29 -0500 Subject: [PATCH 09/24] fix(mmextensions): adjusting the order of the camera lifetime. --- .../mmextensions/Shaco/CameraManagerEntryPoint.cs | 4 ++-- .../mmextensions/mmextensions/Shaco/GameLifetimeScope.cs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs index bb2ce37ae..fce0a03df 100644 --- a/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs +++ b/packages/mmextensions/mmextensions/Shaco/CameraManagerEntryPoint.cs @@ -1,7 +1,7 @@ using UnityEngine; using VContainer; using VContainer.Unity; - +// TODO: Cinemachine3.1 Integration. namespace KBVE.MMExtensions.Shaco { public class CameraManagerEntryPoint : IStartable @@ -15,7 +15,7 @@ public CameraManagerEntryPoint(GameObject cameraSystem) public void Start() { - Debug.Log("Camera System initialized."); + Debug.Log("TODO - Camera Manager initialized."); } } } diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index c1649b8bf..9418b6de6 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -31,11 +31,10 @@ protected override void Configure(IContainerBuilder builder) // Instantiate and Register Camera Prefab var cameraInstance = Object.Instantiate(cameraPrefab); - builder.RegisterComponentInHierarchy(cameraInstance.GetComponent()); - cameraInstance.transform.parent = null; // TODO: swap out the parent. + cameraInstance.transform.parent = null; + builder.RegisterInstance(cameraInstance).AsSelf(); DontDestroyOnLoad(cameraInstance); - builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); // builder.RegisterComponentInNewPrefab(cameraPrefab, Lifetime.Singleton).DontDestroyOnLoad(); From d1c978ae7dd0c45b075b79dcdba14cc747cc89c1 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:26:25 -0500 Subject: [PATCH 10/24] feat(mmextensions): sound manager --- .../mmextensions/Shaco/GameLifetimeScope.cs | 4 ++++ .../mmextensions/Shaco/SoundManagerEntryPoint.cs | 0 .../mmextensions/Shaco/SoundManagerEntryPoint.cs.meta | 11 +++++++++++ 3 files changed, 15 insertions(+) create mode 100644 packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs create mode 100644 packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs.meta diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 9418b6de6..22184d194 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -22,6 +22,9 @@ public class GameLifetimeScope : LifetimeScope [SerializeField] private MMTimeManager timeManagerPrefab; + [SerializeField] + private MMSoundManager soundManagerPrefab; + [SerializeField] private GameObject cameraPrefab; @@ -37,6 +40,7 @@ protected override void Configure(IContainerBuilder builder) builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); + builder.RegisterComponentInNewPrefab(soundManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); // builder.RegisterComponentInNewPrefab(cameraPrefab, Lifetime.Singleton).DontDestroyOnLoad(); builder.RegisterEntryPoint(); diff --git a/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs new file mode 100644 index 000000000..e69de29bb diff --git a/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs.meta b/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs.meta new file mode 100644 index 000000000..338b4baba --- /dev/null +++ b/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b825b5064ae149bf849771dded29fdad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file From c56cb9053a96b8b316341c2708245b2bb51e1bc2 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:06:36 -0500 Subject: [PATCH 11/24] docs(journal): updating the daily notes. --- apps/kbve.com/src/content/journal/11-26.mdx | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 apps/kbve.com/src/content/journal/11-26.mdx diff --git a/apps/kbve.com/src/content/journal/11-26.mdx b/apps/kbve.com/src/content/journal/11-26.mdx new file mode 100644 index 000000000..0d3fd9be3 --- /dev/null +++ b/apps/kbve.com/src/content/journal/11-26.mdx @@ -0,0 +1,28 @@ +--- +title: 'November: 26th' +category: Daily +date: 2024-11-26 12:00:00 +client: Self +unsplash: 1541320779116-ec4a3d4692bc +img: https://images.unsplash.com/photo-1541320779116-ec4a3d4692bc?crop=entropy&cs=srgb&fm=jpg&ixid=MnwzNjM5Nzd8MHwxfHJhbmRvbXx8fHx8fHx8fDE2ODE3NDg2ODY&ixlib=rb-4.0.3&q=85 +description: November 26th. +tags: + - daily +--- + +import { Adsense, Tasks } from '@kbve/astropad'; + +## 2024 + +- 01:00PM + + **TSLA** + + We will have to roll the options out to next week and grab the $1000, just to make sure that it works. + +- 02:05PM + + **Unity** + + Sound manager vcontianer needs to be fixed, which we need to do before tomorrows meeting. + I am thinking that we would try to wrap everything inside of a vcontainer, making it easier for us to access the resources. \ No newline at end of file From 34dc14fe99116cb1db0322f525109741bf509876 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:20:10 -0500 Subject: [PATCH 12/24] fix(mmextensions): updating the mm sound manager but still need to make some changes. --- apps/kbve.com/src/content/journal/11-26.mdx | 4 ++- .../mmextensions/Kbve.MMExtensions.asmdef | 3 +- .../mmextensions/Shaco/GameLifetimeScope.cs | 1 + .../Shaco/SoundManagerEntryPoint.cs | 29 +++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/apps/kbve.com/src/content/journal/11-26.mdx b/apps/kbve.com/src/content/journal/11-26.mdx index 0d3fd9be3..4c57c8d25 100644 --- a/apps/kbve.com/src/content/journal/11-26.mdx +++ b/apps/kbve.com/src/content/journal/11-26.mdx @@ -25,4 +25,6 @@ import { Adsense, Tasks } from '@kbve/astropad'; **Unity** Sound manager vcontianer needs to be fixed, which we need to do before tomorrows meeting. - I am thinking that we would try to wrap everything inside of a vcontainer, making it easier for us to access the resources. \ No newline at end of file + I am thinking that we would try to wrap everything inside of a vcontainer, making it easier for us to access the resources. + For us to setup the sound manager, we would have to link the scriptable object through addresses, which means we need to define them as well. + Inside of the `mmextensions`, we can add an assembly reference to Unity. \ No newline at end of file diff --git a/packages/mmextensions/Kbve.MMExtensions.asmdef b/packages/mmextensions/Kbve.MMExtensions.asmdef index d34b02092..f04e07fd4 100644 --- a/packages/mmextensions/Kbve.MMExtensions.asmdef +++ b/packages/mmextensions/Kbve.MMExtensions.asmdef @@ -9,7 +9,8 @@ "MoreMountains.TopDownEngine", "MoreMountains.Feedbacks", "VContainer", - "Kbve.Kilonet" + "Kbve.Kilonet", + "Unity.Addressables" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 22184d194..ab65698a4 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -45,6 +45,7 @@ protected override void Configure(IContainerBuilder builder) builder.RegisterEntryPoint(); builder.RegisterEntryPoint(); + builder.RegisterEntryPoint(); // builder.RegisterEntryPoint(); } diff --git a/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs index e69de29bb..0a151ab1a 100644 --- a/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs +++ b/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using UnityEngine.AddressableAssets; +using UnityEngine.ResourceManagement.AsyncOperations; +using VContainer; +using VContainer.Unity; +using MoreMountains.Tools; + +namespace KBVE.MMExtensions.Shaco +{ + public class SoundManagerEntryPoint : IStartable + { + private readonly MMSoundManager _soundManager; + + public SoundManagerEntryPoint(MMSoundManager soundManager) + { + _soundManager = soundManager; + } + + public void Start() + { + // Example Initialization Logic + _soundManager.NormalTimeScale = 1f; + _soundManager.UpdateTimescale = true; + _soundManager.UpdateFixedDeltaTime = true; + _soundManager.UpdateMaximumDeltaTime = true; + Debug.Log("MMSoundManager initialized in SoundManagerEntryPoint"); + } + } +} From 29a306282aca251846b9d0ab967a33dacbc1ea36 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Tue, 26 Nov 2024 22:04:06 -0500 Subject: [PATCH 13/24] fix(mmextensions): commented out the sound manager code. --- .../mmextensions/Shaco/SoundManagerEntryPoint.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs b/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs index 0a151ab1a..a83422617 100644 --- a/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs +++ b/packages/mmextensions/mmextensions/Shaco/SoundManagerEntryPoint.cs @@ -19,10 +19,10 @@ public SoundManagerEntryPoint(MMSoundManager soundManager) public void Start() { // Example Initialization Logic - _soundManager.NormalTimeScale = 1f; - _soundManager.UpdateTimescale = true; - _soundManager.UpdateFixedDeltaTime = true; - _soundManager.UpdateMaximumDeltaTime = true; + // _soundManager.NormalTimeScale = 1f; + // _soundManager.UpdateTimescale = true; + // _soundManager.UpdateFixedDeltaTime = true; + // _soundManager.UpdateMaximumDeltaTime = true; Debug.Log("MMSoundManager initialized in SoundManagerEntryPoint"); } } From a9715744216022e3f17b574104c498bc523870af Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Wed, 27 Nov 2024 00:58:38 -0500 Subject: [PATCH 14/24] fix(mmextensions): typo in the entry point. --- packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index ab65698a4..650d208bc 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -45,7 +45,7 @@ protected override void Configure(IContainerBuilder builder) builder.RegisterEntryPoint(); builder.RegisterEntryPoint(); - builder.RegisterEntryPoint(); + builder.RegisterEntryPoint(); // builder.RegisterEntryPoint(); } From a44d5f25e6efb4613123622f77a6d454a1dc2c06 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Wed, 27 Nov 2024 01:07:18 -0500 Subject: [PATCH 15/24] fix(mmextensions): removing the DontDestroyOnLoad for now --- .../mmextensions/Shaco/GameLifetimeScope.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs index 650d208bc..426352b59 100644 --- a/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs +++ b/packages/mmextensions/mmextensions/Shaco/GameLifetimeScope.cs @@ -36,11 +36,17 @@ protected override void Configure(IContainerBuilder builder) var cameraInstance = Object.Instantiate(cameraPrefab); cameraInstance.transform.parent = null; builder.RegisterInstance(cameraInstance).AsSelf(); - DontDestroyOnLoad(cameraInstance); + // DontDestroyOnLoad(cameraInstance); - builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); - builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); - builder.RegisterComponentInNewPrefab(soundManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); + + + builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped); + builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton); + builder.RegisterComponentInNewPrefab(soundManagerPrefab, Lifetime.Singleton); + + // builder.RegisterComponentInNewPrefab(gameManagerPrefab, Lifetime.Scoped).DontDestroyOnLoad(); + // builder.RegisterComponentInNewPrefab(timeManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); + // builder.RegisterComponentInNewPrefab(soundManagerPrefab, Lifetime.Singleton).DontDestroyOnLoad(); // builder.RegisterComponentInNewPrefab(cameraPrefab, Lifetime.Singleton).DontDestroyOnLoad(); builder.RegisterEntryPoint(); From 48277e004d8d75101020b4cc9c2db75f2a787f97 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Wed, 27 Nov 2024 02:26:25 -0500 Subject: [PATCH 16/24] docs(journal): updated the journal entries. --- apps/kbve.com/src/content/journal/11-26.mdx | 10 +++++++++- packages/kilonet/README.md | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/kbve.com/src/content/journal/11-26.mdx b/apps/kbve.com/src/content/journal/11-26.mdx index 4c57c8d25..1b5e7ac27 100644 --- a/apps/kbve.com/src/content/journal/11-26.mdx +++ b/apps/kbve.com/src/content/journal/11-26.mdx @@ -27,4 +27,12 @@ import { Adsense, Tasks } from '@kbve/astropad'; Sound manager vcontianer needs to be fixed, which we need to do before tomorrows meeting. I am thinking that we would try to wrap everything inside of a vcontainer, making it easier for us to access the resources. For us to setup the sound manager, we would have to link the scriptable object through addresses, which means we need to define them as well. - Inside of the `mmextensions`, we can add an assembly reference to Unity. \ No newline at end of file + Inside of the `mmextensions`, we can add an assembly reference to Unity. + +- 11:00PM + + **Arcane** + + Finally got to start the series and its been a wild ride, err, rather a blast, so far. + I am going to be a bit sad when it ends because it has been a great series, but I am here for it all. + The new ARAM map also slaps, I love what they did with it and it finally makes zeri, bard and talon both a bit more fun to play. \ No newline at end of file diff --git a/packages/kilonet/README.md b/packages/kilonet/README.md index abce604fd..780759ce8 100644 --- a/packages/kilonet/README.md +++ b/packages/kilonet/README.md @@ -25,6 +25,7 @@ Adding new tilemap generator script and fixed some asmdefs. Triggering another build once more, oh boi, another docker build. We got the helm chart working and now are preparing for a basic multiplayer game. The WebGL build is a bit slower and needs some adjustments, starting the test case now. +Vcontainers added and a new model is coming soon. - [KBVE](https://kbve.com/) - [RareIcon](https://rareicon.com/) \ No newline at end of file From dfbbf62fb93e0ebf1ae8ba0f40f89ea8d6ecd3a1 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Wed, 27 Nov 2024 02:44:26 -0500 Subject: [PATCH 17/24] docs(journal): daily entry updated. --- apps/kbve.com/src/content/journal/11-27.mdx | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 apps/kbve.com/src/content/journal/11-27.mdx diff --git a/apps/kbve.com/src/content/journal/11-27.mdx b/apps/kbve.com/src/content/journal/11-27.mdx new file mode 100644 index 000000000..974c090ab --- /dev/null +++ b/apps/kbve.com/src/content/journal/11-27.mdx @@ -0,0 +1,31 @@ +--- +title: 'November: 27th' +category: Daily +date: 2024-11-27 12:00:00 +client: Self +unsplash: 1541320779116-ec4a3d4692bc +img: https://images.unsplash.com/photo-1541320779116-ec4a3d4692bc?crop=entropy&cs=srgb&fm=jpg&ixid=MnwzNjM5Nzd8MHwxfHJhbmRvbXx8fHx8fHx8fDE2ODE3NDg2ODY&ixlib=rb-4.0.3&q=85 +description: November 27th. +tags: + - daily +--- + +import { Adsense, Tasks } from '@kbve/astropad'; + +## 2024 + +- 02:20AM + + **Unity** + + We got ourselves another unity build to test out. + While I am doing that, I should look to commission a steam game and bundle? + Actually, if the artist that we hire does a good job, we could also have the same artist do our steam page assets? + That would save us a bunch of time too. + +- 02:37AM + + **SoundManager** + + Looks like the prefab works even though we are not using the addressable object. + I am not too sure how I feel about that but for now it will be fine. \ No newline at end of file From e53c82933717763e174832ed11daab0f9fc2ea56 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Wed, 27 Nov 2024 15:11:08 -0500 Subject: [PATCH 18/24] docs(journal): added daily entry. --- apps/kbve.com/src/content/journal/11-27.mdx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/kbve.com/src/content/journal/11-27.mdx b/apps/kbve.com/src/content/journal/11-27.mdx index 974c090ab..7f561f456 100644 --- a/apps/kbve.com/src/content/journal/11-27.mdx +++ b/apps/kbve.com/src/content/journal/11-27.mdx @@ -28,4 +28,12 @@ import { Adsense, Tasks } from '@kbve/astropad'; **SoundManager** Looks like the prefab works even though we are not using the addressable object. - I am not too sure how I feel about that but for now it will be fine. \ No newline at end of file + I am not too sure how I feel about that but for now it will be fine. + +- 03:09PM + + **Addressable** + + Looks like the most recent push created the files that we need for addressable-based vcontainers, allowing us to finally call the prefabs during the runtime. + This will be an interesting way for us to build out the game, I am thinking that the town itself will be the main scene and when entering a mission or camp, we do an additive loading? + Furthermore we would have to fix the URL maps and also the HTML template a bit more. \ No newline at end of file From feef9bd72270e716c11311042bc00e9017784983 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Wed, 27 Nov 2024 15:16:03 -0500 Subject: [PATCH 19/24] feat(unity): a barebone webgl template for https://github.com/KBVE/kbve/issues/3277 --- .../public/data/scripts/unity/.gitkeep | 0 .../scripts/unity/WebGLTemplates/KBVE.meta | 8 + .../unity/WebGLTemplates/KBVE/index.html | 188 ++++++++++++++++++ .../unity/WebGLTemplates/KBVE/index.html.meta | 7 + 4 files changed, 203 insertions(+) create mode 100644 apps/kbve.com/public/data/scripts/unity/.gitkeep create mode 100644 apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE.meta create mode 100644 apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html create mode 100644 apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html.meta diff --git a/apps/kbve.com/public/data/scripts/unity/.gitkeep b/apps/kbve.com/public/data/scripts/unity/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE.meta b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE.meta new file mode 100644 index 000000000..12be63420 --- /dev/null +++ b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 245dea1fe16ec434696764b354b84995 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html new file mode 100644 index 000000000..2ae826445 --- /dev/null +++ b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html @@ -0,0 +1,188 @@ + + + + + + Unity Web Player | {{{ PRODUCT_NAME }}} + + +#if SHOW_DIAGNOSTICS + + +#endif + + +
+ +
+ +
+
+
+
+
+ +
+ + + diff --git a/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html.meta b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html.meta new file mode 100644 index 000000000..47e7020b0 --- /dev/null +++ b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82c615106bfdbb14b85c03b4f10793c6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file From afe3cb2aa4b93f6c915984182b785c19a5c4e407 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Wed, 27 Nov 2024 15:46:29 -0500 Subject: [PATCH 20/24] fix(unity): updating the webgl template for the discord activity game. --- .../KBVE/TemplateData/style.css | 0 .../unity/WebGLTemplates/KBVE/index.html | 11 +++-- apps/kbve.com/src/content/journal/11-27.mdx | 41 ++++++++++++++++++- 3 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/TemplateData/style.css diff --git a/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/TemplateData/style.css b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/TemplateData/style.css new file mode 100644 index 000000000..e69de29bb diff --git a/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html index 2ae826445..e16d42ceb 100644 --- a/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html +++ b/apps/kbve.com/public/data/scripts/unity/WebGLTemplates/KBVE/index.html @@ -3,7 +3,8 @@ - Unity Web Player | {{{ PRODUCT_NAME }}} + + {{{ PRODUCT_NAME }}} #if SHOW_DIAGNOSTICS @@ -13,22 +14,24 @@
- +
+
- +