From 238b49d005789bda3cd0555755deba4b6eef446a Mon Sep 17 00:00:00 2001 From: DerpyNewbie Date: Thu, 23 Jan 2025 02:10:38 +0900 Subject: [PATCH] Add logging when resetting magazine --- .../Runtime/Gun/MagazineManager.asset | 94 ++++++++++++++++--- .../Runtime/Gun/MagazineManager.cs | 5 + 2 files changed, 85 insertions(+), 14 deletions(-) diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset index c0beb1b..53e7bf6 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 3 + Data: 4 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: magazineVariants + Data: logger - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: magazineVariants + Data: logger - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.DataStore.MagazineVariantDataStore[], CenturionCC.System + Data: DerpyNewbie.Logger.NewbieLogger, DerpyNewbie.Logger - Name: Entry: 8 Data: @@ -71,7 +71,7 @@ MonoBehaviour: Data: 4|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule + Data: VRC.Udon.UdonBehaviour, VRC.Udon - Name: Entry: 8 Data: @@ -116,16 +116,82 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: sourceMagazine + Data: magazineVariants - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: sourceMagazine + Data: magazineVariants - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.DataStore.MagazineVariantDataStore[], CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 9|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: sourceMagazine + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: sourceMagazine + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject, UnityEngine.CoreModule @@ -134,7 +200,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -149,13 +215,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -179,13 +245,13 @@ MonoBehaviour: Data: _spawnedMagazines - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _spawnedMagazines - Name: k__BackingField Entry: 7 - Data: 12|System.RuntimeType, mscorlib + Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataList, VRCSDK3 @@ -194,7 +260,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -209,7 +275,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs index 2789d30..483aaab 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs @@ -1,6 +1,7 @@ using System; using CenturionCC.System.Gun.DataStore; using DerpyNewbie.Common; +using DerpyNewbie.Logger; using JetBrains.Annotations; using UdonSharp; using UnityEngine; @@ -11,6 +12,9 @@ namespace CenturionCC.System.Gun [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class MagazineManager : UdonSharpBehaviour { + [SerializeField] [NewbieInject] + private NewbieLogger logger; + [SerializeField] [NewbieInject] private MagazineVariantDataStore[] magazineVariants; @@ -47,6 +51,7 @@ public Magazine SpawnMagazine(MagazineVariantDataStore dataStore, Vector3 positi [PublicAPI] public void ResetMagazines() { + logger.Log("MagazineManager::ResetMagazines"); // foreach cannot be used to DataList in UdonSharp // ReSharper disable once ForCanBeConvertedToForeach for (var i = 0; i < _spawnedMagazines.Count; i++)