diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.asset b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.asset index 654bb8cd..77b7eae5 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 24 + Data: 27 - Name: Entry: 7 Data: @@ -281,16 +281,178 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: cockingPosition + Data: doHoldOpen - Name: $v Entry: 7 Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: doHoldOpen + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 18|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: pullOnHoldOpen + - Name: $v + Entry: 7 + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pullOnHoldOpen + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 21|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: holdOpenOnEmptyShoot + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: holdOpenOnEmptyShoot + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 24|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: cockingPosition + - Name: $v + Entry: 7 + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingPosition - Name: k__BackingField Entry: 7 - Data: 17|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Transform, UnityEngine.CoreModule @@ -299,7 +461,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -314,13 +476,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -344,13 +506,13 @@ MonoBehaviour: Data: cockingLength - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingLength - Name: k__BackingField Entry: 7 - Data: 21|System.RuntimeType, mscorlib + Data: 30|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -359,7 +521,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -374,13 +536,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 32|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -404,16 +566,16 @@ MonoBehaviour: Data: cockingMargin - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -428,19 +590,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 27|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 36|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -470,16 +632,16 @@ MonoBehaviour: Data: cockingAutoLoadMargin - Name: $v Entry: 7 - Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingAutoLoadMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -494,19 +656,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 31|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 40|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -536,7 +698,7 @@ MonoBehaviour: Data: requireTwist - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: requireTwist @@ -560,13 +722,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 34|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 43|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Twisting @@ -575,7 +737,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -599,7 +761,7 @@ MonoBehaviour: Data: useHandleRotation - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useHandleRotation @@ -623,13 +785,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -653,16 +815,16 @@ MonoBehaviour: Data: idleTwistPosition - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: idleTwistPosition - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -677,13 +839,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -707,16 +869,16 @@ MonoBehaviour: Data: activeTwistPosition - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: activeTwistPosition - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -731,13 +893,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -761,16 +923,16 @@ MonoBehaviour: Data: twistAngleOffset - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistAngleOffset - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -785,13 +947,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -815,16 +977,16 @@ MonoBehaviour: Data: twistMaxAngle - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistMaxAngle - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -839,13 +1001,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -869,16 +1031,16 @@ MonoBehaviour: Data: twistMinAngle - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistMinAngle - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -893,13 +1055,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -923,16 +1085,16 @@ MonoBehaviour: Data: twistMargin - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -947,19 +1109,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 57|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 66|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -989,16 +1151,16 @@ MonoBehaviour: Data: twistAutoLoadMargin - Name: $v Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistAutoLoadMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1013,19 +1175,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 61|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 70|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -1055,7 +1217,7 @@ MonoBehaviour: Data: doDesktopCockingAutomatically - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: doDesktopCockingAutomatically @@ -1079,13 +1241,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 64|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 73|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Desktop @@ -1094,7 +1256,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1118,13 +1280,13 @@ MonoBehaviour: Data: desktopCockingKey - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: desktopCockingKey - Name: k__BackingField Entry: 7 - Data: 67|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.KeyCode, UnityEngine.CoreModule @@ -1133,7 +1295,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 67 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1148,13 +1310,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1178,16 +1340,16 @@ MonoBehaviour: Data: desktopCockingTime - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: desktopCockingTime - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1202,13 +1364,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1232,13 +1394,13 @@ MonoBehaviour: Data: cockingHapticData - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingHapticData - Name: k__BackingField Entry: 7 - Data: 74|System.RuntimeType, mscorlib + Data: 83|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunCockingHapticDataStore, CenturionCC.System @@ -1247,7 +1409,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 75|System.RuntimeType, mscorlib + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -1268,13 +1430,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 77|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 86|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Haptic @@ -1283,7 +1445,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 87|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1307,16 +1469,16 @@ MonoBehaviour: Data: _desktopCockingTimer - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _desktopCockingTimer - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1331,7 +1493,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1355,7 +1517,7 @@ MonoBehaviour: Data: _isDesktopCockingCurrentlyPulling - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isDesktopCockingCurrentlyPulling @@ -1379,7 +1541,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1403,7 +1565,7 @@ MonoBehaviour: Data: _isOnDesktopCocking - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isOnDesktopCocking @@ -1427,7 +1589,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.cs b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.cs index 4f84e9eb..5ce47938 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/CockingGunBehaviour.cs @@ -1,7 +1,6 @@ using CenturionCC.System.Gun.DataStore; using UdonSharp; using UnityEngine; -using VRC.SDKBase; namespace CenturionCC.System.Gun.Behaviour { @@ -16,6 +15,12 @@ public class CockingGunBehaviour : GunBehaviourBase [SerializeField] private bool isDoubleAction; + [SerializeField] private bool doHoldOpen = true; + + [SerializeField] private bool pullOnHoldOpen; + + [SerializeField] private bool holdOpenOnEmptyShoot = true; + [SerializeField] private Transform cockingPosition; [SerializeField] private float cockingLength; @@ -116,7 +121,13 @@ private void UpdateCustomHandlePosition(GunBase instance) { Vector3 targetPos; Quaternion targetRot; - switch (instance.State) + var gunState = instance.State; + if (gunState == GunState.InHoldOpen) + { + gunState = pullOnHoldOpen ? GunState.InCockingPull : GunState.Idle; + } + + switch (gunState) { default: case GunState.Idle: @@ -155,7 +166,7 @@ private bool CanShoot(GunBase target) { return target.Trigger == TriggerState.Firing && target.State == GunState.Idle && - (target.HasBulletInChamber || isDoubleAction); + (target.HasBulletInChamber && (target.HasCocked || isDoubleAction)); } #endregion @@ -208,11 +219,14 @@ private void DrawTwistGizmos() public override void OnTriggerDown(GunBase instance) { - if (!CanShoot(instance)) - { - instance.EmptyShoot(); - instance.Trigger = TriggerState.Armed; - } + // if (instance.Trigger == TriggerState.Firing && + // instance.State == GunState.Idle && + // (instance.CanShootWithoutMagazine || instance.HasMagazine) && + // (instance.HasCocked || isDoubleAction)) + // { + // instance.EmptyShoot(); + // instance.Trigger = TriggerState.Fired; + // } } public override void OnGunPickup(GunBase instance) @@ -232,17 +246,35 @@ public override void OnGunUpdate(GunBase instance) float progressNormalized, twistNormalized; // Shoot a gun whenever it's able to shoot. load new bullet if it's blow back variant - if (CanShoot(instance)) + + if (instance.Trigger == TriggerState.Firing) { - var shotResult = instance.TryToShoot(); - var hasSucceeded = shotResult == ShotResult.Succeeded || shotResult == ShotResult.SucceededContinuously; - if (hasSucceeded && isBlowBack) + if (instance.State == GunState.Idle && + (instance.CanShootWithoutMagazine || instance.HasMagazine) && + (instance.HasCocked || isDoubleAction)) + { + var shotResult = instance.TryToShoot(); + var hasPlayedShoot = shotResult == ShotResult.Succeeded || + shotResult == ShotResult.SucceededContinuously || + shotResult == ShotResult.Failed; + if (hasPlayedShoot && isBlowBack) + { + if (!instance.LoadBullet() && instance.HasMagazine && doHoldOpen) + { + instance.State = GunState.InHoldOpen; + UpdateCustomHandlePosition(instance); + } + + instance.HasCocked = true; + } + } + else { - instance.HasCocked = true; - instance.LoadBullet(); + instance.Trigger = TriggerState.Fired; } } + if (instance.State == GunState.InHoldOpen && !instance.CustomHandle.IsPickedUp) return; // Calculate cocking/twist progress if (instance.IsVR) @@ -326,6 +358,38 @@ public override void OnGunUpdate(GunBase instance) ); } + public override void OnGunStateChanged(GunBase instance, GunState previousState) + { + if (instance.CustomHandle.IsPickedUp) return; + + UpdateCustomHandlePosition(instance); + + if (previousState == GunState.InHoldOpen && instance.State == GunState.Idle && !instance.HasBulletInChamber) + { + instance.LoadBullet(); + // TODO: may not be realistic + instance.HasCocked = true; + } + } + + public override void OnGunEmptyShoot(GunBase instance) + { + if (holdOpenOnEmptyShoot && instance.HasMagazine) + { + if (instance.MagazineRoundsRemaining <= 0) instance.State = GunState.InHoldOpen; + else instance.LoadBullet(); + instance.HasCocked = true; + UpdateCustomHandlePosition(instance); + return; + } + + if (isBlowBack && !doHoldOpen) + { + instance.LoadBullet(); + instance.HasCocked = true; + } + } + public override void Setup(GunBase instance) { Debug.Log($"[CockingGunBehaviour] setup called for {instance.name}"); diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/DefaultGunBehaviour.cs b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/DefaultGunBehaviour.cs index a292ecd1..ce100a4b 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/DefaultGunBehaviour.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/DefaultGunBehaviour.cs @@ -9,9 +9,6 @@ public class DefaultGunBehaviour : GunBehaviourBase public override void OnGunPickup(GunBase instance) { - if (!instance.HasBulletInChamber) - instance.LoadBullet(); - instance.HasCocked = true; } public override void OnGunDrop(GunBase instance) @@ -22,23 +19,20 @@ public override void OnGunUpdate(GunBase instance) { if (instance.Trigger == TriggerState.Firing) { - var shotResult = instance.TryToShoot(); - var hasSucceeded = shotResult == ShotResult.Succeeded || shotResult == ShotResult.SucceededContinuously; - if (hasSucceeded) - { - if (!instance.HasBulletInChamber) - instance.LoadBullet(); + if (!instance.HasCocked) instance.HasCocked = true; - } + + var shotResult = instance.TryToShoot(); + var hasShot = shotResult == ShotResult.Succeeded || shotResult == ShotResult.SucceededContinuously || + shotResult == ShotResult.Failed; + if (hasShot && !instance.HasBulletInChamber) + instance.LoadBullet(); } } public override void Setup(GunBase instance) { instance.State = GunState.Idle; - if (!instance.HasBulletInChamber) - instance.LoadBullet(); - instance.HasCocked = true; } public override void Dispose(GunBase instance) diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/GunBehaviourBase.cs b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/GunBehaviourBase.cs index b8e9f141..9f7c4f6f 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/GunBehaviourBase.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/GunBehaviourBase.cs @@ -71,6 +71,27 @@ public virtual void OnGunUpdate(GunBase instance) { } + /// + /// Gets called when state was changed. + /// + /// + /// + public virtual void OnGunStateChanged(GunBase instance, GunState previousState) + { + } + + public virtual void OnGunShoot(GunBase instance) + { + } + + public virtual void OnGunEmptyShoot(GunBase instance) + { + } + + public virtual void OnGunCancelShoot(GunBase instance) + { + } + /// /// Gets called when assigned to a . /// diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/SprintableCockingGunBehaviour.asset b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/SprintableCockingGunBehaviour.asset index 7af0b072..161bf2c8 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/SprintableCockingGunBehaviour.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/Behaviour/SprintableCockingGunBehaviour.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 37 + Data: 40 - Name: Entry: 7 Data: @@ -281,16 +281,178 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: cockingPosition + Data: doHoldOpen - Name: $v Entry: 7 Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: doHoldOpen + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 18|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: pullOnHoldOpen + - Name: $v + Entry: 7 + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pullOnHoldOpen + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 21|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: holdOpenOnEmptyShoot + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: holdOpenOnEmptyShoot + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 24|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: cockingPosition + - Name: $v + Entry: 7 + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingPosition - Name: k__BackingField Entry: 7 - Data: 17|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Transform, UnityEngine.CoreModule @@ -299,7 +461,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -314,13 +476,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -344,13 +506,13 @@ MonoBehaviour: Data: cockingLength - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingLength - Name: k__BackingField Entry: 7 - Data: 21|System.RuntimeType, mscorlib + Data: 30|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -359,7 +521,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -374,13 +536,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 32|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -404,16 +566,16 @@ MonoBehaviour: Data: cockingMargin - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -428,19 +590,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 27|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 36|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -470,16 +632,16 @@ MonoBehaviour: Data: cockingAutoLoadMargin - Name: $v Entry: 7 - Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingAutoLoadMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -494,19 +656,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 31|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 40|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -536,7 +698,7 @@ MonoBehaviour: Data: requireTwist - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: requireTwist @@ -560,13 +722,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 34|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 43|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Twisting @@ -575,7 +737,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -599,7 +761,7 @@ MonoBehaviour: Data: useHandleRotation - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useHandleRotation @@ -623,13 +785,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -653,16 +815,16 @@ MonoBehaviour: Data: idleTwistPosition - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: idleTwistPosition - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -677,13 +839,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -707,16 +869,16 @@ MonoBehaviour: Data: activeTwistPosition - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: activeTwistPosition - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -731,13 +893,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -761,16 +923,16 @@ MonoBehaviour: Data: twistAngleOffset - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistAngleOffset - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -785,13 +947,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -815,16 +977,16 @@ MonoBehaviour: Data: twistMaxAngle - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistMaxAngle - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -839,13 +1001,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -869,16 +1031,16 @@ MonoBehaviour: Data: twistMinAngle - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistMinAngle - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -893,13 +1055,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -923,16 +1085,16 @@ MonoBehaviour: Data: twistMargin - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -947,19 +1109,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 57|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 66|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -989,16 +1151,16 @@ MonoBehaviour: Data: twistAutoLoadMargin - Name: $v Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: twistAutoLoadMargin - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1013,19 +1175,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 61|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 70|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 0 @@ -1055,7 +1217,7 @@ MonoBehaviour: Data: doDesktopCockingAutomatically - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: doDesktopCockingAutomatically @@ -1079,13 +1241,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 64|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 73|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Desktop @@ -1094,7 +1256,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1118,13 +1280,13 @@ MonoBehaviour: Data: desktopCockingKey - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: desktopCockingKey - Name: k__BackingField Entry: 7 - Data: 67|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.KeyCode, UnityEngine.CoreModule @@ -1133,7 +1295,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 67 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1148,13 +1310,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1178,16 +1340,16 @@ MonoBehaviour: Data: desktopCockingTime - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: desktopCockingTime - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1202,13 +1364,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1232,13 +1394,13 @@ MonoBehaviour: Data: cockingHapticData - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cockingHapticData - Name: k__BackingField Entry: 7 - Data: 74|System.RuntimeType, mscorlib + Data: 83|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunCockingHapticDataStore, CenturionCC.System @@ -1247,7 +1409,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 75|System.RuntimeType, mscorlib + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -1268,13 +1430,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 77|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 86|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Haptic @@ -1283,7 +1445,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 87|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1307,16 +1469,16 @@ MonoBehaviour: Data: _desktopCockingTimer - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _desktopCockingTimer - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1331,7 +1493,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1355,7 +1517,7 @@ MonoBehaviour: Data: _isDesktopCockingCurrentlyPulling - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isDesktopCockingCurrentlyPulling @@ -1379,7 +1541,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1403,7 +1565,7 @@ MonoBehaviour: Data: _isOnDesktopCocking - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isOnDesktopCocking @@ -1427,7 +1589,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1451,16 +1613,16 @@ MonoBehaviour: Data: sprintSpeedMultiplier - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintSpeedMultiplier - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1475,13 +1637,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 87|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 96|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Sprint Settings @@ -1490,7 +1652,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 88|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1514,16 +1676,16 @@ MonoBehaviour: Data: sprintDurationInSeconds - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintDurationInSeconds - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1538,13 +1700,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 91|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 100|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1568,16 +1730,16 @@ MonoBehaviour: Data: sprintCooldownInSeconds - Name: $v Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintCooldownInSeconds - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1592,13 +1754,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 103|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1622,16 +1785,16 @@ MonoBehaviour: Data: desktopSprintKey - Name: $v Entry: 7 - Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: desktopSprintKey - Name: k__BackingField Entry: 9 - Data: 67 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 67 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1646,13 +1809,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 105|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 106|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1676,7 +1840,7 @@ MonoBehaviour: Data: showMessages - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: showMessages @@ -1700,13 +1864,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 100|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 109|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Sprint Messages @@ -1715,7 +1880,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 110|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1739,16 +1904,16 @@ MonoBehaviour: Data: messageDuration - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: messageDuration - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1763,20 +1928,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 113|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 105|UnityEngine.RangeAttribute, UnityEngine.CoreModule + Data: 114|UnityEngine.RangeAttribute, UnityEngine.CoreModule - Name: min Entry: 4 Data: 2 @@ -1806,13 +1971,13 @@ MonoBehaviour: Data: startingSprint - Name: $v Entry: 7 - Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: startingSprint - Name: k__BackingField Entry: 7 - Data: 107|System.RuntimeType, mscorlib + Data: 116|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Common.TranslatableMessage, DerpyNewbie.Common @@ -1821,7 +1986,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1836,14 +2001,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 109|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 118|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1867,16 +2032,16 @@ MonoBehaviour: Data: endingSprint - Name: $v Entry: 7 - Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: endingSprint - Name: k__BackingField Entry: 9 - Data: 107 + Data: 116 - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1891,14 +2056,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 112|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 121|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1922,16 +2087,16 @@ MonoBehaviour: Data: sprintInCooldown - Name: $v Entry: 7 - Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintInCooldown - Name: k__BackingField Entry: 9 - Data: 107 + Data: 116 - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1946,14 +2111,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 123|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 115|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 124|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1977,13 +2142,13 @@ MonoBehaviour: Data: playerController - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: playerController - Name: k__BackingField Entry: 7 - Data: 117|System.RuntimeType, mscorlib + Data: 126|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.PlayerController, CenturionCC.System @@ -1992,7 +2157,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2007,20 +2172,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 127|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 119|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 128|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 120|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 129|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2044,13 +2209,13 @@ MonoBehaviour: Data: notificationProvider - Name: $v Entry: 7 - Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 130|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: notificationProvider - Name: k__BackingField Entry: 7 - Data: 122|System.RuntimeType, mscorlib + Data: 131|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.UI.NotificationProvider, CenturionCC.System @@ -2059,7 +2224,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2074,20 +2239,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 123|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 132|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 124|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 133|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 125|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 134|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2111,13 +2276,13 @@ MonoBehaviour: Data: _lastSprintDateTime - Name: $v Entry: 7 - Data: 126|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 135|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastSprintDateTime - Name: k__BackingField Entry: 7 - Data: 127|System.RuntimeType, mscorlib + Data: 136|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.DateTime, mscorlib @@ -2126,7 +2291,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 127 + Data: 136 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2141,7 +2306,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 137|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2166,7 +2331,7 @@ MonoBehaviour: Data: _wasInSprint - Name: $v Entry: 7 - Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 138|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _wasInSprint @@ -2190,7 +2355,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 130|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 139|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.asset b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.asset index 3f853d13..281b52df 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 35 + Data: 37 - Name: Entry: 7 Data: @@ -356,19 +356,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: model + Data: canShootWithoutMagazine - Name: $v Entry: 7 Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: model + Data: canShootWithoutMagazine - Name: k__BackingField Entry: 7 Data: 24|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.GameObject, UnityEngine.CoreModule + Data: System.Boolean, mscorlib - Name: Entry: 8 Data: @@ -416,16 +416,130 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: projectileData + Data: allowedMagazineTypes - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: allowedMagazineTypes + - Name: k__BackingField + Entry: 9 + Data: 16 + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 29|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: model + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: model + - Name: k__BackingField + Entry: 7 + Data: 31|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 31 + - 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: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 33|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: projectileData + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: projectileData - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.ProjectileDataProvider, CenturionCC.System @@ -434,7 +548,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 29|System.RuntimeType, mscorlib + Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -455,13 +569,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -485,13 +599,13 @@ MonoBehaviour: Data: audioData - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: audioData - Name: k__BackingField Entry: 7 - Data: 33|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunAudioDataStore, CenturionCC.System @@ -500,7 +614,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -515,13 +629,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -545,13 +659,13 @@ MonoBehaviour: Data: hapticData - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: hapticData - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunHapticDataStore, CenturionCC.System @@ -560,7 +674,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -575,13 +689,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -605,13 +719,13 @@ MonoBehaviour: Data: cameraData - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: cameraData - Name: k__BackingField Entry: 7 - Data: 41|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunCamera.GunCameraDataStore, CenturionCC.System @@ -620,7 +734,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -635,13 +749,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -665,13 +779,13 @@ MonoBehaviour: Data: behaviour - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: behaviour - Name: k__BackingField Entry: 7 - Data: 45|System.RuntimeType, mscorlib + Data: 52|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.Behaviour.GunBehaviourBase, CenturionCC.System @@ -680,7 +794,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -695,13 +809,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -725,13 +839,13 @@ MonoBehaviour: Data: projectilePoolOverride - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: projectilePoolOverride - Name: k__BackingField Entry: 7 - Data: 49|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.ProjectilePool, CenturionCC.System @@ -740,7 +854,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -755,19 +869,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 52|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 59|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: Override default ProjectilePool for this variant. leave this empty to @@ -795,22 +909,16 @@ MonoBehaviour: Data: isDoubleHanded - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: isDoubleHanded - Name: k__BackingField - Entry: 7 - Data: 54|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 24 - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -825,13 +933,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -855,16 +963,16 @@ MonoBehaviour: Data: useRePickupDelayForMainHandle - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useRePickupDelayForMainHandle - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -879,13 +987,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -909,16 +1017,16 @@ MonoBehaviour: Data: useRePickupDelayForSubHandle - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useRePickupDelayForSubHandle - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -933,13 +1041,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 68|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -963,16 +1071,16 @@ MonoBehaviour: Data: useWallCheck - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useWallCheck - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -987,13 +1095,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1017,16 +1125,16 @@ MonoBehaviour: Data: useSafeZoneCheck - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useSafeZoneCheck - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 9 - Data: 54 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1041,13 +1149,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 68|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1071,13 +1179,13 @@ MonoBehaviour: Data: modelOffset - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: modelOffset - Name: k__BackingField Entry: 7 - Data: 70|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Transform, UnityEngine.CoreModule @@ -1086,7 +1194,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1101,13 +1209,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1131,16 +1239,16 @@ MonoBehaviour: Data: shooterOffset - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: shooterOffset - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1155,13 +1263,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1185,16 +1293,16 @@ MonoBehaviour: Data: mainHandleOffset - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandleOffset - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1209,13 +1317,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1239,7 +1347,7 @@ MonoBehaviour: Data: mainHandlePitchOffset - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandlePitchOffset @@ -1263,13 +1371,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 87|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1293,16 +1401,16 @@ MonoBehaviour: Data: subHandleOffset - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: subHandleOffset - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1317,13 +1425,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 90|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1347,13 +1455,13 @@ MonoBehaviour: Data: colliderSetting - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: colliderSetting - Name: k__BackingField Entry: 7 - Data: 86|System.RuntimeType, mscorlib + Data: 92|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.BoxCollider, UnityEngine.PhysicsModule @@ -1362,7 +1470,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 86 + Data: 92 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1377,13 +1485,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 88|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1407,13 +1515,13 @@ MonoBehaviour: Data: desktopTooltip - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: desktopTooltip - Name: k__BackingField Entry: 7 - Data: 90|System.RuntimeType, mscorlib + Data: 96|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Common.TranslatableMessage, DerpyNewbie.Common @@ -1422,7 +1530,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1437,13 +1545,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 92|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 98|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Messages @@ -1452,7 +1560,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1476,16 +1584,16 @@ MonoBehaviour: Data: vrTooltip - Name: $v Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: vrTooltip - Name: k__BackingField Entry: 9 - Data: 90 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1500,13 +1608,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 96|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 102|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1530,13 +1639,13 @@ MonoBehaviour: Data: objectType - Name: $v Entry: 7 - Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectType - Name: k__BackingField Entry: 7 - Data: 98|System.RuntimeType, mscorlib + Data: 104|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.ObjectType, CenturionCC.System @@ -1560,13 +1669,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 105|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 100|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 106|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: ObjectMarker Properties @@ -1575,7 +1685,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 107|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1599,7 +1709,7 @@ MonoBehaviour: Data: objectWeight - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectWeight @@ -1623,14 +1733,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 110|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1654,13 +1764,13 @@ MonoBehaviour: Data: tags - Name: $v Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: tags - Name: k__BackingField Entry: 7 - Data: 106|System.RuntimeType, mscorlib + Data: 112|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -1669,7 +1779,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 112 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1684,14 +1794,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 108|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 114|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1715,13 +1825,13 @@ MonoBehaviour: Data: movementOption - Name: $v Entry: 7 - Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: movementOption - Name: k__BackingField Entry: 7 - Data: 110|System.RuntimeType, mscorlib + Data: 116|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.MovementOption, CenturionCC.System @@ -1745,14 +1855,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 112|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 118|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Player Controller Properties @@ -1761,7 +1871,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 113|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 119|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1785,7 +1895,7 @@ MonoBehaviour: Data: walkSpeed - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: walkSpeed @@ -1809,14 +1919,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 121|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 116|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 122|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1840,7 +1950,7 @@ MonoBehaviour: Data: sprintSpeed - Name: $v Entry: 7 - Data: 117|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 123|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintSpeed @@ -1864,14 +1974,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 124|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 119|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 125|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1895,7 +2005,7 @@ MonoBehaviour: Data: sprintThresholdMultiplier - Name: $v Entry: 7 - Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 126|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintThresholdMultiplier @@ -1919,14 +2029,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 121|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 127|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 122|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 128|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1950,13 +2060,13 @@ MonoBehaviour: Data: combatTagOption - Name: $v Entry: 7 - Data: 123|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagOption - Name: k__BackingField Entry: 7 - Data: 124|System.RuntimeType, mscorlib + Data: 130|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.CombatTagOption, CenturionCC.System @@ -1980,14 +2090,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 125|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 126|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 132|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2011,7 +2121,7 @@ MonoBehaviour: Data: combatTagSpeedMultiplier - Name: $v Entry: 7 - Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagSpeedMultiplier @@ -2035,14 +2145,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 129|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 135|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2066,7 +2176,7 @@ MonoBehaviour: Data: combatTagTime - Name: $v Entry: 7 - Data: 130|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 136|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagTime @@ -2090,14 +2200,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 137|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 132|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 138|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.cs b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.cs index d73b4bb3..526ec6ca 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/GunVariantDataStore.cs @@ -23,6 +23,10 @@ public class GunVariantDataStore : UdonSharpBehaviour [SerializeField] private float maxRoundsPerSecond; + [SerializeField] private bool canShootWithoutMagazine = true; + + [SerializeField] private int[] allowedMagazineTypes; + [SerializeField] private GameObject model; [SerializeField] private ProjectileDataProvider projectileData; @@ -93,6 +97,8 @@ public class GunVariantDataStore : UdonSharpBehaviour public int HolsterSize => holsterSize; public FireMode[] AvailableFiringModes => availableFiringModes; public float MaxRoundsPerSecond => maxRoundsPerSecond; + public bool CanShootWithoutMagazine => canShootWithoutMagazine; + public int[] AllowedMagazineTypes => allowedMagazineTypes; [CanBeNull] public GameObject Model => model; diff --git a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.asset b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.asset new file mode 100644 index 00000000..a1e138fe --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.asset @@ -0,0 +1,455 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: MagazineVariantDataStore + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 0635c2b51824eab4a90730ba82273fe1, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 0ea3a5acf606b3045ad862c3183fbf40, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 1 + hasInteractEvent: 0 + scriptID: -4378899562942173539 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 7 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: type + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: type + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|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: roundsCapacity + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: roundsCapacity + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 8|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: model + - Name: $v + Entry: 7 + Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: model + - Name: k__BackingField + Entry: 7 + Data: 10|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 10 + - 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: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 12|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: modelOffset + - Name: $v + Entry: 7 + Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: modelOffset + - Name: k__BackingField + Entry: 7 + Data: 14|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 14 + - 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: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 16|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: leftHandOffset + - Name: $v + Entry: 7 + Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: leftHandOffset + - Name: k__BackingField + Entry: 9 + Data: 14 + - Name: k__BackingField + Entry: 9 + Data: 14 + - 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: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 19|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: rightHandOffset + - Name: $v + Entry: 7 + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: rightHandOffset + - Name: k__BackingField + Entry: 9 + Data: 14 + - Name: k__BackingField + Entry: 9 + Data: 14 + - 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: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 22|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: secondaryMagazineDetectionCollider + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: secondaryMagazineDetectionCollider + - Name: k__BackingField + Entry: 7 + Data: 24|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.BoxCollider, UnityEngine.PhysicsModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 24 + - 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: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 26|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.asset.meta b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.asset.meta new file mode 100644 index 00000000..d26b8458 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb622249d6d6e9f4fb3600b916b21d4d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.cs b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.cs new file mode 100644 index 00000000..86c0135d --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.cs @@ -0,0 +1,30 @@ +using UdonSharp; +using UnityEngine; + +namespace CenturionCC.System.Gun.DataStore +{ + [UdonBehaviourSyncMode(BehaviourSyncMode.None)] + public class MagazineVariantDataStore : UdonSharpBehaviour + { + [SerializeField] private int type; + [SerializeField] private int roundsCapacity; + [SerializeField] private GameObject model; + [SerializeField] private Transform modelOffset; + [SerializeField] private Transform leftHandOffset; + [SerializeField] private Transform rightHandOffset; + [SerializeField] private BoxCollider secondaryMagazineDetectionCollider; + + public int Type => type; + public int RoundsCapacity => roundsCapacity; + + public GameObject Model => model; + + public Vector3 ModelOffsetPosition => modelOffset.localPosition; + public Quaternion ModelOffsetRotation => modelOffset.localRotation; + + public Transform LeftHandOffset => leftHandOffset; + public Transform RightHandOffset => rightHandOffset; + + public BoxCollider SecondaryMagazineDetectionCollider => secondaryMagazineDetectionCollider; + } +} \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.cs.meta b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.cs.meta new file mode 100644 index 00000000..9201c7b0 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/DataStore/MagazineVariantDataStore.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ea3a5acf606b3045ad862c3183fbf40 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Gun.asset b/Packages/org.centurioncc.system/Runtime/Gun/Gun.asset index 647cb124..9258c92d 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/Gun.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/Gun.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 86 + Data: 94 - Name: Entry: 7 Data: @@ -104,19 +104,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 Data: 6|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.TriggerState, CenturionCC.System + Data: CenturionCC.System.Gun.MagazineReceiver, CenturionCC.System - Name: Entry: 8 Data: @@ -125,7 +125,7 @@ MonoBehaviour: Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: VRC.Udon.UdonBehaviour, VRC.Udon - Name: Entry: 8 Data: @@ -164,16 +164,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 Data: 10|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.TriggerState, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: k__BackingField + - Name: $v + Entry: 7 + Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 7 + Data: 14|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunState, CenturionCC.System @@ -182,7 +242,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -197,7 +257,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -221,13 +281,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 13|System.RuntimeType, mscorlib + Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -236,7 +296,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -251,7 +311,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 14|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 @@ -275,16 +335,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -299,7 +359,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -323,16 +383,16 @@ MonoBehaviour: Data: CockingProgressAnimHash - Name: $v Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: CockingProgressAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -347,7 +407,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -371,16 +431,16 @@ MonoBehaviour: Data: CockingTwistAnimHash - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: CockingTwistAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -395,7 +455,55 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: CurrentBulletsCountAnimHash + - Name: $v + Entry: 7 + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: CurrentBulletsCountAnimHash + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -419,16 +527,16 @@ MonoBehaviour: Data: HasBulletAnimHash - Name: $v Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HasBulletAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -443,7 +551,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -467,16 +575,16 @@ MonoBehaviour: Data: HasCockedAnimHash - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HasCockedAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -491,7 +599,55 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: HasMagazineAnimHash + - Name: $v + Entry: 7 + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HasMagazineAnimHash + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -515,16 +671,16 @@ MonoBehaviour: Data: IsInSafeZoneAnimHash - Name: $v Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsInSafeZoneAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -539,7 +695,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -563,16 +719,16 @@ MonoBehaviour: Data: IsInWallAnimHash - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsInWallAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -587,7 +743,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -611,16 +767,16 @@ MonoBehaviour: Data: IsLocalAnimHash - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsLocalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -635,7 +791,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -659,16 +815,16 @@ MonoBehaviour: Data: IsPickedUpGlobalAnimHash - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsPickedUpGlobalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -683,7 +839,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -707,16 +863,16 @@ MonoBehaviour: Data: IsPickedUpLocalAnimHash - Name: $v Entry: 7 - Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsPickedUpLocalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -731,7 +887,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -755,16 +911,16 @@ MonoBehaviour: Data: IsShootingAnimHash - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsShootingAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -779,7 +935,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -803,16 +959,16 @@ MonoBehaviour: Data: IsShootingEmptyAnimHash - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsShootingEmptyAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -827,7 +983,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -851,16 +1007,16 @@ MonoBehaviour: Data: IsVRAnimHash - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IsVRAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -875,7 +1031,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -899,16 +1055,16 @@ MonoBehaviour: Data: SelectorTypeAnimHash - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: SelectorTypeAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -923,7 +1079,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -947,16 +1103,16 @@ MonoBehaviour: Data: StateAnimHash - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: StateAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -971,7 +1127,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -995,16 +1151,16 @@ MonoBehaviour: Data: TriggerProgressAnimHash - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: TriggerProgressAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1019,7 +1175,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1043,16 +1199,16 @@ MonoBehaviour: Data: TriggerStateAnimHash - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: TriggerStateAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1067,7 +1223,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1086,18 +1242,78 @@ MonoBehaviour: - Name: Entry: 7 Data: + - Name: $k + Entry: 1 + Data: _currentMagazineType + - Name: $v + Entry: 7 + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _currentMagazineType + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _currentState - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _currentState - Name: k__BackingField Entry: 7 - Data: 50|System.RuntimeType, mscorlib + Data: 62|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Byte, mscorlib @@ -1106,7 +1322,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 50 + Data: 62 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1121,19 +1337,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 52|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 53|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 65|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1157,13 +1373,13 @@ MonoBehaviour: Data: _fireMode - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _fireMode - Name: k__BackingField Entry: 7 - Data: 55|System.RuntimeType, mscorlib + Data: 67|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.FireMode, CenturionCC.System @@ -1172,7 +1388,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1187,7 +1403,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1211,16 +1427,16 @@ MonoBehaviour: Data: _hasBulletInChamber - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _hasBulletInChamber - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1235,19 +1451,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 72|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1271,16 +1487,16 @@ MonoBehaviour: Data: _hasCocked - Name: $v Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _hasCocked - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1295,19 +1511,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 63|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 64|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 76|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1326,21 +1542,69 @@ MonoBehaviour: - Name: Entry: 7 Data: + - Name: $k + Entry: 1 + Data: _isInStateChangeCallback + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _isInStateChangeCallback + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _isLocal - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isLocal - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1355,7 +1619,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1379,16 +1643,16 @@ MonoBehaviour: Data: _isPickedUp - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1403,7 +1667,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1427,16 +1691,16 @@ MonoBehaviour: Data: _isVR - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isVR - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1451,7 +1715,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1475,16 +1739,16 @@ MonoBehaviour: Data: _lastShotCount - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastShotCount - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1499,7 +1763,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1523,16 +1787,16 @@ MonoBehaviour: Data: _mainHandleIsPickedUp - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandleIsPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1547,7 +1811,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1571,13 +1835,13 @@ MonoBehaviour: Data: _mainHandlePosOffset - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandlePosOffset - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 90|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector3, UnityEngine.CoreModule @@ -1586,7 +1850,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1601,7 +1865,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1625,13 +1889,13 @@ MonoBehaviour: Data: _mainHandleRotOffset - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandleRotOffset - Name: k__BackingField Entry: 7 - Data: 79|System.RuntimeType, mscorlib + Data: 93|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Quaternion, UnityEngine.CoreModule @@ -1640,7 +1904,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1655,7 +1919,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1679,13 +1943,13 @@ MonoBehaviour: Data: _nextMainHandlePickupableTime - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _nextMainHandlePickupableTime - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 96|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1694,7 +1958,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1709,7 +1973,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1733,16 +1997,16 @@ MonoBehaviour: Data: _nextSubHandlePickupableTime - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _nextSubHandlePickupableTime - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1757,7 +2021,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1781,16 +2045,16 @@ MonoBehaviour: Data: _shotPosition - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotPosition - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1805,13 +2069,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 102|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1835,16 +2100,16 @@ MonoBehaviour: Data: _shotRotation - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotRotation - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1859,13 +2124,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 91|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1889,13 +2155,13 @@ MonoBehaviour: Data: _shotTime - Name: $v Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotTime - Name: k__BackingField Entry: 7 - Data: 93|System.RuntimeType, mscorlib + Data: 107|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int64, mscorlib @@ -1904,7 +2170,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 93 + Data: 107 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1919,13 +2185,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 95|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1949,16 +2216,16 @@ MonoBehaviour: Data: _subHandleIsPickedUp - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandleIsPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1973,7 +2240,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -1997,16 +2265,16 @@ MonoBehaviour: Data: _subHandlePosOffset - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandlePosOffset - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2021,7 +2289,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -2045,16 +2314,16 @@ MonoBehaviour: Data: _subHandleRotOffset - Name: $v Entry: 7 - Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandleRotOffset - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2069,7 +2338,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2094,16 +2363,16 @@ MonoBehaviour: Data: _trigger - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _trigger - Name: k__BackingField Entry: 9 - Data: 6 + Data: 10 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2118,7 +2387,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2143,13 +2412,13 @@ MonoBehaviour: Data: pivotHandle - Name: $v Entry: 7 - Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: pivotHandle - Name: k__BackingField Entry: 7 - Data: 105|System.RuntimeType, mscorlib + Data: 119|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunHandle, CenturionCC.System @@ -2157,14 +2426,8 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 106|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.Udon.UdonBehaviour, VRC.Udon - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2179,7 +2442,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2204,16 +2467,16 @@ MonoBehaviour: Data: pivotPosOffset - Name: $v Entry: 7 - Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: pivotPosOffset - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2228,14 +2491,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 110|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 123|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -2259,16 +2522,16 @@ MonoBehaviour: Data: pivotRotOffset - Name: $v Entry: 7 - Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: pivotRotOffset - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2283,14 +2546,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 125|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 113|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 126|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -2314,16 +2577,16 @@ MonoBehaviour: Data: safetyAreaCollisionCount - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: safetyAreaCollisionCount - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2338,7 +2601,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2363,16 +2626,16 @@ MonoBehaviour: Data: shotCount - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: shotCount - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2387,20 +2650,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 130|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 131|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 119|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 132|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -2424,13 +2687,13 @@ MonoBehaviour: Data: weaponName - Name: $v Entry: 7 - Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: weaponName - Name: k__BackingField Entry: 7 - Data: 121|System.RuntimeType, mscorlib + Data: 134|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -2439,7 +2702,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 121 + Data: 134 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2454,14 +2717,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 135|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 136|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2485,13 +2748,13 @@ MonoBehaviour: Data: target - Name: $v Entry: 7 - Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 137|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: target - Name: k__BackingField Entry: 7 - Data: 125|System.RuntimeType, mscorlib + Data: 138|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Transform, UnityEngine.CoreModule @@ -2500,7 +2763,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 125 + Data: 138 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2515,14 +2778,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 126|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 139|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 127|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 140|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2546,16 +2809,16 @@ MonoBehaviour: Data: shooter - Name: $v Entry: 7 - Data: 128|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 141|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: shooter - Name: k__BackingField Entry: 9 - Data: 125 + Data: 138 - Name: k__BackingField Entry: 9 - Data: 125 + Data: 138 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2570,14 +2833,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 129|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 142|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 130|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 143|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2601,16 +2864,16 @@ MonoBehaviour: Data: mainHandle - Name: $v Entry: 7 - Data: 131|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandle - Name: k__BackingField Entry: 9 - Data: 105 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2625,14 +2888,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 132|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 133|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2656,16 +2919,16 @@ MonoBehaviour: Data: subHandle - Name: $v Entry: 7 - Data: 134|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: subHandle - Name: k__BackingField Entry: 9 - Data: 105 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2680,14 +2943,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 135|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 148|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 136|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 149|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2711,16 +2974,16 @@ MonoBehaviour: Data: customHandle - Name: $v Entry: 7 - Data: 137|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 150|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: customHandle - Name: k__BackingField Entry: 9 - Data: 105 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2735,14 +2998,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 138|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 151|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 139|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 152|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2766,13 +3029,13 @@ MonoBehaviour: Data: bulletHolder - Name: $v Entry: 7 - Data: 140|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 153|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: bulletHolder - Name: k__BackingField Entry: 7 - Data: 141|System.RuntimeType, mscorlib + Data: 154|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunBulletHolder, CenturionCC.System @@ -2781,7 +3044,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2796,14 +3059,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 142|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 155|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 143|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 156|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2827,7 +3090,7 @@ MonoBehaviour: Data: animator - Name: $v Entry: 7 - Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 157|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: animator @@ -2851,14 +3114,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 158|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 159|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2879,25 +3142,80 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: behaviour + Data: magazineReceiver - Name: $v Entry: 7 - Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: behaviour + Data: magazineReceiver + - Name: k__BackingField + Entry: 9 + Data: 6 + - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: 161|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 162|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: allowedMagazineTypes + - Name: $v + Entry: 7 + Data: 163|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: allowedMagazineTypes - Name: k__BackingField Entry: 7 - Data: 148|System.RuntimeType, mscorlib + Data: 164|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.Behaviour.GunBehaviourBase, CenturionCC.System + Data: System.Int32[], mscorlib - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 164 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2912,14 +3230,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 149|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 165|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 150|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 166|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2940,31 +3258,141 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: availableFireModes + Data: canShootWithoutMagazine - Name: $v Entry: 7 - Data: 151|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 167|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: availableFireModes + Data: canShootWithoutMagazine + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: 168|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 169|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: behaviour + - Name: $v + Entry: 7 + Data: 170|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: behaviour - Name: k__BackingField Entry: 7 - Data: 152|System.RuntimeType, mscorlib + Data: 171|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.FireMode[], CenturionCC.System + Data: CenturionCC.System.Gun.Behaviour.GunBehaviourBase, CenturionCC.System - Name: Entry: 8 Data: - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: Entry: 7 - Data: 153|System.RuntimeType, mscorlib + Data: 173|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: System.Int32[], mscorlib + Data: availableFireModes + - Name: $v + Entry: 7 + Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: availableFireModes + - Name: k__BackingField + Entry: 7 + Data: 175|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.FireMode[], CenturionCC.System - Name: Entry: 8 Data: + - Name: k__BackingField + Entry: 9 + Data: 164 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2979,14 +3407,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 154|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 176|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 155|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 177|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3010,13 +3438,13 @@ MonoBehaviour: Data: projectileData - Name: $v Entry: 7 - Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 178|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: projectileData - Name: k__BackingField Entry: 7 - Data: 157|System.RuntimeType, mscorlib + Data: 179|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.ProjectileDataProvider, CenturionCC.System @@ -3025,7 +3453,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3040,14 +3468,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 158|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 180|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 159|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 181|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3071,13 +3499,13 @@ MonoBehaviour: Data: audioData - Name: $v Entry: 7 - Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 182|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: audioData - Name: k__BackingField Entry: 7 - Data: 161|System.RuntimeType, mscorlib + Data: 183|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunAudioDataStore, CenturionCC.System @@ -3086,7 +3514,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3101,14 +3529,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 162|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 184|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 163|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 185|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3132,13 +3560,13 @@ MonoBehaviour: Data: hapticData - Name: $v Entry: 7 - Data: 164|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: hapticData - Name: k__BackingField Entry: 7 - Data: 165|System.RuntimeType, mscorlib + Data: 187|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunHapticDataStore, CenturionCC.System @@ -3147,7 +3575,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3162,14 +3590,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 166|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 188|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 167|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 189|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3193,16 +3621,16 @@ MonoBehaviour: Data: isDoubleHanded - Name: $v Entry: 7 - Data: 168|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 190|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: isDoubleHanded - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3217,14 +3645,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 169|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 170|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 192|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3248,16 +3676,16 @@ MonoBehaviour: Data: maxHoldDistance - Name: $v Entry: 7 - Data: 171|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 193|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: maxHoldDistance - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3272,14 +3700,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 194|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 173|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 195|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3303,16 +3731,16 @@ MonoBehaviour: Data: roundsPerSecond - Name: $v Entry: 7 - Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 196|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: roundsPerSecond - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3327,14 +3755,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 175|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 197|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 176|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 198|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3358,16 +3786,16 @@ MonoBehaviour: Data: requiredHolsterSize - Name: $v Entry: 7 - Data: 177|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 199|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: requiredHolsterSize - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3382,14 +3810,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 178|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 200|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 179|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 201|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3413,16 +3841,16 @@ MonoBehaviour: Data: mainHandlePitchOffset - Name: $v Entry: 7 - Data: 180|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 202|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandlePitchOffset - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3437,14 +3865,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 181|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 203|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 182|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 204|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3468,16 +3896,16 @@ MonoBehaviour: Data: mainHandleRePickupDelay - Name: $v Entry: 7 - Data: 183|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 205|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandleRePickupDelay - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3492,14 +3920,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 184|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 206|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 185|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 207|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3523,16 +3951,16 @@ MonoBehaviour: Data: subHandleRePickupDelay - Name: $v Entry: 7 - Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 208|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: subHandleRePickupDelay - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3547,14 +3975,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 187|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 209|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 188|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 210|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3578,13 +4006,13 @@ MonoBehaviour: Data: objectType - Name: $v Entry: 7 - Data: 189|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 211|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectType - Name: k__BackingField Entry: 7 - Data: 190|System.RuntimeType, mscorlib + Data: 212|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.ObjectType, CenturionCC.System @@ -3593,7 +4021,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3608,14 +4036,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 213|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 192|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 214|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: ObjectMarker Properties @@ -3624,7 +4052,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 193|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 215|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3648,16 +4076,16 @@ MonoBehaviour: Data: objectWeight - Name: $v Entry: 7 - Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 216|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectWeight - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3672,14 +4100,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 195|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 217|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 196|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 218|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3703,13 +4131,13 @@ MonoBehaviour: Data: tags - Name: $v Entry: 7 - Data: 197|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: tags - Name: k__BackingField Entry: 7 - Data: 198|System.RuntimeType, mscorlib + Data: 220|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -3718,7 +4146,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 198 + Data: 220 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3733,14 +4161,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 199|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 221|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 200|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 222|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3764,13 +4192,13 @@ MonoBehaviour: Data: movementOption - Name: $v Entry: 7 - Data: 201|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 223|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: movementOption - Name: k__BackingField Entry: 7 - Data: 202|System.RuntimeType, mscorlib + Data: 224|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.MovementOption, CenturionCC.System @@ -3779,7 +4207,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3794,14 +4222,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 203|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 225|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 204|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 226|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Player Controller Properties @@ -3810,7 +4238,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 205|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 227|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3834,16 +4262,16 @@ MonoBehaviour: Data: walkSpeed - Name: $v Entry: 7 - Data: 206|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 228|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: walkSpeed - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3858,14 +4286,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 207|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 229|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 208|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 230|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3889,16 +4317,16 @@ MonoBehaviour: Data: sprintSpeed - Name: $v Entry: 7 - Data: 209|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 231|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintSpeed - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3913,14 +4341,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 210|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 211|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 233|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3944,16 +4372,16 @@ MonoBehaviour: Data: sprintThresholdMultiplier - Name: $v Entry: 7 - Data: 212|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 234|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintThresholdMultiplier - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3968,14 +4396,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 213|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 235|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 214|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 236|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3999,13 +4427,13 @@ MonoBehaviour: Data: combatTag - Name: $v Entry: 7 - Data: 215|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 237|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTag - Name: k__BackingField Entry: 7 - Data: 216|System.RuntimeType, mscorlib + Data: 238|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.CombatTagOption, CenturionCC.System @@ -4014,7 +4442,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4029,14 +4457,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 217|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 239|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 218|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 240|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4060,16 +4488,16 @@ MonoBehaviour: Data: combatTagSpeedMultiplier - Name: $v Entry: 7 - Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 241|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagSpeedMultiplier - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4084,14 +4512,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 220|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 242|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 221|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 243|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4115,16 +4543,16 @@ MonoBehaviour: Data: combatTagTime - Name: $v Entry: 7 - Data: 222|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 244|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagTime - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4139,14 +4567,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 223|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 245|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 224|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 246|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4170,13 +4598,13 @@ MonoBehaviour: Data: logger - Name: $v Entry: 7 - Data: 225|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 247|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: logger - Name: k__BackingField Entry: 7 - Data: 226|System.RuntimeType, mscorlib + Data: 248|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Logger.PrintableBase, DerpyNewbie.Logger @@ -4185,7 +4613,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4200,20 +4628,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 227|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 249|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 228|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 250|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 229|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 251|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4237,13 +4665,13 @@ MonoBehaviour: Data: updateManager - Name: $v Entry: 7 - Data: 230|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 252|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: updateManager - Name: k__BackingField Entry: 7 - Data: 231|System.RuntimeType, mscorlib + Data: 253|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Common.UpdateManager, DerpyNewbie.Common @@ -4252,7 +4680,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4267,20 +4695,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 254|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 233|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 255|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 234|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 256|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4304,13 +4732,13 @@ MonoBehaviour: Data: audioManager - Name: $v Entry: 7 - Data: 235|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 257|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: audioManager - Name: k__BackingField Entry: 7 - Data: 236|System.RuntimeType, mscorlib + Data: 258|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Audio.AudioManager, CenturionCC.System @@ -4319,7 +4747,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4334,20 +4762,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 237|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 259|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 238|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 260|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 239|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 261|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4371,13 +4799,13 @@ MonoBehaviour: Data: playerController - Name: $v Entry: 7 - Data: 240|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 262|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: playerController - Name: k__BackingField Entry: 7 - Data: 241|System.RuntimeType, mscorlib + Data: 263|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.PlayerController, CenturionCC.System @@ -4386,7 +4814,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4401,20 +4829,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 242|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 264|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 243|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 265|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 244|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 266|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4438,16 +4866,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 245|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 267|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4462,14 +4890,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 246|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 268|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 247|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 269|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4493,13 +4921,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 248|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 270|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 249|System.RuntimeType, mscorlib + Data: 271|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunHolster, CenturionCC.System @@ -4508,7 +4936,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4523,7 +4951,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 250|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 272|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4548,16 +4976,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 251|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 273|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4572,14 +5000,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 252|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 274|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 253|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 275|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4603,16 +5031,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 254|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 276|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4627,7 +5055,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 255|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 277|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4652,16 +5080,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 256|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 278|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4676,7 +5104,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 257|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 279|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4701,16 +5129,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 258|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 280|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4725,7 +5153,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 259|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 281|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Gun.cs b/Packages/org.centurioncc.system/Runtime/Gun/Gun.cs index 665ce398..dc6ec8b0 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/Gun.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/Gun.cs @@ -25,8 +25,13 @@ public class Gun : GunBase private const float DisallowPickupFromBelowRange = -0.1F; protected readonly int CockingProgressAnimHash = Animator.StringToHash(GunUtility.CockingProgressParamName); protected readonly int CockingTwistAnimHash = Animator.StringToHash(GunUtility.CockingTwistParamName); + + protected readonly int CurrentBulletsCountAnimHash = + Animator.StringToHash(GunUtility.CurrentBulletsCountParamName); + protected readonly int HasBulletAnimHash = Animator.StringToHash(GunUtility.HasBulletParamName); protected readonly int HasCockedAnimHash = Animator.StringToHash(GunUtility.HasCockedParamName); + protected readonly int HasMagazineAnimHash = Animator.StringToHash(GunUtility.HasMagazineParamName); protected readonly int IsInSafeZoneAnimHash = Animator.StringToHash(GunUtility.IsInSafeZoneParamName); protected readonly int IsInWallAnimHash = Animator.StringToHash(GunUtility.IsInWallParamName); protected readonly int IsLocalAnimHash = Animator.StringToHash(GunUtility.IsLocalParamName); @@ -35,12 +40,16 @@ public class Gun : GunBase protected readonly int IsShootingAnimHash = Animator.StringToHash(GunUtility.IsShootingParamName); protected readonly int IsShootingEmptyAnimHash = Animator.StringToHash(GunUtility.IsShootingEmptyParamName); protected readonly int IsVRAnimHash = Animator.StringToHash(GunUtility.IsVRParamName); + protected readonly int SelectorTypeAnimHash = Animator.StringToHash(GunUtility.SelectorTypeParamName); protected readonly int StateAnimHash = Animator.StringToHash(GunUtility.StateParamName); protected readonly int TriggerProgressAnimHash = Animator.StringToHash(GunUtility.TriggerProgressParamName); protected readonly int TriggerStateAnimHash = Animator.StringToHash(GunUtility.TriggerStateParamName); + [UdonSynced] [FieldChangeCallback(nameof(CurrentMagazineType))] + private int _currentMagazineType; + [UdonSynced] [FieldChangeCallback(nameof(RawState))] private byte _currentState; @@ -52,6 +61,8 @@ [UdonSynced] [FieldChangeCallback(nameof(HasBulletInChamber))] [UdonSynced] [FieldChangeCallback(nameof(HasCocked))] private bool _hasCocked; + private bool _isInStateChangeCallback; + private bool _isLocal; private bool _isPickedUp; private bool _isVR; @@ -96,6 +107,7 @@ protected virtual void Start() { State = GunState.Idle; ShotCount = 0; + CurrentMagazineType = -1; } MainHandle.callback = this; @@ -130,14 +142,23 @@ protected virtual void Start() if (Behaviour != null) Behaviour.Setup(this); + + if (MagazineReceiver != null) + MagazineReceiver.Setup(this); } protected virtual void OnTriggerEnter(Collider other) { + if (other.gameObject.layer == 27) + { + Networking.LocalPlayer.PlayHapticEventInHand(MainHandle.CurrentHand, .2F, .02F, .1F); + return; + } + var otherName = other.name.ToLower(); #if CENTURIONSYSTEM_GUN_LOGGING || CENTURIONSYSTEM_VERBOSE_LOGGING - Logger.LogVerbose($"{Prefix}OnTriggerEnter: {otherName}"); + Logger.LogVerbose($"{Prefix}OnTriggerEnter: {otherName} with layer {other.gameObject.layer}"); #endif if (otherName.StartsWith("safezone")) @@ -171,8 +192,15 @@ protected virtual void OnTriggerEnter(Collider other) protected virtual void OnTriggerExit(Collider other) { + // TODO: improve perf + if (other.gameObject.layer == 27) return; + var otherName = other.name.ToLower(); +#if CENTURIONSYSTEM_GUN_LOGGING || CENTURIONSYSTEM_VERBOSE_LOGGING + Logger.LogVerbose($"{Prefix}OnTriggerExit: {otherName} with layer {other.gameObject.layer}"); +#endif + if (otherName.StartsWith("safezone")) { safetyAreaCollisionCount--; @@ -202,6 +230,16 @@ protected virtual void OnTriggerExit(Collider other) TargetAnimator.SetBool(IsInWallAnimHash, IsInWall); } + protected void OnTriggerStay(Collider other) + { + if (other.gameObject.layer != 27) return; + + if (HasMagazine) return; + + Networking.LocalPlayer.PlayHapticEventInHand(MainHandle.CurrentHand, .2F, .01F, .1F); + Networking.LocalPlayer.PlayHapticEventInHand(SubHandle.CurrentHand, .2F, .01F, .1F); + } + public override void OnDeserialization() { ProcessShotCountData(); @@ -245,9 +283,6 @@ public virtual void _Update() if (Behaviour != null) Behaviour.OnGunUpdate(this); - if (!IsVR) - Internal_HandleDesktopInputs(); - if (IsInWall) { Networking.LocalPlayer.PlayHapticEventInHand(MainHandle.CurrentHand, .2F, .02F, .1F); @@ -269,14 +304,6 @@ public virtual void _SlowUpdate() UpdatePosition(); } - public override void InputJump(bool value, UdonInputEventArgs args) - { - if (!value || !IsLocal) - return; - - FireMode = GunUtility.CycleFireMode(FireMode, AvailableFireModes); - } - [PublicAPI] public override ShotResult TryToShoot() { @@ -291,8 +318,8 @@ public override ShotResult TryToShoot() case ShotResult.SucceededContinuously: { Shoot(); + EjectBullet(); ++BurstCount; - HasBulletInChamber = false; if (!FireMode.HasFiredEnough(BurstCount)) return ShotResult.SucceededContinuously; @@ -311,6 +338,8 @@ public override ShotResult TryToShoot() default: { Trigger = TriggerState.Fired; + + if (IsLocal && Behaviour != null) Behaviour.OnGunCancelShoot(this); return ShotResult.Cancelled; } } @@ -327,12 +356,15 @@ public override void Shoot() Internal_SetRelatedObjectsOwner(Networking.LocalPlayer); RequestSerialization(); ProcessShotCountData(); + + if (Behaviour != null) Behaviour.OnGunShoot(this); } [PublicAPI] public override void EmptyShoot() { SendCustomNetworkEvent(NetworkEventTarget.All, nameof(Internal_EmptyShoot)); + if (Behaviour != null) Behaviour.OnGunEmptyShoot(this); } [PublicAPI] @@ -367,6 +399,13 @@ public override void UpdatePosition() Internal_UpdatePosition(method); } + public override void OnMagazineChanged() + { + base.OnMagazineChanged(); + if (TargetAnimator != null) + TargetAnimator.SetBool(HasMagazineAnimHash, HasMagazine); + } + [PublicAPI] public void UpdatePositionForSync() { @@ -375,21 +414,6 @@ public void UpdatePositionForSync() SendCustomEventDelayedSeconds(nameof(UpdatePosition), 5F); } - [PublicAPI] - public void SetState(GunState state) - { - SetState(Convert.ToByte(state)); - } - - [PublicAPI] - public void SetState(byte state) - { - if (RawState == state) return; - RawState = state; - Networking.SetOwner(Networking.LocalPlayer, gameObject); - RequestSerialization(); - } - /// /// Gets a LookAt rotation from to . /// @@ -451,7 +475,6 @@ public float GetSubTriggerPull() #region SerializeFields [SerializeField] protected string weaponName; - [SerializeField] protected Transform target; [SerializeField] protected Transform shooter; [SerializeField] protected GunHandle mainHandle; @@ -459,6 +482,9 @@ public float GetSubTriggerPull() [SerializeField] protected GunHandle customHandle; [SerializeField] protected GunBulletHolder bulletHolder; [SerializeField] protected Animator animator; + [SerializeField] protected MagazineReceiver magazineReceiver; + [SerializeField] protected int[] allowedMagazineTypes; + [SerializeField] protected bool canShootWithoutMagazine = true; [SerializeField] protected GunBehaviourBase behaviour; [SerializeField] protected FireMode[] availableFireModes = { FireMode.SemiAuto }; [SerializeField] protected ProjectileDataProvider projectileData; @@ -515,10 +541,10 @@ [SerializeField] [HideInInspector] [NewbieInject] [PublicAPI] public override GunHandle SubHandle => subHandle; [PublicAPI] public override GunHandle CustomHandle => customHandle; [PublicAPI] public override Transform Target => target ? target : transform; - [PublicAPI] [CanBeNull] public override Animator TargetAnimator => animator; + [PublicAPI] public override Animator TargetAnimator => animator; + [PublicAPI] public override MagazineReceiver MagazineReceiver => magazineReceiver; [PublicAPI] - [CanBeNull] public override VRCPlayerApi CurrentHolder => MainHandle.CurrentPlayer ?? SubHandle.CurrentPlayer; [PublicAPI] @@ -530,7 +556,7 @@ public override GunState State return GunState.Unknown; return (GunState)RawState; } - set => SetState(value); + set => Internal_SetState(value); } [PublicAPI] @@ -540,6 +566,8 @@ public override TriggerState Trigger set { _trigger = value; + if (_trigger == TriggerState.Fired) + HasCocked = false; if (TargetAnimator != null) TargetAnimator.SetInteger(TriggerStateAnimHash, (int)_trigger); if (value == TriggerState.Armed || value == TriggerState.Idle) @@ -547,6 +575,27 @@ public override TriggerState Trigger } } + [PublicAPI] + public override int CurrentMagazineType + { + get => _currentMagazineType; + protected set + { + _currentMagazineType = value; + if (MagazineReceiver == null) return; + + MagazineReceiver.SetMagazineType(value); + if (TargetAnimator != null) + TargetAnimator.SetBool(HasMagazineAnimHash, HasMagazine); + } + } + + [PublicAPI] + public override int[] AllowedMagazineTypes => allowedMagazineTypes; + + [PublicAPI] + public override bool CanShootWithoutMagazine => canShootWithoutMagazine; + [PublicAPI] public override bool HasCocked { @@ -605,7 +654,7 @@ protected set [PublicAPI] public virtual bool IsDoubleHandedGun => isDoubleHanded; [PublicAPI] public virtual float MainHandleRePickupDelay => mainHandleRePickupDelay; [PublicAPI] public virtual float MainHandlePitchOffset => mainHandlePitchOffset; - [PublicAPI] [field: UdonSynced] public virtual float CurrentMainHandlePitchOffset { get; protected set; } + [PublicAPI] [field: UdonSynced] public virtual float CurrentMainHandlePitchOffset { get; set; } [PublicAPI] public virtual float SubHandleRePickupDelay => subHandleRePickupDelay; @@ -716,8 +765,12 @@ protected set _currentState = value; if (TargetAnimator != null) TargetAnimator.SetInteger(StateAnimHash, value); - if (lastState != value) + if (lastState != value && !_isInStateChangeCallback) + { + _isInStateChangeCallback = true; OnProcessStateChange(lastState, value); + _isInStateChangeCallback = false; + } } } @@ -765,7 +818,7 @@ public virtual int ShotCount /// Is this Gun inside of a wall? /// [PublicAPI] - public virtual bool IsInWall => CollisionCount != 0; + public virtual bool IsInWall => CollisionCount > 0; /// /// Is this Gun inside of safezone? @@ -850,6 +903,7 @@ out var lifeTimeInSeconds if (IsLocal && HapticData != null && HapticData.Shooting) HapticData.Shooting.PlayBothHand(); + HasBulletInChamber = false; HasCocked = false; } @@ -863,6 +917,7 @@ public virtual void Internal_EmptyShoot() TargetAnimator.SetTrigger(IsShootingEmptyAnimHash); if (AudioData != null) Internal_PlayAudio(AudioData.EmptyShooting, AudioData.EmptyShootingOffset); + HasCocked = false; } protected virtual void Internal_PlayAudio(AudioDataStore audioStore, Vector3 offset) @@ -1172,26 +1227,24 @@ protected void Internal_SetRelatedObjectsOwner(VRCPlayerApi api) Networking.SetOwner(api, customHandle.gameObject); } - protected void Internal_SetFireModeWithoutNotify(FireMode fireMode) + protected void Internal_SetState(GunState state) { - _fireMode = fireMode; - if (TargetAnimator != null) - TargetAnimator.SetInteger(SelectorTypeAnimHash, (int)fireMode); + Internal_SetState(Convert.ToByte(state)); } - protected void Internal_HandleDesktopInputs() + protected void Internal_SetState(byte state) { - if (Input.GetKeyDown(KeyCode.B)) - { - FireMode = GunUtility.CycleFireMode(FireMode, AvailableFireModes); - } + if (RawState == state) return; + RawState = state; + Networking.SetOwner(Networking.LocalPlayer, gameObject); + RequestSerialization(); + } - var scrollDelta = Input.GetAxisRaw("Mouse ScrollWheel") * 80F; - if (!Mathf.Approximately(scrollDelta, 0) && !Input.GetKey(KeyCode.LeftShift)) - { - CurrentMainHandlePitchOffset += scrollDelta; - RequestSerialization(); - } + protected void Internal_SetFireModeWithoutNotify(FireMode fireMode) + { + _fireMode = fireMode; + if (TargetAnimator != null) + TargetAnimator.SetInteger(SelectorTypeAnimHash, (int)fireMode); } #endregion @@ -1224,16 +1277,34 @@ protected virtual void OnGunDrop() protected virtual ShotResult CanShoot() { + if (!CanShootWithoutMagazine && !HasMagazine) + { + Trigger = TriggerState.Fired; + return ShotResult.Cancelled; + } + if (FireMode == FireMode.Safety) { Trigger = TriggerState.Idle; - return ShotResult.Failed; + return ShotResult.Cancelled; } if (State != GunState.Idle) { Trigger = TriggerState.Fired; - return ShotResult.Failed; + return ShotResult.Cancelled; + } + + if (!HasCocked) + { + Trigger = TriggerState.Fired; + return ShotResult.Cancelled; + } + + if (!HasBulletInChamber) + { + Trigger = TriggerState.Fired; + return CanShootWithoutMagazine ? ShotResult.Failed : ShotResult.Cancelled; } if (Networking.GetNetworkDateTime().Subtract(LastShotTime).TotalSeconds < SecondsPerRound) @@ -1321,6 +1392,8 @@ protected virtual void OnProcessStateChange(byte previous, byte next) TargetAnimator.SetFloat(CockingTwistAnimHash, 0); } } + + if (Behaviour != null) Behaviour.OnGunStateChanged(this, previousState); } protected virtual void OnProcessCollisionAudio(Collider other) diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunBase.cs b/Packages/org.centurioncc.system/Runtime/Gun/GunBase.cs index cdea542e..c752a38c 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/GunBase.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunBase.cs @@ -9,7 +9,8 @@ public abstract class GunBase : GunHandleCallbackBase [PublicAPI] public abstract string WeaponName { get; } [PublicAPI] public abstract Transform Target { get; } - [PublicAPI] public virtual Animator TargetAnimator { get; } + [PublicAPI] [CanBeNull] public virtual Animator TargetAnimator { get; } + [PublicAPI] [CanBeNull] public virtual MagazineReceiver MagazineReceiver { get; } [PublicAPI] public abstract GunHandle MainHandle { get; } [PublicAPI] public abstract GunHandle SubHandle { get; } [PublicAPI] public abstract GunHandle CustomHandle { get; } @@ -19,7 +20,7 @@ public abstract class GunBase : GunHandleCallbackBase /// /// Current holder of this Gun. /// - [PublicAPI] + [PublicAPI] [CanBeNull] public abstract VRCPlayerApi CurrentHolder { get; } /// @@ -37,6 +38,45 @@ public abstract class GunBase : GunHandleCallbackBase [PublicAPI] public virtual TriggerState Trigger { get; set; } [PublicAPI] public virtual GunState State { get; set; } + /// + /// Has magazine? + /// + [PublicAPI] + public virtual bool HasMagazine => + MagazineReceiver == null || MagazineReceiver.HasMagazine; + + /// + /// Bullets remaining in the magazine (not in reserve) + /// + [PublicAPI] + public virtual int MagazineRoundsRemaining => + MagazineReceiver != null ? MagazineReceiver.MagazineRoundsRemaining : 1; + + /// + /// Size of the magazine. + /// + [PublicAPI] + public virtual int MagazineRoundsCapacity => + MagazineReceiver != null ? MagazineReceiver.MagazineRoundsCapacity : 1; + + /// + /// Which magazine does the gun have? + /// + [PublicAPI] + public abstract int CurrentMagazineType { get; protected set; } + + /// + /// Which magazine the gun can take? + /// + [PublicAPI] + public abstract int[] AllowedMagazineTypes { get; } + + /// + /// Can the gun shoot without magazine inserted? + /// + [PublicAPI] + public abstract bool CanShootWithoutMagazine { get; } + /// /// Has the gun bullet in chamber? /// @@ -112,7 +152,7 @@ public abstract class GunBase : GunHandleCallbackBase [PublicAPI] public virtual bool HasNextBullet() { - return true; + return MagazineReceiver == null || MagazineReceiver.HasNextBullet(); } /// @@ -124,8 +164,13 @@ public virtual bool LoadBullet() { if (HasBulletInChamber) EjectBullet(); - HasBulletInChamber = true; + + if (!HasNextBullet()) + return HasBulletInChamber; + + HasBulletInChamber = MagazineReceiver == null || MagazineReceiver.ConsumeBullet(); RequestSerialization(); + return HasBulletInChamber; } @@ -138,5 +183,24 @@ public virtual void EjectBullet() HasBulletInChamber = false; RequestSerialization(); } + + /// + /// Invokes when `MagazineReceiver` had its state changed such as inserting, or releasing a magazine. + /// + [PublicAPI] + public virtual void OnMagazineChanged() + { + if (MagazineReceiver == null) return; + CurrentMagazineType = MagazineReceiver.MagazineType; + + if (!IsLocal) return; + + Networking.LocalPlayer.PlayHapticEventInHand(SubHandle.CurrentHand, .2F, .2F, .1F); + RequestSerialization(); + } + + public virtual void OnMagazineCollision() + { + } } } \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunBullet.cs b/Packages/org.centurioncc.system/Runtime/Gun/GunBullet.cs index fc5bd4a1..57044f6e 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/GunBullet.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunBullet.cs @@ -15,13 +15,16 @@ public class GunBullet : ProjectileBase [SerializeField] private GunManager gunManager; + [SerializeField] private TrailRenderer trailRenderer; + [SerializeField] private TrailRenderer debugTrailRenderer; [SerializeField] [HideInInspector] [NewbieInject] private UpdateManager updateManager; + private Collider _collider; private Vector3 _damageOriginPos; @@ -43,6 +46,7 @@ [SerializeField] [HideInInspector] [NewbieInject] public override bool ShouldApplyDamage => gunManager.allowedRicochetCount + 1 >= _ricochetCount; + public override int DamagerPlayerId => _damagerPlayerId; public override Vector3 DamageOriginPosition => _damageOriginPos; public override Quaternion DamageOriginRotation => _damageOriginRot; @@ -60,8 +64,10 @@ private void OnCollisionEnter(Collision collision) { ++_ricochetCount; _rigidbody.velocity /= DampingCoefficient; - if (gunManager.RicochetHandler != null) - gunManager.RicochetHandler.OnRicochet(this, collision); + foreach (var handler in gunManager.RicochetHandler) + { + handler.OnRicochet(this, collision); + } } public override void Shoot(Vector3 pos, Quaternion rot, Vector3 velocity, Vector3 torque, float drag, diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunController.asset b/Packages/org.centurioncc.system/Runtime/Gun/GunController.asset new file mode 100644 index 00000000..fdc168b8 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunController.asset @@ -0,0 +1,119 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: GunController + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 662e2f5df34a30744b51d5a242cda7a4, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: eaa5ac29efc266746aa7cf043322c464, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 1 + hasInteractEvent: 0 + scriptID: -4899818088336030699 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: gunManager + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: gunManager + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.GunManager, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunController.asset.meta b/Packages/org.centurioncc.system/Runtime/Gun/GunController.asset.meta new file mode 100644 index 00000000..992b603f --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunController.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6bb3a3b68ebf40844983f2de1fe8c598 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunController.cs b/Packages/org.centurioncc.system/Runtime/Gun/GunController.cs new file mode 100644 index 00000000..6f3658b2 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunController.cs @@ -0,0 +1,91 @@ +using System; +using DerpyNewbie.Common; +using JetBrains.Annotations; +using UdonSharp; +using UnityEngine; +using VRC.Udon.Common; + +namespace CenturionCC.System.Gun +{ + [UdonBehaviourSyncMode(BehaviourSyncMode.None)] + public class GunController : UdonSharpBehaviour + { + [SerializeField] [NewbieInject] + private GunManager gunManager; + + private void Update() + { + if (Input.GetKeyDown(KeyCode.B)) + { + FireModeChangeAction(); + } + + if (Input.GetKeyDown(KeyCode.E)) + { + LoadingActionDown(); + } + + var scrollDelta = Input.GetAxisRaw("Mouse ScrollWheel") * 80F; + if (!Mathf.Approximately(scrollDelta, 0) && !Input.GetKey(KeyCode.LeftShift)) + { + AddPitchOffset(scrollDelta); + } + } + + public override void InputJump(bool value, UdonInputEventArgs args) + { + if (!value) LoadingActionUp(); + else LoadingActionDown(); + } + + [PublicAPI] + public void FireModeChangeAction() + { + var localGuns = gunManager.LocalHeldGuns; + foreach (var gun in localGuns) + { + if (gun == null) continue; + gun.FireMode = GunUtility.CycleFireMode(gun.FireMode, gun.AvailableFireModes); + } + } + + [PublicAPI] + public void LoadingActionDown() + { + var localGuns = gunManager.LocalHeldGuns; + foreach (var gun in localGuns) + { + if (gun == null || gun.MagazineReceiver == null) continue; + + if (gun.State != GunState.Idle && gun.MagazineRoundsRemaining != 0 || !gun.HasMagazine) + gun.State = GunState.Idle; + else gun.MagazineReceiver.OnMagazineReleaseButtonDown(); + } + } + + [PublicAPI] + public void LoadingActionUp() + { + var localGuns = gunManager.LocalHeldGuns; + foreach (var gun in localGuns) + { + if (gun == null || gun.MagazineReceiver == null) continue; + + if (gun.State != GunState.InHoldOpen && gun.MagazineRoundsRemaining != 0 || !gun.HasMagazine) continue; + gun.MagazineReceiver.OnMagazineReleaseButtonUp(); + } + } + + [PublicAPI] + public void AddPitchOffset(float delta) + { + var localGuns = gunManager.LocalHeldGuns; + foreach (var gun in localGuns) + { + if (gun == null) return; + gun.CurrentMainHandlePitchOffset += delta; + gun.RequestSerialization(); + } + } + } +} \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunController.cs.meta b/Packages/org.centurioncc.system/Runtime/Gun/GunController.cs.meta new file mode 100644 index 00000000..0007c277 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eaa5ac29efc266746aa7cf043322c464 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunEnums.cs b/Packages/org.centurioncc.system/Runtime/Gun/GunEnums.cs index a5ae8510..8afbc934 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/GunEnums.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunEnums.cs @@ -49,7 +49,8 @@ public enum GunState /// /// When it's twisting state. For most of guns in this state should not be able to shoot. /// - InCockingTwisting = 3 + InCockingTwisting = 3, + InHoldOpen = 4 } public enum TriggerState @@ -101,7 +102,7 @@ public enum ShotResult Cancelled, /// - /// When shot was failed due to mechanical issue such as fire mode being in safety. will make a trigger sound. + /// Empty! When shot was failed due to mechanical issue such as fire mode being in safety. will make a trigger sound. /// Failed, } @@ -130,7 +131,7 @@ public enum GunManagerResetType public static class GunStateHelper { - public const byte MaxValue = (byte)GunState.InCockingTwisting; + public const byte MaxValue = (byte)GunState.InHoldOpen; public const byte MinValue = (byte)GunState.Idle; public static string GetStateString(byte value) @@ -141,6 +142,7 @@ public static string GetStateString(byte value) value == (int)GunState.InCockingPull ? "InCockingPull" : value == (int)GunState.InCockingPush ? "InCockingPush" : value == (int)GunState.InCockingTwisting ? "InCockingTwisting" : + value == (int)GunState.InHoldOpen ? "InHoldOpen" : $"Unknown ({value})"; } diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunManager.asset b/Packages/org.centurioncc.system/Runtime/Gun/GunManager.asset index c8be7db3..9e5edb5a 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/GunManager.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunManager.asset @@ -428,13 +428,19 @@ MonoBehaviour: Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.RicochetHandler, CenturionCC.System + Data: CenturionCC.System.Gun.RicochetHandler[], CenturionCC.System - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 11 + Entry: 7 + Data: 29|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 @@ -449,19 +455,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 31|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 32|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -485,13 +491,13 @@ MonoBehaviour: Data: allowedRicochetCount - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: allowedRicochetCount - Name: k__BackingField Entry: 7 - Data: 33|System.RuntimeType, mscorlib + Data: 34|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -500,7 +506,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -515,7 +521,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -539,16 +545,16 @@ MonoBehaviour: Data: maxQueuedShotCount - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: maxQueuedShotCount - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -563,13 +569,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 37|System.ObsoleteAttribute, mscorlib + Data: 38|System.ObsoleteAttribute, mscorlib - Name: Entry: 8 Data: @@ -593,13 +599,13 @@ MonoBehaviour: Data: optimizationRange - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: optimizationRange - Name: k__BackingField Entry: 7 - Data: 39|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -608,7 +614,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 39 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -623,13 +629,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 41|System.ObsoleteAttribute, mscorlib + Data: 42|System.ObsoleteAttribute, mscorlib - Name: Entry: 8 Data: @@ -653,16 +659,16 @@ MonoBehaviour: Data: handleRePickupDelay - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: handleRePickupDelay - Name: k__BackingField Entry: 9 - Data: 39 + Data: 40 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -677,7 +683,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -701,16 +707,16 @@ MonoBehaviour: Data: maxHoldDistance - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: maxHoldDistance - Name: k__BackingField Entry: 9 - Data: 39 + Data: 40 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -725,7 +731,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -749,13 +755,13 @@ MonoBehaviour: Data: useDebugBulletTrail - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useDebugBulletTrail - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -764,7 +770,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -779,7 +785,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -803,16 +809,16 @@ MonoBehaviour: Data: useBulletTrail - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useBulletTrail - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -827,7 +833,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -851,16 +857,16 @@ MonoBehaviour: Data: useCollisionCheck - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: useCollisionCheck - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -875,7 +881,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -899,13 +905,13 @@ MonoBehaviour: Data: _childWdCallbacks - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _childWdCallbacks - Name: k__BackingField Entry: 7 - Data: 54|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.Watchdog.WatchdogChildCallbackBase[], CenturionCC.System @@ -913,14 +919,8 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 55|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -965,10 +965,10 @@ MonoBehaviour: Data: _eventCallbackCount - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1022,7 +1022,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 55 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1067,10 +1067,10 @@ MonoBehaviour: Data: _isDebugGunHandleVisible - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1115,10 +1115,10 @@ MonoBehaviour: Data: _lastResetIndex - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1172,7 +1172,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 55 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1220,7 +1220,7 @@ MonoBehaviour: Data: 67 - Name: k__BackingField Entry: 9 - Data: 55 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1274,7 +1274,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 55 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1319,10 +1319,10 @@ MonoBehaviour: Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1430,7 +1430,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 55 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunManager.cs b/Packages/org.centurioncc.system/Runtime/Gun/GunManager.cs index e0ad8386..35893797 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/GunManager.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunManager.cs @@ -41,7 +41,7 @@ [SerializeField] [HideInInspector] [NewbieInject] [SerializeField] [HideInInspector] [NewbieInject] // ReSharper disable once InconsistentNaming - public RicochetHandler RicochetHandler; + public RicochetHandler[] RicochetHandler; public int allowedRicochetCount = 0; diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunManagerNotificationSender.cs b/Packages/org.centurioncc.system/Runtime/Gun/GunManagerNotificationSender.cs index 7015733d..d6441ac3 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/GunManagerNotificationSender.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunManagerNotificationSender.cs @@ -10,28 +10,28 @@ public class GunManagerNotificationSender : GunManagerCallbackBase { [SerializeField] [HideInInspector] [NewbieInject] private GunManager gunManager; + [SerializeField] [HideInInspector] [NewbieInject] private NotificationProvider notification; - [Header("Messages")] - [SerializeField] - private TranslatableMessage onGunsResetMessage; - [SerializeField] - private TranslatableMessage onCantShootInSafeZone; - [SerializeField] - private TranslatableMessage onCantShootInWall; - [SerializeField] - private TranslatableMessage onCantShootWhenSelectorSafety; - [SerializeField] - private TranslatableMessage onCantShootBecauseCallback; - [SerializeField] - private TranslatableMessage onCantShootUnknown; - [SerializeField] - private TranslatableMessage onFireModeChangeFormatMessage; - [SerializeField] - private TranslatableMessage[] fireModeNames; - - [Header("Defaults")] - public bool notifyGunsReset = true; + + [Header("Messages")] [SerializeField] private TranslatableMessage onGunsResetMessage; + + [SerializeField] private TranslatableMessage onCantShootInSafeZone; + + [SerializeField] private TranslatableMessage onCantShootInWall; + + [SerializeField] private TranslatableMessage onCantShootWhenSelectorSafety; + + [SerializeField] private TranslatableMessage onCantShootBecauseCallback; + + [SerializeField] private TranslatableMessage onCantShootUnknown; + + [SerializeField] private TranslatableMessage onFireModeChangeFormatMessage; + + [SerializeField] private TranslatableMessage[] fireModeNames; + + [Header("Defaults")] public bool notifyGunsReset = true; + public bool notifyCancelled = true; public bool notifyFireModeChange = true; @@ -76,6 +76,9 @@ private void SendCancelledOrFailedNotification(int reasonId) // 10 = ShootNext flag is false // 11 = RemoteInstance is null // 12 = RemoteInstance.FireMode is 0 == safety + // 13 = !HasBulletInChamber + // 14 = !CanShootWithoutMagazine && !MagazineReceiver.HasMagazine + // 15 = State == InHoldOpen // 100 = in wall // 101 = in safe zone // 200 = callback returned false diff --git a/Packages/org.centurioncc.system/Runtime/Gun/GunUtility.cs b/Packages/org.centurioncc.system/Runtime/Gun/GunUtility.cs index 041f3435..066a21ec 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/GunUtility.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/GunUtility.cs @@ -18,11 +18,13 @@ public static class GunUtility public const string IsVRParamName = "IsVR"; public const string HasBulletParamName = "HasBullet"; public const string HasCockedParamName = "HasCocked"; + public const string HasMagazineParamName = "HasMagazine"; public const string IsShootingParamName = "IsShooting"; public const string IsShootingEmptyParamName = "IsShootingEmpty"; public const string SelectorTypeParamName = "SelectorType"; public const string StateParamName = "State"; public const string TriggerStateParamName = "Trigger"; + public const string CurrentBulletsCountParamName = "CurrentBulletsCount"; public static FireMode CycleFireMode(FireMode fireMode, FireMode[] allowedFireModes) { diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Magazine.asset b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.asset new file mode 100644 index 00000000..e38d6778 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.asset @@ -0,0 +1,1175 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: Magazine + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: abb01b9f704f3574c8bc259954ee3ab4, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 21753d99d00701543910a969d8c39b59, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 1 + hasInteractEvent: 0 + scriptID: -995328448628138795 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 21 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: type + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: type + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|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: roundsCapacity + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: roundsCapacity + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 8|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: roundsRemaining + - Name: $v + Entry: 7 + Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: roundsRemaining + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: model + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: model + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 13 + - 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 15|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: leftHandOffset + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: leftHandOffset + - Name: k__BackingField + Entry: 7 + Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 19|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: rightHandOffset + - Name: $v + Entry: 7 + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: rightHandOffset + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 22|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: secondaryMagazineCollider + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: secondaryMagazineCollider + - Name: k__BackingField + Entry: 7 + Data: 24|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.BoxCollider, UnityEngine.PhysicsModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 24 + - 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: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 26|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: rb + - Name: $v + Entry: 7 + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: rb + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Rigidbody, UnityEngine.PhysicsModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 28 + - 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: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 30|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: pickup + - Name: $v + Entry: 7 + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pickup + - Name: k__BackingField + Entry: 7 + Data: 32|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Components.VRCPickup, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 32 + - 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: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 34|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: _hasSetOriginal + - Name: $v + Entry: 7 + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _hasSetOriginal + - Name: k__BackingField + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _isPullingTrigger + - Name: $v + Entry: 7 + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _isPullingTrigger + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _originalGravity + - Name: $v + Entry: 7 + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _originalGravity + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _originalKinematic + - Name: $v + Entry: 7 + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _originalKinematic + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _originalParent + - Name: $v + Entry: 7 + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _originalParent + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: PickupTarget + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PickupTarget + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: k__BackingField + - Name: $v + Entry: 7 + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: k__BackingField + - Name: $v + Entry: 7 + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: k__BackingField + - Name: $v + Entry: 7 + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: k__BackingField + - Name: $v + Entry: 7 + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 7 + Data: 55|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.MagazineReceiver, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 56|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: k__BackingField + - Name: $v + Entry: 7 + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 7 + Data: 59|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.Magazine, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 56 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: k__BackingField + - Name: $v + Entry: 7 + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 9 + Data: 59 + - Name: k__BackingField + Entry: 9 + Data: 56 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Magazine.asset.meta b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.asset.meta new file mode 100644 index 00000000..84dfef9e --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f406f6701babaab4ab1bd134d67af4cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Magazine.cs b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.cs new file mode 100644 index 00000000..5c594708 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.cs @@ -0,0 +1,332 @@ +using CenturionCC.System.Gun.DataStore; +using DerpyNewbie.Common; +using JetBrains.Annotations; +using UdonSharp; +using UnityEngine; +using VRC.SDK3.Components; +using VRC.SDKBase; + +namespace CenturionCC.System.Gun +{ + [RequireComponent(typeof(Rigidbody), typeof(VRCPickup))] + [UdonBehaviourSyncMode(BehaviourSyncMode.None)] + public class Magazine : UdonSharpBehaviour + { + [SerializeField] protected int type; + [SerializeField] protected int roundsCapacity; + [SerializeField] protected int roundsRemaining; + [SerializeField] protected GameObject model; + [SerializeField] protected Transform leftHandOffset; + [SerializeField] protected Transform rightHandOffset; + [SerializeField] protected BoxCollider secondaryMagazineCollider; + + [SerializeField] [NewbieInject(SearchScope.Self)] + protected Rigidbody rb; + + [SerializeField] [NewbieInject(SearchScope.Self)] + protected VRCPickup pickup; + + private bool _hasSetOriginal; + + private bool _isPullingTrigger; + private bool _originalGravity; + private bool _originalKinematic; + + private Transform _originalParent; + + protected Transform PickupTarget; + + + [PublicAPI] public bool IsHeld => pickup.IsHeld; + [PublicAPI] public VRCPlayerApi CurrentPlayer => pickup.currentPlayer; + [PublicAPI] public VRC_Pickup.PickupHand CurrentHand => pickup.currentHand; + + [PublicAPI] public bool Pickupable + { + get => pickup.pickupable; + set => pickup.pickupable = value; + } + + [PublicAPI] public Rigidbody Rigidbody => rb; + + + [PublicAPI] public int Type => type; + [PublicAPI] public int RoundsCapacity => roundsCapacity; + [PublicAPI] public int RoundsRemaining => roundsRemaining; + [PublicAPI] public bool IsAttached { get; protected set; } + [PublicAPI] public bool IsAttachedToReceiver { get; protected set; } + [PublicAPI] public bool IsAttachedToMagazine { get; protected set; } + + [PublicAPI] public MagazineReceiver ParentReceiver { get; protected set; } + [PublicAPI] public Magazine ParentMagazine { get; set; } + [PublicAPI] public Magazine ChildMagazine { get; set; } + + private void Start() + { + Debug.Log($"[Magazine-{name}] Start"); + PickupTarget = pickup.ExactGun; + + if (!_hasSetOriginal) + { + Debug.Log($"[Magazine-{name}] Init original: g: {rb.useGravity}, k: {rb.isKinematic}"); + _hasSetOriginal = true; + _originalParent = transform.parent; + _originalGravity = rb.useGravity; + _originalKinematic = rb.isKinematic; + } + else + { + Debug.Log($"[Magazine-{name}] Original has already been set. Preserving!"); + } + } + + private void OnTriggerEnter(Collider other) + { + var receiver = other.GetComponent(); + if (receiver != null && !IsAttachedToReceiver) + { + receiver.InsertMagazine(this); + return; + } + + var magazine = other.GetComponent(); + if (magazine != null && _isPullingTrigger && !IsAttached && + !magazine.IsAttached && magazine.ParentMagazine != this) + { + magazine.AttachToMagazine(this); + return; + } + } + + public override void OnPickup() + { + var rightPickup = pickup.currentHand == VRC_Pickup.PickupHand.Right; + var offset = rightPickup ? rightHandOffset : leftHandOffset; + PickupTarget.localPosition = offset.localPosition; + PickupTarget.localRotation = offset.localRotation; + + if (IsAttachedToReceiver && ParentReceiver != null) + { + Debug.Log($"[Magazine-{name}] Requesting to release magazine as magazine has been picked up"); + ParentReceiver.ReleaseMagazine(); + } + + if (IsAttached) + { + Debug.Log($"[Magazine-{name}] Detaching because its being picked up"); + Detach(); + } + } + + public override void OnPickupUseDown() + { + _isPullingTrigger = true; + } + + public override void OnPickupUseUp() + { + _isPullingTrigger = false; + } + + public override void OnDrop() + { + Debug.Log( + $"[Magazine-{name}] OnDrop: magReceiver: {ParentReceiver != null} parentMagazine: {ParentMagazine != null}, childMagazine: {ChildMagazine != null}"); + + _isPullingTrigger = false; + if (ChildMagazine != null) + { + ChildMagazine.Detach(); + } + + // HACK: Workaround for VRCPickup reverting changes while it's picked up + if (!IsAttached) + { + Debug.Log($"[Magazine-{name}] Setting to original state as it was no longer attached"); + transform.SetParent(_originalParent); + rb.useGravity = _originalGravity; + rb.isKinematic = _originalKinematic; + } + } + + [PublicAPI] + public bool HasNextBullet() + { + return roundsRemaining > 0; + } + + [PublicAPI] + public bool ConsumeBullet() + { + if (!HasNextBullet()) return false; + roundsRemaining--; + return true; + } + + [PublicAPI] + public Magazine AttachToReceiver(MagazineReceiver target) + { + Debug.Log($"[Magazine-{name}] AttachToReceiver"); + + if (ChildMagazine != null) + { + Debug.Log($"[Magazine-{name}] Attaching child magazine"); + var childMagazine = ChildMagazine; + ChildMagazine = null; + Swap(childMagazine); + return childMagazine.AttachToReceiver(target); + } + + Attach(target.transform); + + pickup.pickupable = false; + + ParentReceiver = target; + IsAttachedToReceiver = true; + return this; + } + + [PublicAPI] + public void AttachToMagazine(Magazine target) + { + Debug.Log($"[Magazine-{name}] AttachToMagazine"); + + Attach(target.transform); + + transform.localPosition = + new Vector3( + (leftHandOffset.localPosition.x + target.leftHandOffset.localPosition.x) * + Mathf.Sign(target.PickupTarget.localPosition.x), 0, 0); + transform.localRotation = Quaternion.identity; + + ParentMagazine = target; + ParentMagazine.ChildMagazine = this; + IsAttachedToMagazine = true; + } + + [PublicAPI] + public void Attach(Transform target, bool preserveOriginal = true) + { + if (IsAttached) Detach(); + Debug.Log($"[Magazine-{name}] Attach: {target.name}, g: {rb.useGravity}, k: {rb.isKinematic}"); + + IsAttached = true; + + if (!preserveOriginal || !_hasSetOriginal) + { + Debug.Log($"[Magazine-{name}] Updating original"); + _hasSetOriginal = true; + _originalParent = transform.parent; + _originalGravity = rb.useGravity; + _originalKinematic = rb.isKinematic; + } + else + { + Debug.Log($"[Magazine-{name}] Preserving original"); + } + + rb.useGravity = false; + rb.isKinematic = true; + + pickup.Drop(); + + transform.SetParent(target, true); + transform.localPosition = Vector3.zero; + transform.localRotation = Quaternion.identity; + } + + [PublicAPI] + public void Detach() + { + Debug.Log( + $"[Magazine-{name}] Detach: {transform.name}->{(_originalParent != null ? _originalParent.name : "null")}, g: {_originalGravity}, k: {_originalKinematic}"); + + transform.SetParent(_originalParent); + + rb.useGravity = _originalGravity; + rb.isKinematic = _originalKinematic; + + pickup.pickupable = true; + + IsAttachedToReceiver = false; + ParentReceiver = null; + + IsAttachedToMagazine = false; + if (ParentMagazine != null) ParentMagazine.ChildMagazine = null; + ParentMagazine = null; + + IsAttached = false; + } + + public void SetVariantData(MagazineVariantDataStore dataStore, bool loadMagazine = true) + { + if (dataStore == null) return; + + type = dataStore.Type; + roundsCapacity = dataStore.RoundsCapacity; + roundsRemaining = loadMagazine ? roundsCapacity : 0; + leftHandOffset = dataStore.LeftHandOffset; + rightHandOffset = dataStore.RightHandOffset; + + secondaryMagazineCollider.center = dataStore.SecondaryMagazineDetectionCollider.center; + secondaryMagazineCollider.size = dataStore.SecondaryMagazineDetectionCollider.size; + + model = Instantiate(dataStore.Model, transform); + model.transform.localPosition = dataStore.ModelOffsetPosition; + model.transform.localRotation = dataStore.ModelOffsetRotation; + } + + public void Swap(Magazine other) + { + if (IsAttached) Detach(); + if (other.IsAttached) Detach(); + + var prevParent = transform.parent; + var prevPosition = transform.position; + var prevRotation = transform.rotation; + var prevModel = model; + var prevType = type; + var prevChildMagazine = ChildMagazine; + var prevRoundsCapacity = roundsCapacity; + var prevRoundsRemaining = roundsRemaining; + var prevLeftHandOffset = leftHandOffset; + var prevRightHandOffset = rightHandOffset; + var prevSecondaryMagazineColliderCenter = secondaryMagazineCollider.center; + var prevSecondaryMagazineColliderSize = secondaryMagazineCollider.size; + var prevRbGravity = _originalGravity; + var prevRbKinematic = _originalKinematic; + + transform.SetParent(other.transform.parent); + transform.SetPositionAndRotation(other.transform.position, other.transform.rotation); + model = other.model; + model.transform.SetParent(transform, false); + type = other.type; + ChildMagazine = other.ChildMagazine; + if (ChildMagazine != null) ChildMagazine.ParentMagazine = this; + roundsCapacity = other.roundsCapacity; + roundsRemaining = other.roundsRemaining; + leftHandOffset = other.leftHandOffset; + rightHandOffset = other.rightHandOffset; + secondaryMagazineCollider.center = other.secondaryMagazineCollider.center; + secondaryMagazineCollider.size = other.secondaryMagazineCollider.size; + rb.useGravity = other._originalGravity; + rb.isKinematic = other._originalKinematic; + + other.transform.SetParent(prevParent); + other.transform.SetPositionAndRotation(prevPosition, prevRotation); + other.model = prevModel; + other.model.transform.SetParent(other.transform, false); + other.type = prevType; + other.ChildMagazine = prevChildMagazine; + if (other.ChildMagazine != null) other.ChildMagazine.ParentMagazine = other; + other.roundsCapacity = prevRoundsCapacity; + other.roundsRemaining = prevRoundsRemaining; + other.leftHandOffset = prevLeftHandOffset; + other.rightHandOffset = prevRightHandOffset; + other.secondaryMagazineCollider.center = prevSecondaryMagazineColliderCenter; + other.secondaryMagazineCollider.size = prevSecondaryMagazineColliderSize; + other.rb.useGravity = prevRbGravity; + other.rb.isKinematic = prevRbKinematic; + } + } +} \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/Magazine.cs.meta b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.cs.meta new file mode 100644 index 00000000..77d91f94 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/Magazine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 21753d99d00701543910a969d8c39b59 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset new file mode 100644 index 00000000..53e7bf6e --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset @@ -0,0 +1,299 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: MagazineManager + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 53e3ad1531aa3c743884a509c004206c, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: f9fcce41bb1fdb54f87f4914050c73eb, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 1001634860602240112 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: logger + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: logger + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: DerpyNewbie.Logger.NewbieLogger, DerpyNewbie.Logger + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: magazineVariants + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + 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 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 13 + - 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 15|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: _spawnedMagazines + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _spawnedMagazines + - Name: k__BackingField + Entry: 7 + Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataList, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset.meta new file mode 100644 index 00000000..97e5477b --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1ad1e36d0923f64fbc502c6dc79e641 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs new file mode 100644 index 00000000..483aaab3 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs @@ -0,0 +1,78 @@ +using System; +using CenturionCC.System.Gun.DataStore; +using DerpyNewbie.Common; +using DerpyNewbie.Logger; +using JetBrains.Annotations; +using UdonSharp; +using UnityEngine; +using VRC.SDK3.Data; + +namespace CenturionCC.System.Gun +{ + [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] + public class MagazineManager : UdonSharpBehaviour + { + [SerializeField] [NewbieInject] + private NewbieLogger logger; + + [SerializeField] [NewbieInject] + private MagazineVariantDataStore[] magazineVariants; + + [SerializeField] + private GameObject sourceMagazine; + + private readonly DataList _spawnedMagazines = new DataList(); + + private void Start() + { + sourceMagazine.SetActive(false); + } + + [PublicAPI] + public Magazine SpawnMagazine(int type, Vector3 position, Quaternion rotation) + { + return SpawnMagazine(GetMagazineVariant(type), position, rotation); + } + + [PublicAPI] + public Magazine SpawnMagazine(MagazineVariantDataStore dataStore, Vector3 position, Quaternion rotation) + { + var instantiatedMagazine = Instantiate(sourceMagazine); + instantiatedMagazine.SetActive(true); + instantiatedMagazine.name = $"{instantiatedMagazine.name}-{dataStore.Type}-{_spawnedMagazines.Count}"; + + var magazine = instantiatedMagazine.GetComponent(); + magazine.SetVariantData(dataStore); + _spawnedMagazines.Add(instantiatedMagazine); + magazine.transform.SetPositionAndRotation(position, rotation); + return magazine; + } + + [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++) + { + var token = _spawnedMagazines[i]; + if (token.TokenType != TokenType.Reference) continue; + Destroy((GameObject)token.Reference); + } + + _spawnedMagazines.Clear(); + } + + [PublicAPI] [CanBeNull] + public MagazineVariantDataStore GetMagazineVariant(int type) + { + // LINQ cannot be used in UdonSharp + // ReSharper disable once LoopCanBeConvertedToQuery + foreach (var dataStore in magazineVariants) + if (dataStore.Type == type) + return dataStore; + return null; + } + } +} \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs.meta new file mode 100644 index 00000000..018efdfe --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f9fcce41bb1fdb54f87f4914050c73eb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.asset b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.asset new file mode 100644 index 00000000..4b7fe127 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.asset @@ -0,0 +1,509 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: MagazinePouch + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 1c4e037c814d27e4b952291d25b9d562, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: abd5a57e587f69e4cb04a13c1effa142, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 1 + hasInteractEvent: 0 + scriptID: -8622347846194242137 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 8 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: gunManager + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: gunManager + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.GunManager, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: magazineManager + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: magazineManager + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.MagazineManager, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|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: offsetFromHips + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: offsetFromHips + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Vector3, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - 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: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|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: _activeGun + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _activeGun + - Name: k__BackingField + Entry: 7 + Data: 16|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.GunBase, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _activeMagazine + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _activeMagazine + - Name: k__BackingField + Entry: 7 + Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.Magazine, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _hasGun + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _hasGun + - Name: k__BackingField + Entry: 7 + Data: 22|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 22 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _localPlayer + - Name: $v + Entry: 7 + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _localPlayer + - Name: k__BackingField + Entry: 7 + Data: 25|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 25 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _requiredMagazineType + - Name: $v + Entry: 7 + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _requiredMagazineType + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 28 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.asset.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.asset.meta new file mode 100644 index 00000000..6c0cc8f6 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 774e2b6733c7f2440ad939b69385d9e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.cs b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.cs new file mode 100644 index 00000000..a6c81532 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.cs @@ -0,0 +1,109 @@ +using DerpyNewbie.Common; +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; + +namespace CenturionCC.System.Gun +{ + [UdonBehaviourSyncMode(BehaviourSyncMode.None)] + public class MagazinePouch : GunManagerCallbackBase + { + [SerializeField] [NewbieInject] + private GunManager gunManager; + + [SerializeField] [NewbieInject] + private MagazineManager magazineManager; + + [SerializeField] private Vector3 offsetFromHips; + private GunBase _activeGun; + private Magazine _activeMagazine; + + private bool _hasGun; + private VRCPlayerApi _localPlayer; + private int _requiredMagazineType; + + private void Start() + { + _localPlayer = Networking.LocalPlayer; + gunManager.SubscribeCallback(this); + } + + private void Update() + { + if (!_hasGun || _activeMagazine == null) return; + + // var rot = _localPlayer.GetBoneRotation(HumanBodyBones.Hips); + // + // transform.SetPositionAndRotation( + // _localPlayer.GetBonePosition(HumanBodyBones.Hips) + rot * offsetFromHips, + // rot + // ); + + if (!_activeMagazine.IsHeld) return; + + _activeMagazine = null; + CreateFollowingMagazine(); + } + + public override void OnPickedUpLocally(ManagedGun instance) + { + Debug.Log("[MagazinePouch] Now holding a gun"); + _hasGun = true; + _activeGun = instance; + CreateFollowingMagazine(); + } + + public override void OnDropLocally(ManagedGun instance) + { + if (gunManager.LocalHeldGuns.Length != 0) + { + _activeGun = gunManager.LocalHeldGuns[0]; + DestroyFollowingMagazine(); + CreateFollowingMagazine(); + return; + } + + Debug.Log("[MagazinePouch] No longer holding a gun"); + _hasGun = false; + DestroyFollowingMagazine(); + } + + private void CreateFollowingMagazine() + { + if (_activeMagazine != null) + { + Debug.LogWarning("[MagazinePouch] There is active magazine. ignoring create!"); + return; + } + + if (_activeGun == null) + { + Debug.LogWarning("[MagazinePouch] There is no active gun. ignoring create!"); + return; + } + + if (_activeGun.AllowedMagazineTypes.Length == 0) + { + Debug.LogWarning("[MagazinePouch] There is no magazine allowed for active gun. ignoring create!"); + return; + } + + var targetMagazineType = + _activeGun.AllowedMagazineTypes[Random.Range(0, _activeGun.AllowedMagazineTypes.Length)]; + var magazine = magazineManager.SpawnMagazine(targetMagazineType, transform.position, transform.rotation); + magazine.Attach(transform); + magazine.transform.localPosition = offsetFromHips; + _activeMagazine = magazine; + } + + private void DestroyFollowingMagazine() + { + if (_activeMagazine == null) + { + return; + } + + Destroy(_activeMagazine.gameObject); + } + } +} \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.cs.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.cs.meta new file mode 100644 index 00000000..1a788073 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazinePouch.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: abd5a57e587f69e4cb04a13c1effa142 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.asset b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.asset new file mode 100644 index 00000000..067b01a9 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.asset @@ -0,0 +1,521 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: MagazineReceiver + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 67ba813b3d651794894dfe1dd202d32a, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 57fa474cd1c86004a8f8e958a03fe0fe, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 1 + hasInteractEvent: 0 + scriptID: 3590966659572616252 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 8 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: magazineManager + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: magazineManager + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.MagazineManager, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: releaseMagazineOnReleaseButton + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: releaseMagazineOnReleaseButton + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|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: makeMagazinePickupableOnReleaseButton + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: makeMagazinePickupableOnReleaseButton + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 13|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: downReference + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: downReference + - Name: k__BackingField + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 15 + - 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: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|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: releaseImpulseMultiplier + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: releaseImpulseMultiplier + - Name: k__BackingField + Entry: 7 + Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 19 + - 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: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 21|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: LastDetachedTime + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: LastDetachedTime + - Name: k__BackingField + Entry: 9 + Data: 19 + - Name: k__BackingField + Entry: 9 + Data: 19 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: Magazine + - Name: $v + Entry: 7 + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Magazine + - Name: k__BackingField + Entry: 7 + Data: 25|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.Magazine, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 27|JetBrains.Annotations.CanBeNullAttribute, 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: ParentGun + - Name: $v + Entry: 7 + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ParentGun + - Name: k__BackingField + Entry: 7 + Data: 29|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.GunBase, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 31|JetBrains.Annotations.CanBeNullAttribute, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.asset.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.asset.meta new file mode 100644 index 00000000..dadcdbf6 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 43d0f27eecdd0304e833f284c41a675b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.cs b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.cs new file mode 100644 index 00000000..792be2c0 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.cs @@ -0,0 +1,177 @@ +using DerpyNewbie.Common; +using JetBrains.Annotations; +using UdonSharp; +using UnityEngine; + +namespace CenturionCC.System.Gun +{ + [UdonBehaviourSyncMode(BehaviourSyncMode.None)] + public class MagazineReceiver : UdonSharpBehaviour + { + protected const float ReattachTimeoutInSeconds = 0.2F; + + [SerializeField] [NewbieInject] + protected MagazineManager magazineManager; + + [SerializeField] protected bool releaseMagazineOnReleaseButton = true; + [SerializeField] protected bool makeMagazinePickupableOnReleaseButton = true; + [SerializeField] protected Transform downReference; + [SerializeField] protected float releaseImpulseMultiplier = 0.5F; + + protected float LastDetachedTime = 0; + + [CanBeNull] protected Magazine Magazine; + + [CanBeNull] protected GunBase ParentGun; + + [PublicAPI] public virtual bool HasMagazine => Magazine != null; + + [PublicAPI] public virtual int MagazineType => Magazine != null ? Magazine.Type : 0; + [PublicAPI] public virtual int MagazineRoundsCapacity => Magazine != null ? Magazine.RoundsCapacity : 0; + [PublicAPI] public virtual int MagazineRoundsRemaining => Magazine != null ? Magazine.RoundsRemaining : 0; + + protected virtual void Start() + { + if (downReference == null) + downReference = transform; + } + + protected virtual void OnTriggerEnter(Collider other) + { + // Possible as Udon protects player objects + if (other == null) return; + + Debug.Log($"[{name}-MagReceiver] OnTriggerEnter: {other.name}"); + var mag = other.GetComponentInParent(); + if (mag == null) + { + Debug.Log($"[{name}-MagReceiver] Magazine not found"); + return; + } + + InsertMagazine(mag); + } + + public virtual bool HasNextBullet() + { + return Magazine != null && Magazine.HasNextBullet(); + } + + public virtual bool ConsumeBullet() + { + return Magazine != null && Magazine.ConsumeBullet(); + } + + public virtual void InsertMagazine(Magazine magazine) + { + if (!CanAttach(magazine)) return; + + Magazine = magazine.AttachToReceiver(this); + + if (ParentGun != null) ParentGun.OnMagazineChanged(); + } + + public virtual void ReleaseMagazine() + { + if (Magazine == null) return; + + Debug.Log($"[MagazineReceiver-{name}] Releasing Magazine"); + + Magazine.Detach(); + Magazine.Rigidbody.AddForce(downReference.up * (-1 * releaseImpulseMultiplier), ForceMode.Impulse); + Magazine = null; + LastDetachedTime = Time.timeSinceLevelLoad; + + if (ParentGun != null) ParentGun.OnMagazineChanged(); + } + + public virtual void SetMagazineType(int magazineType) + { + if (magazineType == 0) + { + if (Magazine != null) Destroy(Magazine.gameObject); + Magazine = null; + return; + } + + if (Magazine != null && Magazine.Type == magazineType) return; + + if (Magazine != null) Destroy(Magazine.gameObject); + + Magazine = magazineManager.SpawnMagazine(magazineType, transform.position, transform.rotation); + if (Magazine == null) + { + Debug.LogError($"[MagazineReceiver] Could not spawn magazine with type id {magazineType}!", this); + return; + } + + Magazine.AttachToReceiver(this); + } + + public virtual void OnMagazineReleaseButtonDown() + { + if (Magazine == null) return; + + if (releaseMagazineOnReleaseButton) + { + ReleaseMagazine(); + return; + } + + if (makeMagazinePickupableOnReleaseButton) + { + Magazine.Pickupable = true; + } + } + + public virtual void OnMagazineReleaseButtonUp() + { + if (Magazine == null) return; + + if (makeMagazinePickupableOnReleaseButton) + { + Magazine.Pickupable = false; + } + } + + [PublicAPI] + public virtual bool IsCompatibleWith(Magazine magazine) + { + return magazine != null && ParentGun != null && ParentGun.AllowedMagazineTypes.ContainsItem(magazine.Type); + } + + [PublicAPI] + public virtual bool CanAttach(Magazine magazine) + { + if (magazine == null || Magazine != null || magazine.IsAttachedToReceiver) return false; + + // Magazine type check + if (!IsCompatibleWith(magazine)) + { + Debug.Log($"[{name}-MagReceiver] Incompatible magazine type: {magazine.Type}"); + return false; + } + + // Cooldown check + if (Time.timeSinceLevelLoad - LastDetachedTime < ReattachTimeoutInSeconds) + { + Debug.Log($"[{name}-MagReceiver] In cooldown"); + return false; + } + + // Alignment Check + if (Vector3.Dot(transform.forward, magazine.transform.forward) <= 0.8) + { + Debug.Log($"[{name}-MagReceiver] Wrong alignment"); + return false; + } + + return true; + } + + public virtual void Setup(GunBase gun) + { + ParentGun = gun; + } + } +} \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.cs.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.cs.meta new file mode 100644 index 00000000..56ffe8f2 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineReceiver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 57fa474cd1c86004a8f8e958a03fe0fe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.asset b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.asset new file mode 100644 index 00000000..ac134247 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.asset @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: MagazineSummoner + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 106a7be2c2d457f468e4b91d38e0a8ae, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 88109c0584ea457498447abd636b6cde, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 0 + hasInteractEvent: 1 + scriptID: -5235334526217412876 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: magazineManager + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: magazineManager + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.MagazineManager, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: magazineType + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: magazineType + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|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: summonPosition + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: summonPosition + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - 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: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.asset.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.asset.meta new file mode 100644 index 00000000..f7a1883f --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a679d812067644409462733bb0b2f9c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.cs b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.cs new file mode 100644 index 00000000..294c8c1d --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.cs @@ -0,0 +1,25 @@ +using DerpyNewbie.Common; +using UdonSharp; +using UnityEngine; + +namespace CenturionCC.System.Gun +{ + public class MagazineSummoner : UdonSharpBehaviour + { + [SerializeField] [NewbieInject] + private MagazineManager magazineManager; + + [SerializeField] private int magazineType; + [SerializeField] private Transform summonPosition; + + public void Spawn() + { + magazineManager.SpawnMagazine(magazineType, summonPosition.position, summonPosition.rotation); + } + + public override void Interact() + { + Spawn(); + } + } +} \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.cs.meta b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.cs.meta new file mode 100644 index 00000000..9e5d3995 --- /dev/null +++ b/Packages/org.centurioncc.system/Runtime/Gun/MagazineSummoner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88109c0584ea457498447abd636b6cde +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.asset b/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.asset index b918b0d3..f433c378 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 94 + Data: 102 - Name: Entry: 7 Data: @@ -104,19 +104,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 Data: 6|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.TriggerState, CenturionCC.System + Data: CenturionCC.System.Gun.MagazineReceiver, CenturionCC.System - Name: Entry: 8 Data: @@ -125,7 +125,7 @@ MonoBehaviour: Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: VRC.Udon.UdonBehaviour, VRC.Udon - Name: Entry: 8 Data: @@ -164,25 +164,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 Data: 10|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.GunState, CenturionCC.System + Data: CenturionCC.System.Gun.TriggerState, CenturionCC.System - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 7 + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -197,7 +203,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -218,25 +224,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 13|System.RuntimeType, mscorlib + Data: 14|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib + Data: CenturionCC.System.Gun.GunState, CenturionCC.System - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -251,7 +257,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -272,67 +278,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField - Entry: 9 - Data: 13 - - Name: k__BackingField - Entry: 9 - Data: 13 - - 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: false - - Name: _fieldAttributes Entry: 7 - Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: + Data: 17|System.RuntimeType, mscorlib - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: + Entry: 1 + Data: System.Boolean, mscorlib - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: CockingProgressAnimHash - - Name: $v - Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: CockingProgressAnimHash - - Name: k__BackingField - Entry: 9 - Data: 7 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -368,19 +332,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: CockingTwistAnimHash + Data: k__BackingField - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: CockingTwistAnimHash + Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -416,19 +380,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HasBulletAnimHash + Data: CockingProgressAnimHash - Name: $v Entry: 7 Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HasBulletAnimHash + Data: CockingProgressAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -464,19 +428,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HasCockedAnimHash + Data: CockingTwistAnimHash - Name: $v Entry: 7 Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HasCockedAnimHash + Data: CockingTwistAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -512,19 +476,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsInSafeZoneAnimHash + Data: CurrentBulletsCountAnimHash - Name: $v Entry: 7 Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsInSafeZoneAnimHash + Data: CurrentBulletsCountAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -560,19 +524,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsInWallAnimHash + Data: HasBulletAnimHash - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsInWallAnimHash + Data: HasBulletAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -608,19 +572,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsLocalAnimHash + Data: HasCockedAnimHash - Name: $v Entry: 7 Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsLocalAnimHash + Data: HasCockedAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -656,19 +620,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsPickedUpGlobalAnimHash + Data: HasMagazineAnimHash - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsPickedUpGlobalAnimHash + Data: HasMagazineAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -704,19 +668,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsPickedUpLocalAnimHash + Data: IsInSafeZoneAnimHash - Name: $v Entry: 7 Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsPickedUpLocalAnimHash + Data: IsInSafeZoneAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -752,19 +716,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsShootingAnimHash + Data: IsInWallAnimHash - Name: $v Entry: 7 Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsShootingAnimHash + Data: IsInWallAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -800,19 +764,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsShootingEmptyAnimHash + Data: IsLocalAnimHash - Name: $v Entry: 7 Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsShootingEmptyAnimHash + Data: IsLocalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -848,19 +812,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsVRAnimHash + Data: IsPickedUpGlobalAnimHash - Name: $v Entry: 7 Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsVRAnimHash + Data: IsPickedUpGlobalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -896,19 +860,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: SelectorTypeAnimHash + Data: IsPickedUpLocalAnimHash - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: SelectorTypeAnimHash + Data: IsPickedUpLocalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -944,19 +908,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: StateAnimHash + Data: IsShootingAnimHash - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: StateAnimHash + Data: IsShootingAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -992,19 +956,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: TriggerProgressAnimHash + Data: IsShootingEmptyAnimHash - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: TriggerProgressAnimHash + Data: IsShootingEmptyAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1040,19 +1004,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: TriggerStateAnimHash + Data: IsVRAnimHash - Name: $v Entry: 7 Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: TriggerStateAnimHash + Data: IsVRAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1088,31 +1052,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _currentState + Data: SelectorTypeAnimHash - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _currentState + Data: SelectorTypeAnimHash - Name: k__BackingField - Entry: 7 - Data: 50|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Byte, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 50 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1121,22 +1079,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 52|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 53|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1154,25 +1100,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _fireMode + Data: StateAnimHash - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _fireMode + Data: StateAnimHash - Name: k__BackingField - Entry: 7 - Data: 55|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CenturionCC.System.Gun.FireMode, CenturionCC.System - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1187,7 +1127,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1208,25 +1148,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _hasBulletInChamber + Data: TriggerProgressAnimHash - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _hasBulletInChamber + Data: TriggerProgressAnimHash - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1235,22 +1175,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1268,25 +1196,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _hasCocked + Data: TriggerStateAnimHash - Name: $v Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _hasCocked + Data: TriggerStateAnimHash - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1295,22 +1223,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 63|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 64|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1328,25 +1244,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _isLocal + Data: _currentMagazineType - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _isLocal + Data: _currentMagazineType - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1355,7 +1271,355 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _currentState + - Name: $v + Entry: 7 + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _currentState + - Name: k__BackingField + Entry: 7 + Data: 62|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Byte, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 62 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 65|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _fireMode + - Name: $v + Entry: 7 + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _fireMode + - Name: k__BackingField + Entry: 7 + Data: 67|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.FireMode, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _hasBulletInChamber + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _hasBulletInChamber + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 72|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _hasCocked + - Name: $v + Entry: 7 + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _hasCocked + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 76|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _isInStateChangeCallback + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _isInStateChangeCallback + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _isLocal + - Name: $v + Entry: 7 + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _isLocal + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1379,16 +1643,16 @@ MonoBehaviour: Data: _isPickedUp - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1403,7 +1667,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1427,16 +1691,16 @@ MonoBehaviour: Data: _isVR - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isVR - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1451,7 +1715,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1475,16 +1739,16 @@ MonoBehaviour: Data: _lastShotCount - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastShotCount - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1499,7 +1763,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1523,16 +1787,16 @@ MonoBehaviour: Data: _mainHandleIsPickedUp - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandleIsPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1547,7 +1811,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1571,13 +1835,13 @@ MonoBehaviour: Data: _mainHandlePosOffset - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandlePosOffset - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 90|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector3, UnityEngine.CoreModule @@ -1586,7 +1850,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1601,7 +1865,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1625,13 +1889,13 @@ MonoBehaviour: Data: _mainHandleRotOffset - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandleRotOffset - Name: k__BackingField Entry: 7 - Data: 79|System.RuntimeType, mscorlib + Data: 93|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Quaternion, UnityEngine.CoreModule @@ -1640,7 +1904,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1655,7 +1919,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1679,13 +1943,13 @@ MonoBehaviour: Data: _nextMainHandlePickupableTime - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _nextMainHandlePickupableTime - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 96|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1694,7 +1958,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1709,7 +1973,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1733,16 +1997,16 @@ MonoBehaviour: Data: _nextSubHandlePickupableTime - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _nextSubHandlePickupableTime - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1757,7 +2021,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1781,16 +2045,16 @@ MonoBehaviour: Data: _shotPosition - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotPosition - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1805,13 +2069,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 102|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1835,16 +2100,16 @@ MonoBehaviour: Data: _shotRotation - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotRotation - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1859,13 +2124,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 91|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1889,13 +2155,13 @@ MonoBehaviour: Data: _shotTime - Name: $v Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotTime - Name: k__BackingField Entry: 7 - Data: 93|System.RuntimeType, mscorlib + Data: 107|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int64, mscorlib @@ -1904,7 +2170,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 93 + Data: 107 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1919,13 +2185,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 95|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1949,16 +2216,16 @@ MonoBehaviour: Data: _subHandleIsPickedUp - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandleIsPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1973,7 +2240,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -1997,16 +2265,16 @@ MonoBehaviour: Data: _subHandlePosOffset - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandlePosOffset - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2021,7 +2289,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -2045,16 +2314,16 @@ MonoBehaviour: Data: _subHandleRotOffset - Name: $v Entry: 7 - Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandleRotOffset - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2069,7 +2338,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2094,16 +2363,16 @@ MonoBehaviour: Data: _trigger - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _trigger - Name: k__BackingField Entry: 9 - Data: 6 + Data: 10 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2118,7 +2387,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2143,13 +2412,13 @@ MonoBehaviour: Data: pivotHandle - Name: $v Entry: 7 - Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: pivotHandle - Name: k__BackingField Entry: 7 - Data: 105|System.RuntimeType, mscorlib + Data: 119|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunHandle, CenturionCC.System @@ -2157,14 +2426,167 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: pivotPosOffset + - Name: $v + Entry: 7 + Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pivotPosOffset + - Name: k__BackingField + Entry: 9 + Data: 90 + - Name: k__BackingField + Entry: 9 + Data: 90 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: Entry: 7 - Data: 106|System.RuntimeType, mscorlib + Data: 123|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - 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: VRC.Udon.UdonBehaviour, VRC.Udon + Data: pivotRotOffset + - Name: $v + Entry: 7 + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pivotRotOffset + - Name: k__BackingField + Entry: 9 + Data: 93 + - Name: k__BackingField + Entry: 9 + Data: 93 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 125|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 126|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: safetyAreaCollisionCount + - Name: $v + Entry: 7 + Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: safetyAreaCollisionCount + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2179,7 +2601,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2201,19 +2623,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pivotPosOffset + Data: shotCount - Name: $v Entry: 7 - Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pivotPosOffset + Data: shotCount - Name: k__BackingField Entry: 9 - Data: 76 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2228,14 +2650,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 130|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 131|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 7 - Data: 110|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 132|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -2256,41 +2684,47 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pivotRotOffset + Data: weaponName - Name: $v Entry: 7 - Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pivotRotOffset + Data: weaponName - Name: k__BackingField - Entry: 9 - Data: 79 + Entry: 7 + Data: 134|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 79 + Data: 134 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 135|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 113|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 136|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2311,19 +2745,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: safetyAreaCollisionCount + Data: target - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 137|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: safetyAreaCollisionCount + Data: target - Name: k__BackingField - Entry: 9 - Data: 7 + Entry: 7 + Data: 138|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 138 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2335,14 +2775,20 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 139|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 140|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -2360,47 +2806,41 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: shotCount + Data: shooter - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 141|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: shotCount + Data: shooter - Name: k__BackingField Entry: 9 - Data: 7 + Data: 138 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 138 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 142|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 1 - Name: Entry: 7 - Data: 119|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 143|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2421,25 +2861,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: weaponName + Data: mainHandle - Name: $v Entry: 7 - Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: weaponName + Data: mainHandle - Name: k__BackingField - Entry: 7 - Data: 121|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 121 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2454,14 +2888,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2482,25 +2916,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: target + Data: subHandle - Name: $v Entry: 7 - Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: target + Data: subHandle - Name: k__BackingField - Entry: 7 - Data: 125|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Transform, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 125 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2515,14 +2943,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 126|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 148|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 127|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 149|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2543,19 +2971,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: shooter + Data: customHandle - Name: $v Entry: 7 - Data: 128|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 150|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: shooter + Data: customHandle - Name: k__BackingField Entry: 9 - Data: 125 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 125 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2570,14 +2998,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 129|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 151|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 130|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 152|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2598,19 +3026,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: mainHandle + Data: bulletHolder - Name: $v Entry: 7 - Data: 131|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 153|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: mainHandle + Data: bulletHolder - Name: k__BackingField - Entry: 9 - Data: 105 + Entry: 7 + Data: 154|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.GunBulletHolder, CenturionCC.System + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2625,14 +3059,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 132|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 155|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 133|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 156|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2653,19 +3087,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: subHandle + Data: animator - Name: $v Entry: 7 - Data: 134|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 157|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: subHandle + Data: animator - Name: k__BackingField Entry: 9 - Data: 105 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2680,14 +3114,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 135|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 158|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 136|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 159|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2708,19 +3142,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: customHandle + Data: magazineReceiver - Name: $v Entry: 7 - Data: 137|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: customHandle + Data: magazineReceiver - Name: k__BackingField Entry: 9 - Data: 105 + Data: 6 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2735,14 +3169,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 138|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 161|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 139|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 162|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2763,25 +3197,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: bulletHolder + Data: allowedMagazineTypes - Name: $v Entry: 7 - Data: 140|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 163|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: bulletHolder + Data: allowedMagazineTypes - Name: k__BackingField Entry: 7 - Data: 141|System.RuntimeType, mscorlib + Data: 164|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.GunBulletHolder, CenturionCC.System + Data: System.Int32[], mscorlib - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 164 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2796,14 +3230,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 142|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 165|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 143|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 166|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2824,19 +3258,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: animator + Data: canShootWithoutMagazine - Name: $v Entry: 7 - Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 167|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: animator + Data: canShootWithoutMagazine - Name: k__BackingField Entry: 9 - Data: 3 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 3 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2851,14 +3285,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 168|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 169|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2882,13 +3316,13 @@ MonoBehaviour: Data: behaviour - Name: $v Entry: 7 - Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 170|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: behaviour - Name: k__BackingField Entry: 7 - Data: 148|System.RuntimeType, mscorlib + Data: 171|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.Behaviour.GunBehaviourBase, CenturionCC.System @@ -2897,7 +3331,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2912,14 +3346,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 149|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 150|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 173|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2943,13 +3377,13 @@ MonoBehaviour: Data: availableFireModes - Name: $v Entry: 7 - Data: 151|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: availableFireModes - Name: k__BackingField Entry: 7 - Data: 152|System.RuntimeType, mscorlib + Data: 175|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.FireMode[], CenturionCC.System @@ -2957,14 +3391,8 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 153|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32[], mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 164 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2979,14 +3407,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 154|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 176|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 155|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 177|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3010,13 +3438,13 @@ MonoBehaviour: Data: projectileData - Name: $v Entry: 7 - Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 178|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: projectileData - Name: k__BackingField Entry: 7 - Data: 157|System.RuntimeType, mscorlib + Data: 179|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.ProjectileDataProvider, CenturionCC.System @@ -3025,7 +3453,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3040,14 +3468,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 158|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 180|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 159|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 181|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3071,13 +3499,13 @@ MonoBehaviour: Data: audioData - Name: $v Entry: 7 - Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 182|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: audioData - Name: k__BackingField Entry: 7 - Data: 161|System.RuntimeType, mscorlib + Data: 183|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunAudioDataStore, CenturionCC.System @@ -3086,7 +3514,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3101,14 +3529,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 162|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 184|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 163|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 185|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3132,13 +3560,13 @@ MonoBehaviour: Data: hapticData - Name: $v Entry: 7 - Data: 164|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: hapticData - Name: k__BackingField Entry: 7 - Data: 165|System.RuntimeType, mscorlib + Data: 187|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunHapticDataStore, CenturionCC.System @@ -3147,7 +3575,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3162,14 +3590,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 166|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 188|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 167|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 189|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3193,16 +3621,16 @@ MonoBehaviour: Data: isDoubleHanded - Name: $v Entry: 7 - Data: 168|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 190|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: isDoubleHanded - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3217,14 +3645,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 169|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 170|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 192|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3248,16 +3676,16 @@ MonoBehaviour: Data: maxHoldDistance - Name: $v Entry: 7 - Data: 171|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 193|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: maxHoldDistance - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3272,14 +3700,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 194|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 173|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 195|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3303,16 +3731,16 @@ MonoBehaviour: Data: roundsPerSecond - Name: $v Entry: 7 - Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 196|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: roundsPerSecond - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3327,14 +3755,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 175|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 197|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 176|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 198|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3358,16 +3786,16 @@ MonoBehaviour: Data: requiredHolsterSize - Name: $v Entry: 7 - Data: 177|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 199|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: requiredHolsterSize - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3382,14 +3810,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 178|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 200|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 179|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 201|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3413,16 +3841,16 @@ MonoBehaviour: Data: mainHandlePitchOffset - Name: $v Entry: 7 - Data: 180|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 202|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandlePitchOffset - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3437,14 +3865,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 181|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 203|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 182|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 204|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3468,16 +3896,16 @@ MonoBehaviour: Data: mainHandleRePickupDelay - Name: $v Entry: 7 - Data: 183|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 205|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandleRePickupDelay - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3492,14 +3920,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 184|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 206|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 185|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 207|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3523,16 +3951,16 @@ MonoBehaviour: Data: subHandleRePickupDelay - Name: $v Entry: 7 - Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 208|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: subHandleRePickupDelay - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3547,14 +3975,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 187|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 209|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 188|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 210|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3578,13 +4006,13 @@ MonoBehaviour: Data: objectType - Name: $v Entry: 7 - Data: 189|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 211|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectType - Name: k__BackingField Entry: 7 - Data: 190|System.RuntimeType, mscorlib + Data: 212|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.ObjectType, CenturionCC.System @@ -3593,7 +4021,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3608,14 +4036,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 213|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 192|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 214|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: ObjectMarker Properties @@ -3624,7 +4052,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 193|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 215|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3648,16 +4076,16 @@ MonoBehaviour: Data: objectWeight - Name: $v Entry: 7 - Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 216|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectWeight - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3672,14 +4100,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 195|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 217|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 196|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 218|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3703,13 +4131,13 @@ MonoBehaviour: Data: tags - Name: $v Entry: 7 - Data: 197|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: tags - Name: k__BackingField Entry: 7 - Data: 198|System.RuntimeType, mscorlib + Data: 220|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -3718,7 +4146,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 198 + Data: 220 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3733,14 +4161,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 199|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 221|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 200|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 222|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3764,13 +4192,13 @@ MonoBehaviour: Data: movementOption - Name: $v Entry: 7 - Data: 201|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 223|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: movementOption - Name: k__BackingField Entry: 7 - Data: 202|System.RuntimeType, mscorlib + Data: 224|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.MovementOption, CenturionCC.System @@ -3779,7 +4207,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3794,14 +4222,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 203|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 225|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 204|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 226|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Player Controller Properties @@ -3810,7 +4238,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 205|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 227|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3834,16 +4262,16 @@ MonoBehaviour: Data: walkSpeed - Name: $v Entry: 7 - Data: 206|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 228|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: walkSpeed - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3858,14 +4286,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 207|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 229|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 208|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 230|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3889,16 +4317,16 @@ MonoBehaviour: Data: sprintSpeed - Name: $v Entry: 7 - Data: 209|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 231|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintSpeed - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3913,14 +4341,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 210|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 211|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 233|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3944,16 +4372,16 @@ MonoBehaviour: Data: sprintThresholdMultiplier - Name: $v Entry: 7 - Data: 212|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 234|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintThresholdMultiplier - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3968,14 +4396,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 213|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 235|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 214|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 236|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3999,13 +4427,13 @@ MonoBehaviour: Data: combatTag - Name: $v Entry: 7 - Data: 215|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 237|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTag - Name: k__BackingField Entry: 7 - Data: 216|System.RuntimeType, mscorlib + Data: 238|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.CombatTagOption, CenturionCC.System @@ -4014,7 +4442,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4029,14 +4457,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 217|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 239|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 218|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 240|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4060,16 +4488,16 @@ MonoBehaviour: Data: combatTagSpeedMultiplier - Name: $v Entry: 7 - Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 241|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagSpeedMultiplier - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4084,14 +4512,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 220|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 242|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 221|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 243|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4115,16 +4543,16 @@ MonoBehaviour: Data: combatTagTime - Name: $v Entry: 7 - Data: 222|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 244|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagTime - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4139,14 +4567,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 223|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 245|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 224|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 246|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4170,13 +4598,13 @@ MonoBehaviour: Data: logger - Name: $v Entry: 7 - Data: 225|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 247|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: logger - Name: k__BackingField Entry: 7 - Data: 226|System.RuntimeType, mscorlib + Data: 248|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Logger.PrintableBase, DerpyNewbie.Logger @@ -4185,7 +4613,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4200,20 +4628,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 227|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 249|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 228|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 250|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 229|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 251|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4237,13 +4665,13 @@ MonoBehaviour: Data: updateManager - Name: $v Entry: 7 - Data: 230|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 252|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: updateManager - Name: k__BackingField Entry: 7 - Data: 231|System.RuntimeType, mscorlib + Data: 253|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Common.UpdateManager, DerpyNewbie.Common @@ -4252,7 +4680,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4267,20 +4695,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 254|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 233|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 255|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 234|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 256|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4304,13 +4732,13 @@ MonoBehaviour: Data: audioManager - Name: $v Entry: 7 - Data: 235|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 257|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: audioManager - Name: k__BackingField Entry: 7 - Data: 236|System.RuntimeType, mscorlib + Data: 258|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Audio.AudioManager, CenturionCC.System @@ -4319,7 +4747,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4334,20 +4762,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 237|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 259|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 238|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 260|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 239|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 261|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4371,13 +4799,13 @@ MonoBehaviour: Data: playerController - Name: $v Entry: 7 - Data: 240|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 262|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: playerController - Name: k__BackingField Entry: 7 - Data: 241|System.RuntimeType, mscorlib + Data: 263|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.PlayerController, CenturionCC.System @@ -4386,7 +4814,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4401,20 +4829,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 242|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 264|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 243|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 265|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 244|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 266|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4438,16 +4866,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 245|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 267|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4462,14 +4890,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 246|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 268|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 247|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 269|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4493,13 +4921,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 248|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 270|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 249|System.RuntimeType, mscorlib + Data: 271|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunHolster, CenturionCC.System @@ -4508,7 +4936,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4523,7 +4951,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 250|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 272|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4548,16 +4976,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 251|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 273|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4572,14 +5000,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 252|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 274|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 253|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 275|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4603,16 +5031,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 254|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 276|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4627,7 +5055,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 255|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 277|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4652,16 +5080,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 256|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 278|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4676,7 +5104,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 257|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 279|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4701,16 +5129,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 258|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 280|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4725,7 +5153,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 259|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 281|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4750,13 +5178,13 @@ MonoBehaviour: Data: Model - Name: $v Entry: 7 - Data: 260|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 282|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Model - Name: k__BackingField Entry: 7 - Data: 261|System.RuntimeType, mscorlib + Data: 283|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject, UnityEngine.CoreModule @@ -4765,7 +5193,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 261 + Data: 283 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4780,20 +5208,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 262|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 284|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 263|JetBrains.Annotations.PublicAPIAttribute, UnityEngine.CoreModule + Data: 285|JetBrains.Annotations.PublicAPIAttribute, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 264|JetBrains.Annotations.CanBeNullAttribute, UnityEngine.CoreModule + Data: 286|JetBrains.Annotations.CanBeNullAttribute, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4817,7 +5245,7 @@ MonoBehaviour: Data: _animator - Name: $v Entry: 7 - Data: 265|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 287|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _animator @@ -4841,7 +5269,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 266|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 288|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4866,16 +5294,16 @@ MonoBehaviour: Data: _hasInit - Name: $v Entry: 7 - Data: 267|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 289|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _hasInit - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4890,7 +5318,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 268|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 290|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4915,16 +5343,16 @@ MonoBehaviour: Data: _isOccupied - Name: $v Entry: 7 - Data: 269|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 291|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isOccupied - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4939,20 +5367,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 270|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 292|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 271|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 293|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 272|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 294|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4976,16 +5404,16 @@ MonoBehaviour: Data: _variantDataUniqueId - Name: $v Entry: 7 - Data: 273|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 295|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _variantDataUniqueId - Name: k__BackingField Entry: 9 - Data: 50 + Data: 62 - Name: k__BackingField Entry: 9 - Data: 50 + Data: 62 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5000,20 +5428,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 274|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 296|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 275|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 297|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 276|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 298|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -5037,13 +5465,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 277|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 299|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 278|System.RuntimeType, mscorlib + Data: 300|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunManager, CenturionCC.System @@ -5052,7 +5480,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5067,7 +5495,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 279|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 301|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -5092,13 +5520,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 280|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 302|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 281|System.RuntimeType, mscorlib + Data: 303|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.BoxCollider, UnityEngine.PhysicsModule @@ -5107,7 +5535,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 281 + Data: 303 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5122,7 +5550,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 282|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 304|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -5147,13 +5575,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 283|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 305|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 284|System.RuntimeType, mscorlib + Data: 306|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunVariantDataStore, CenturionCC.System @@ -5162,7 +5590,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5177,7 +5605,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 285|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 307|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.cs b/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.cs index 84c88f87..101d8189 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/ManagedGun.cs @@ -149,6 +149,7 @@ private void Internal_SetVariantData(GunVariantDataStore data, bool refreshHandl mt.localPosition = data.ModelPositionOffset; mt.localRotation = data.ModelRotationOffset; _animator = Model.GetComponentInChildren(); + magazineReceiver = Model.GetComponentInChildren(); } VariantData = data; @@ -189,6 +190,9 @@ private void Internal_SetVariantData(GunVariantDataStore data, bool refreshHandl if (Behaviour != null) Behaviour.Setup(this); + if (MagazineReceiver != null) + MagazineReceiver.Setup(this); + ParentManager.Invoke_OnVariantChanged(this); } @@ -312,18 +316,43 @@ protected override void OnTriggerEnter(Collider other) protected override ShotResult CanShoot() { - var result = base.CanShoot(); - if (VariantData == null) { ParentManager.Invoke_OnShootCancelled(this, 1); return ShotResult.Cancelled; } + if (!CanShootWithoutMagazine && !HasMagazine) + { + ParentManager.Invoke_OnShootCancelled(this, 20); + Trigger = TriggerState.Fired; + return ShotResult.Cancelled; + } + if (FireMode == FireMode.Safety) { ParentManager.Invoke_OnShootFailed(this, 12); - result = ShotResult.Failed; + return ShotResult.Cancelled; + } + + if (State != GunState.Idle) + { + ParentManager.Invoke_OnShootCancelled(this, 15); + Trigger = TriggerState.Fired; + return ShotResult.Cancelled; + } + + if (!HasCocked) + { + ParentManager.Invoke_OnShootCancelled(this, 14); + Trigger = TriggerState.Fired; + return ShotResult.Cancelled; + } + + if (!HasBulletInChamber) + { + ParentManager.Invoke_OnShootFailed(this, 13); + return CanShootWithoutMagazine || HasMagazine ? ShotResult.Failed : ShotResult.Cancelled; } if (ParentManager.useCollisionCheck) @@ -331,29 +360,29 @@ protected override ShotResult CanShoot() if (IsInWall && VariantData.UseWallCheck) { ParentManager.Invoke_OnShootFailed(this, 100); - result = ShotResult.Failed; + return ShotResult.Cancelled; } if (IsInSafeZone && VariantData.UseSafeZoneCheck) { ParentManager.Invoke_OnShootCancelled(this, 101); - result = ShotResult.Cancelled; + return ShotResult.Cancelled; } } if (ParentManager.CanLocalShoot == false) { ParentManager.Invoke_OnShootCancelled(this, 200); - result = ShotResult.Cancelled; + return ShotResult.Cancelled; } if (ParentManager.CheckCanLocalShoot(this, out var ruleId) == false) { ParentManager.Invoke_OnShootCancelled(this, ruleId); - result = ShotResult.Cancelled; + return ShotResult.Cancelled; } - return result; + return ShotResult.Succeeded; } protected override void OnShoot(ProjectileBase bullet, bool isPellet) @@ -392,111 +421,117 @@ protected override void OnGunDrop() #region OverridenProperties - public override string WeaponName => VariantData != null ? VariantData.WeaponName : null; + public override string WeaponName => VariantData ? VariantData.WeaponName : null; public override Animator TargetAnimator => _animator; public override ProjectilePool ProjectilePool => - VariantData != null && VariantData.ProjectilePoolOverride != null ? VariantData.ProjectilePoolOverride : - ParentManager != null ? ParentManager.BulletHolder : null; + VariantData && VariantData.ProjectilePoolOverride ? VariantData.ProjectilePoolOverride : + ParentManager ? ParentManager.BulletHolder : null; public override GunBehaviourBase Behaviour => - VariantData != null ? VariantData.Behaviour : null; + VariantData ? VariantData.Behaviour : null; [PublicAPI] public override ProjectileDataProvider ProjectileData => - VariantData != null ? VariantData.ProjectileData : null; + VariantData ? VariantData.ProjectileData : null; [PublicAPI] public override GunAudioDataStore AudioData => - VariantData != null ? VariantData.AudioData : null; + VariantData ? VariantData.AudioData : null; [PublicAPI] public override GunHapticDataStore HapticData => - VariantData != null ? VariantData.HapticData : null; + VariantData ? VariantData.HapticData : null; [PublicAPI] public override Vector3 MainHandlePositionOffset => - VariantData != null ? VariantData.MainHandlePositionOffset : Vector3.zero; + VariantData ? VariantData.MainHandlePositionOffset : Vector3.zero; [PublicAPI] public override Quaternion MainHandleRotationOffset => - VariantData != null ? VariantData.MainHandleRotationOffset : Quaternion.identity; + VariantData ? VariantData.MainHandleRotationOffset : Quaternion.identity; [PublicAPI] public override Vector3 SubHandlePositionOffset => - VariantData != null ? VariantData.SubHandlePositionOffset : Vector3.forward; + VariantData ? VariantData.SubHandlePositionOffset : Vector3.forward; [PublicAPI] public override Quaternion SubHandleRotationOffset => - VariantData != null ? VariantData.SubHandleRotationOffset : Quaternion.identity; + VariantData ? VariantData.SubHandleRotationOffset : Quaternion.identity; [PublicAPI] - public override float MainHandlePitchOffset => VariantData != null ? VariantData.MainHandlePitchOffset : 0F; + public override float MainHandlePitchOffset => VariantData ? VariantData.MainHandlePitchOffset : 0F; - public override bool IsDoubleHandedGun => VariantData != null && VariantData.IsDoubleHanded; + public override bool IsDoubleHandedGun => VariantData && VariantData.IsDoubleHanded; - [PublicAPI] public override int RequiredHolsterSize => VariantData != null ? VariantData.HolsterSize : 0; + [PublicAPI] public override int RequiredHolsterSize => VariantData ? VariantData.HolsterSize : 0; [PublicAPI] public override float MainHandleRePickupDelay => - VariantData != null && ParentManager != null && VariantData.UseRePickupDelayForMainHandle + VariantData && ParentManager && VariantData.UseRePickupDelayForMainHandle ? ParentManager.handleRePickupDelay : 0F; [PublicAPI] public override float SubHandleRePickupDelay => - VariantData != null && ParentManager != null && VariantData.UseRePickupDelayForSubHandle + VariantData && ParentManager && VariantData.UseRePickupDelayForSubHandle ? ParentManager.handleRePickupDelay : 0F; [PublicAPI] [Obsolete] public override float OptimizationRange => - ParentManager != null ? ParentManager.optimizationRange : 0F; + ParentManager ? ParentManager.optimizationRange : 0F; - public override float MaxHoldDistance => ParentManager != null ? ParentManager.maxHoldDistance : 0F; + public override float MaxHoldDistance => ParentManager ? ParentManager.maxHoldDistance : 0F; - public override bool IsInWall => VariantData != null && ParentManager != null + public override bool IsInWall => VariantData && ParentManager ? ParentManager.useCollisionCheck && VariantData.UseWallCheck && CollisionCount != 0 : CollisionCount != 0; public override float RoundsPerSecond => - VariantData != null ? VariantData.MaxRoundsPerSecond : float.PositiveInfinity; + VariantData ? VariantData.MaxRoundsPerSecond : float.PositiveInfinity; + + public override int[] AllowedMagazineTypes => + VariantData != null ? VariantData.AllowedMagazineTypes : new int[0]; + + public override bool CanShootWithoutMagazine => + VariantData == null || VariantData.CanShootWithoutMagazine; [PublicAPI] public override FireMode[] AvailableFireModes => - VariantData != null ? VariantData.AvailableFiringModes : new[] { FireMode.Safety }; + VariantData ? VariantData.AvailableFiringModes : new[] { FireMode.Safety }; public override ObjectType ObjectType => - VariantData != null ? VariantData.ObjectType : ObjectType.Prototype; + VariantData ? VariantData.ObjectType : ObjectType.Prototype; public override float ObjectWeight => - VariantData != null ? VariantData.ObjectWeight : 0; + VariantData ? VariantData.ObjectWeight : 0; public override string[] Tags => - VariantData != null ? VariantData.Tags : new string[0]; + VariantData ? VariantData.Tags : new string[0]; public override MovementOption MovementOption => - VariantData != null ? VariantData.Movement : MovementOption.Inherit; + VariantData ? VariantData.Movement : MovementOption.Inherit; public override float WalkSpeed => - VariantData != null ? VariantData.WalkSpeed : 1F; + VariantData ? VariantData.WalkSpeed : 1F; public override float SprintSpeed => - VariantData != null ? VariantData.SprintSpeed : 1F; + VariantData ? VariantData.SprintSpeed : 1F; public override CombatTagOption CombatTagOption => - VariantData != null ? VariantData.CombatTag : CombatTagOption.Inherit; + VariantData ? VariantData.CombatTag : CombatTagOption.Inherit; public override float CombatTagSpeedMultiplier => - VariantData != null ? VariantData.CombatTagSpeedMultiplier : 1F; + VariantData ? VariantData.CombatTagSpeedMultiplier : 1F; public override float CombatTagTime => - VariantData != null ? VariantData.CombatTagTime : 1F; + VariantData ? VariantData.CombatTagTime : 1F; #endregion } diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.asset b/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.asset index bd73ea75..718546a5 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.asset +++ b/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 94 + Data: 102 - Name: Entry: 7 Data: @@ -104,19 +104,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 Data: 6|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.TriggerState, CenturionCC.System + Data: CenturionCC.System.Gun.MagazineReceiver, CenturionCC.System - Name: Entry: 8 Data: @@ -125,7 +125,7 @@ MonoBehaviour: Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: VRC.Udon.UdonBehaviour, VRC.Udon - Name: Entry: 8 Data: @@ -164,25 +164,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 Data: 10|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.GunState, CenturionCC.System + Data: CenturionCC.System.Gun.TriggerState, CenturionCC.System - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 7 + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -197,7 +203,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -218,25 +224,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 13|System.RuntimeType, mscorlib + Data: 14|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib + Data: CenturionCC.System.Gun.GunState, CenturionCC.System - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -251,7 +257,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -272,67 +278,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: k__BackingField + Data: k__BackingField - Name: k__BackingField - Entry: 9 - Data: 13 - - Name: k__BackingField - Entry: 9 - Data: 13 - - 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: false - - Name: _fieldAttributes Entry: 7 - Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: + Data: 17|System.RuntimeType, mscorlib - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: + Entry: 1 + Data: System.Boolean, mscorlib - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: CockingProgressAnimHash - - Name: $v - Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: CockingProgressAnimHash - - Name: k__BackingField - Entry: 9 - Data: 7 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -368,19 +332,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: CockingTwistAnimHash + Data: k__BackingField - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: CockingTwistAnimHash + Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -416,19 +380,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HasBulletAnimHash + Data: CockingProgressAnimHash - Name: $v Entry: 7 Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HasBulletAnimHash + Data: CockingProgressAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -464,19 +428,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HasCockedAnimHash + Data: CockingTwistAnimHash - Name: $v Entry: 7 Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HasCockedAnimHash + Data: CockingTwistAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -512,19 +476,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsInSafeZoneAnimHash + Data: CurrentBulletsCountAnimHash - Name: $v Entry: 7 Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsInSafeZoneAnimHash + Data: CurrentBulletsCountAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -560,19 +524,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsInWallAnimHash + Data: HasBulletAnimHash - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsInWallAnimHash + Data: HasBulletAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -608,19 +572,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsLocalAnimHash + Data: HasCockedAnimHash - Name: $v Entry: 7 Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsLocalAnimHash + Data: HasCockedAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -656,19 +620,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsPickedUpGlobalAnimHash + Data: HasMagazineAnimHash - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsPickedUpGlobalAnimHash + Data: HasMagazineAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -704,19 +668,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsPickedUpLocalAnimHash + Data: IsInSafeZoneAnimHash - Name: $v Entry: 7 Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsPickedUpLocalAnimHash + Data: IsInSafeZoneAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -752,19 +716,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsShootingAnimHash + Data: IsInWallAnimHash - Name: $v Entry: 7 Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsShootingAnimHash + Data: IsInWallAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -800,19 +764,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsShootingEmptyAnimHash + Data: IsLocalAnimHash - Name: $v Entry: 7 Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsShootingEmptyAnimHash + Data: IsLocalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -848,19 +812,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsVRAnimHash + Data: IsPickedUpGlobalAnimHash - Name: $v Entry: 7 Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IsVRAnimHash + Data: IsPickedUpGlobalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -896,19 +860,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: SelectorTypeAnimHash + Data: IsPickedUpLocalAnimHash - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: SelectorTypeAnimHash + Data: IsPickedUpLocalAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -944,19 +908,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: StateAnimHash + Data: IsShootingAnimHash - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: StateAnimHash + Data: IsShootingAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -992,19 +956,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: TriggerProgressAnimHash + Data: IsShootingEmptyAnimHash - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: TriggerProgressAnimHash + Data: IsShootingEmptyAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1040,19 +1004,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: TriggerStateAnimHash + Data: IsVRAnimHash - Name: $v Entry: 7 Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: TriggerStateAnimHash + Data: IsVRAnimHash - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1088,31 +1052,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _currentState + Data: SelectorTypeAnimHash - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _currentState + Data: SelectorTypeAnimHash - Name: k__BackingField - Entry: 7 - Data: 50|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Byte, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 50 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1121,22 +1079,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 52|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 53|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1154,25 +1100,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _fireMode + Data: StateAnimHash - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _fireMode + Data: StateAnimHash - Name: k__BackingField - Entry: 7 - Data: 55|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CenturionCC.System.Gun.FireMode, CenturionCC.System - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1187,7 +1127,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1208,25 +1148,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _hasBulletInChamber + Data: TriggerProgressAnimHash - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _hasBulletInChamber + Data: TriggerProgressAnimHash - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1235,22 +1175,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1268,25 +1196,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _hasCocked + Data: TriggerStateAnimHash - Name: $v Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _hasCocked + Data: TriggerStateAnimHash - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1295,22 +1223,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 63|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 64|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1328,25 +1244,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _isLocal + Data: _currentMagazineType - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _isLocal + Data: _currentMagazineType - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1355,7 +1271,355 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _currentState + - Name: $v + Entry: 7 + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _currentState + - Name: k__BackingField + Entry: 7 + Data: 62|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Byte, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 62 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 65|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _fireMode + - Name: $v + Entry: 7 + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _fireMode + - Name: k__BackingField + Entry: 7 + Data: 67|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.FireMode, CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _hasBulletInChamber + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _hasBulletInChamber + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 72|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _hasCocked + - Name: $v + Entry: 7 + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _hasCocked + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 76|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _isInStateChangeCallback + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _isInStateChangeCallback + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _isLocal + - Name: $v + Entry: 7 + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _isLocal + - Name: k__BackingField + Entry: 9 + Data: 17 + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1379,16 +1643,16 @@ MonoBehaviour: Data: _isPickedUp - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1403,7 +1667,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1427,16 +1691,16 @@ MonoBehaviour: Data: _isVR - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isVR - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1451,7 +1715,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1475,16 +1739,16 @@ MonoBehaviour: Data: _lastShotCount - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastShotCount - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1499,7 +1763,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1523,16 +1787,16 @@ MonoBehaviour: Data: _mainHandleIsPickedUp - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandleIsPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1547,7 +1811,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1571,13 +1835,13 @@ MonoBehaviour: Data: _mainHandlePosOffset - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandlePosOffset - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 90|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector3, UnityEngine.CoreModule @@ -1586,7 +1850,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1601,7 +1865,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1625,13 +1889,13 @@ MonoBehaviour: Data: _mainHandleRotOffset - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mainHandleRotOffset - Name: k__BackingField Entry: 7 - Data: 79|System.RuntimeType, mscorlib + Data: 93|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Quaternion, UnityEngine.CoreModule @@ -1640,7 +1904,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1655,7 +1919,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1679,13 +1943,13 @@ MonoBehaviour: Data: _nextMainHandlePickupableTime - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _nextMainHandlePickupableTime - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 96|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1694,7 +1958,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1709,7 +1973,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1733,16 +1997,16 @@ MonoBehaviour: Data: _nextSubHandlePickupableTime - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _nextSubHandlePickupableTime - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1757,7 +2021,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1781,16 +2045,16 @@ MonoBehaviour: Data: _shotPosition - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotPosition - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1805,13 +2069,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 102|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1835,16 +2100,16 @@ MonoBehaviour: Data: _shotRotation - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotRotation - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1859,13 +2124,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 91|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1889,13 +2155,13 @@ MonoBehaviour: Data: _shotTime - Name: $v Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shotTime - Name: k__BackingField Entry: 7 - Data: 93|System.RuntimeType, mscorlib + Data: 107|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int64, mscorlib @@ -1904,7 +2170,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 93 + Data: 107 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1919,13 +2185,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 95|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1949,16 +2216,16 @@ MonoBehaviour: Data: _subHandleIsPickedUp - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandleIsPickedUp - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1973,7 +2240,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -1997,16 +2265,16 @@ MonoBehaviour: Data: _subHandlePosOffset - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandlePosOffset - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 90 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2021,7 +2289,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -2045,16 +2314,16 @@ MonoBehaviour: Data: _subHandleRotOffset - Name: $v Entry: 7 - Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _subHandleRotOffset - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 79 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2069,7 +2338,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2094,16 +2363,16 @@ MonoBehaviour: Data: _trigger - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _trigger - Name: k__BackingField Entry: 9 - Data: 6 + Data: 10 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2118,7 +2387,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2143,13 +2412,13 @@ MonoBehaviour: Data: pivotHandle - Name: $v Entry: 7 - Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: pivotHandle - Name: k__BackingField Entry: 7 - Data: 105|System.RuntimeType, mscorlib + Data: 119|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunHandle, CenturionCC.System @@ -2157,14 +2426,167 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: pivotPosOffset + - Name: $v + Entry: 7 + Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pivotPosOffset + - Name: k__BackingField + Entry: 9 + Data: 90 + - Name: k__BackingField + Entry: 9 + Data: 90 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: Entry: 7 - Data: 106|System.RuntimeType, mscorlib + Data: 123|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - 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: VRC.Udon.UdonBehaviour, VRC.Udon + Data: pivotRotOffset + - Name: $v + Entry: 7 + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pivotRotOffset + - Name: k__BackingField + Entry: 9 + Data: 93 + - Name: k__BackingField + Entry: 9 + Data: 93 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 125|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 126|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: safetyAreaCollisionCount + - Name: $v + Entry: 7 + Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: safetyAreaCollisionCount + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2179,7 +2601,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2201,19 +2623,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pivotPosOffset + Data: shotCount - Name: $v Entry: 7 - Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pivotPosOffset + Data: shotCount - Name: k__BackingField Entry: 9 - Data: 76 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2228,14 +2650,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 130|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 131|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 7 - Data: 110|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 132|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -2256,41 +2684,47 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pivotRotOffset + Data: weaponName - Name: $v Entry: 7 - Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pivotRotOffset + Data: weaponName - Name: k__BackingField - Entry: 9 - Data: 79 + Entry: 7 + Data: 134|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 79 + Data: 134 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 135|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 113|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 136|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2311,19 +2745,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: safetyAreaCollisionCount + Data: target - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 137|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: safetyAreaCollisionCount + Data: target - Name: k__BackingField - Entry: 9 - Data: 7 + Entry: 7 + Data: 138|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 138 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2335,14 +2775,20 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 139|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 140|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -2360,47 +2806,41 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: shotCount + Data: shooter - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 141|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: shotCount + Data: shooter - Name: k__BackingField Entry: 9 - Data: 7 + Data: 138 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 138 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 142|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 1 - Name: Entry: 7 - Data: 119|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 143|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2421,25 +2861,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: weaponName + Data: mainHandle - Name: $v Entry: 7 - Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: weaponName + Data: mainHandle - Name: k__BackingField - Entry: 7 - Data: 121|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 121 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2454,14 +2888,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2482,25 +2916,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: target + Data: subHandle - Name: $v Entry: 7 - Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: target + Data: subHandle - Name: k__BackingField - Entry: 7 - Data: 125|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Transform, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 125 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2515,14 +2943,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 126|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 148|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 127|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 149|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2543,19 +2971,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: shooter + Data: customHandle - Name: $v Entry: 7 - Data: 128|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 150|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: shooter + Data: customHandle - Name: k__BackingField Entry: 9 - Data: 125 + Data: 119 - Name: k__BackingField Entry: 9 - Data: 125 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2570,14 +2998,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 129|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 151|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 130|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 152|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2598,19 +3026,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: mainHandle + Data: bulletHolder - Name: $v Entry: 7 - Data: 131|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 153|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: mainHandle + Data: bulletHolder - Name: k__BackingField - Entry: 9 - Data: 105 + Entry: 7 + Data: 154|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Gun.GunBulletHolder, CenturionCC.System + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2625,14 +3059,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 132|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 155|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 133|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 156|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2653,19 +3087,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: subHandle + Data: animator - Name: $v Entry: 7 - Data: 134|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 157|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: subHandle + Data: animator - Name: k__BackingField Entry: 9 - Data: 105 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2680,14 +3114,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 135|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 158|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 136|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 159|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2708,19 +3142,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: customHandle + Data: magazineReceiver - Name: $v Entry: 7 - Data: 137|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: customHandle + Data: magazineReceiver - Name: k__BackingField Entry: 9 - Data: 105 + Data: 6 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2735,14 +3169,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 138|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 161|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 139|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 162|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2763,25 +3197,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: bulletHolder + Data: allowedMagazineTypes - Name: $v Entry: 7 - Data: 140|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 163|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: bulletHolder + Data: allowedMagazineTypes - Name: k__BackingField Entry: 7 - Data: 141|System.RuntimeType, mscorlib + Data: 164|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Gun.GunBulletHolder, CenturionCC.System + Data: System.Int32[], mscorlib - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 164 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2796,14 +3230,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 142|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 165|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 143|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 166|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2824,19 +3258,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: animator + Data: canShootWithoutMagazine - Name: $v Entry: 7 - Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 167|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: animator + Data: canShootWithoutMagazine - Name: k__BackingField Entry: 9 - Data: 3 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 3 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2851,14 +3285,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 168|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 169|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2882,13 +3316,13 @@ MonoBehaviour: Data: behaviour - Name: $v Entry: 7 - Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 170|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: behaviour - Name: k__BackingField Entry: 7 - Data: 148|System.RuntimeType, mscorlib + Data: 171|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.Behaviour.GunBehaviourBase, CenturionCC.System @@ -2897,7 +3331,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2912,14 +3346,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 149|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 150|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 173|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2943,13 +3377,13 @@ MonoBehaviour: Data: availableFireModes - Name: $v Entry: 7 - Data: 151|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: availableFireModes - Name: k__BackingField Entry: 7 - Data: 152|System.RuntimeType, mscorlib + Data: 175|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.FireMode[], CenturionCC.System @@ -2957,14 +3391,8 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 153|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32[], mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 164 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2979,14 +3407,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 154|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 176|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 155|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 177|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3010,13 +3438,13 @@ MonoBehaviour: Data: projectileData - Name: $v Entry: 7 - Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 178|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: projectileData - Name: k__BackingField Entry: 7 - Data: 157|System.RuntimeType, mscorlib + Data: 179|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.ProjectileDataProvider, CenturionCC.System @@ -3025,7 +3453,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3040,14 +3468,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 158|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 180|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 159|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 181|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3071,13 +3499,13 @@ MonoBehaviour: Data: audioData - Name: $v Entry: 7 - Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 182|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: audioData - Name: k__BackingField Entry: 7 - Data: 161|System.RuntimeType, mscorlib + Data: 183|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunAudioDataStore, CenturionCC.System @@ -3086,7 +3514,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3101,14 +3529,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 162|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 184|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 163|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 185|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3132,13 +3560,13 @@ MonoBehaviour: Data: hapticData - Name: $v Entry: 7 - Data: 164|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: hapticData - Name: k__BackingField Entry: 7 - Data: 165|System.RuntimeType, mscorlib + Data: 187|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunHapticDataStore, CenturionCC.System @@ -3147,7 +3575,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3162,14 +3590,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 166|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 188|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 167|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 189|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3193,16 +3621,16 @@ MonoBehaviour: Data: isDoubleHanded - Name: $v Entry: 7 - Data: 168|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 190|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: isDoubleHanded - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3217,14 +3645,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 169|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 170|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 192|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3248,16 +3676,16 @@ MonoBehaviour: Data: maxHoldDistance - Name: $v Entry: 7 - Data: 171|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 193|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: maxHoldDistance - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3272,14 +3700,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 194|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 173|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 195|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3303,16 +3731,16 @@ MonoBehaviour: Data: roundsPerSecond - Name: $v Entry: 7 - Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 196|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: roundsPerSecond - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3327,14 +3755,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 175|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 197|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 176|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 198|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3358,16 +3786,16 @@ MonoBehaviour: Data: requiredHolsterSize - Name: $v Entry: 7 - Data: 177|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 199|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: requiredHolsterSize - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3382,14 +3810,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 178|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 200|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 179|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 201|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3413,16 +3841,16 @@ MonoBehaviour: Data: mainHandlePitchOffset - Name: $v Entry: 7 - Data: 180|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 202|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandlePitchOffset - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3437,14 +3865,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 181|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 203|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 182|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 204|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3468,16 +3896,16 @@ MonoBehaviour: Data: mainHandleRePickupDelay - Name: $v Entry: 7 - Data: 183|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 205|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mainHandleRePickupDelay - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3492,14 +3920,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 184|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 206|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 185|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 207|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3523,16 +3951,16 @@ MonoBehaviour: Data: subHandleRePickupDelay - Name: $v Entry: 7 - Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 208|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: subHandleRePickupDelay - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3547,14 +3975,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 187|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 209|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 188|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 210|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3578,13 +4006,13 @@ MonoBehaviour: Data: objectType - Name: $v Entry: 7 - Data: 189|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 211|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectType - Name: k__BackingField Entry: 7 - Data: 190|System.RuntimeType, mscorlib + Data: 212|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.ObjectType, CenturionCC.System @@ -3593,7 +4021,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3608,14 +4036,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 213|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 192|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 214|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: ObjectMarker Properties @@ -3624,7 +4052,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 193|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 215|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3648,16 +4076,16 @@ MonoBehaviour: Data: objectWeight - Name: $v Entry: 7 - Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 216|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: objectWeight - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3672,14 +4100,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 195|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 217|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 196|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 218|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3703,13 +4131,13 @@ MonoBehaviour: Data: tags - Name: $v Entry: 7 - Data: 197|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: tags - Name: k__BackingField Entry: 7 - Data: 198|System.RuntimeType, mscorlib + Data: 220|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -3718,7 +4146,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 198 + Data: 220 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3733,14 +4161,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 199|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 221|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 200|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 222|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3764,13 +4192,13 @@ MonoBehaviour: Data: movementOption - Name: $v Entry: 7 - Data: 201|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 223|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: movementOption - Name: k__BackingField Entry: 7 - Data: 202|System.RuntimeType, mscorlib + Data: 224|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.MovementOption, CenturionCC.System @@ -3779,7 +4207,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3794,14 +4222,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 203|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 225|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 204|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 226|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Player Controller Properties @@ -3810,7 +4238,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 205|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 227|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3834,16 +4262,16 @@ MonoBehaviour: Data: walkSpeed - Name: $v Entry: 7 - Data: 206|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 228|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: walkSpeed - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3858,14 +4286,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 207|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 229|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 208|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 230|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3889,16 +4317,16 @@ MonoBehaviour: Data: sprintSpeed - Name: $v Entry: 7 - Data: 209|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 231|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintSpeed - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3913,14 +4341,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 210|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 211|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 233|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3944,16 +4372,16 @@ MonoBehaviour: Data: sprintThresholdMultiplier - Name: $v Entry: 7 - Data: 212|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 234|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: sprintThresholdMultiplier - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3968,14 +4396,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 213|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 235|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 214|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 236|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3999,13 +4427,13 @@ MonoBehaviour: Data: combatTag - Name: $v Entry: 7 - Data: 215|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 237|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTag - Name: k__BackingField Entry: 7 - Data: 216|System.RuntimeType, mscorlib + Data: 238|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.CombatTagOption, CenturionCC.System @@ -4014,7 +4442,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4029,14 +4457,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 217|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 239|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 218|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 240|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4060,16 +4488,16 @@ MonoBehaviour: Data: combatTagSpeedMultiplier - Name: $v Entry: 7 - Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 241|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagSpeedMultiplier - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4084,14 +4512,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 220|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 242|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 221|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 243|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4115,16 +4543,16 @@ MonoBehaviour: Data: combatTagTime - Name: $v Entry: 7 - Data: 222|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 244|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: combatTagTime - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4139,14 +4567,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 223|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 245|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 224|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 246|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4170,13 +4598,13 @@ MonoBehaviour: Data: logger - Name: $v Entry: 7 - Data: 225|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 247|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: logger - Name: k__BackingField Entry: 7 - Data: 226|System.RuntimeType, mscorlib + Data: 248|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Logger.PrintableBase, DerpyNewbie.Logger @@ -4185,7 +4613,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4200,20 +4628,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 227|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 249|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 228|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 250|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 229|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 251|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4237,13 +4665,13 @@ MonoBehaviour: Data: updateManager - Name: $v Entry: 7 - Data: 230|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 252|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: updateManager - Name: k__BackingField Entry: 7 - Data: 231|System.RuntimeType, mscorlib + Data: 253|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DerpyNewbie.Common.UpdateManager, DerpyNewbie.Common @@ -4252,7 +4680,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4267,20 +4695,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 254|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 233|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 255|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 234|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 256|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4304,13 +4732,13 @@ MonoBehaviour: Data: audioManager - Name: $v Entry: 7 - Data: 235|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 257|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: audioManager - Name: k__BackingField Entry: 7 - Data: 236|System.RuntimeType, mscorlib + Data: 258|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Audio.AudioManager, CenturionCC.System @@ -4319,7 +4747,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4334,20 +4762,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 237|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 259|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 238|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 260|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 239|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 261|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4371,13 +4799,13 @@ MonoBehaviour: Data: playerController - Name: $v Entry: 7 - Data: 240|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 262|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: playerController - Name: k__BackingField Entry: 7 - Data: 241|System.RuntimeType, mscorlib + Data: 263|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Utils.PlayerController, CenturionCC.System @@ -4386,7 +4814,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4401,20 +4829,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 242|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 264|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 243|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 265|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 244|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 266|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4438,16 +4866,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 245|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 267|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4462,14 +4890,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 246|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 268|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 247|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 269|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4493,13 +4921,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 248|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 270|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 249|System.RuntimeType, mscorlib + Data: 271|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunHolster, CenturionCC.System @@ -4508,7 +4936,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4523,7 +4951,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 250|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 272|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4548,16 +4976,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 251|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 273|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4572,14 +5000,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 252|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 274|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 253|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 275|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4603,16 +5031,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 254|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 276|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4627,7 +5055,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 255|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 277|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4652,16 +5080,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 256|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 278|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4676,7 +5104,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 257|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 279|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4701,16 +5129,16 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 258|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 280|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4725,7 +5153,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 259|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 281|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4750,13 +5178,13 @@ MonoBehaviour: Data: Model - Name: $v Entry: 7 - Data: 260|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 282|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Model - Name: k__BackingField Entry: 7 - Data: 261|System.RuntimeType, mscorlib + Data: 283|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject, UnityEngine.CoreModule @@ -4765,7 +5193,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 261 + Data: 283 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4780,20 +5208,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 262|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 284|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 263|JetBrains.Annotations.PublicAPIAttribute, UnityEngine.CoreModule + Data: 285|JetBrains.Annotations.PublicAPIAttribute, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 264|JetBrains.Annotations.CanBeNullAttribute, UnityEngine.CoreModule + Data: 286|JetBrains.Annotations.CanBeNullAttribute, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4817,7 +5245,7 @@ MonoBehaviour: Data: _animator - Name: $v Entry: 7 - Data: 265|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 287|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _animator @@ -4841,7 +5269,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 266|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 288|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4866,16 +5294,16 @@ MonoBehaviour: Data: _hasInit - Name: $v Entry: 7 - Data: 267|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 289|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _hasInit - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4890,7 +5318,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 268|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 290|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -4915,16 +5343,16 @@ MonoBehaviour: Data: _isOccupied - Name: $v Entry: 7 - Data: 269|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 291|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isOccupied - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4939,20 +5367,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 270|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 292|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 271|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 293|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 272|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 294|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -4976,16 +5404,16 @@ MonoBehaviour: Data: _variantDataUniqueId - Name: $v Entry: 7 - Data: 273|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 295|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _variantDataUniqueId - Name: k__BackingField Entry: 9 - Data: 50 + Data: 62 - Name: k__BackingField Entry: 9 - Data: 50 + Data: 62 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5000,20 +5428,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 274|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 296|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 275|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 297|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 276|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 298|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -5037,13 +5465,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 277|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 299|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 278|System.RuntimeType, mscorlib + Data: 300|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.GunManager, CenturionCC.System @@ -5052,7 +5480,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5067,7 +5495,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 279|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 301|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -5092,13 +5520,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 280|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 302|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 281|System.RuntimeType, mscorlib + Data: 303|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.BoxCollider, UnityEngine.PhysicsModule @@ -5107,7 +5535,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 281 + Data: 303 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5122,7 +5550,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 282|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 304|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -5147,13 +5575,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 283|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 305|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 284|System.RuntimeType, mscorlib + Data: 306|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Gun.DataStore.GunVariantDataStore, CenturionCC.System @@ -5162,7 +5590,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5177,7 +5605,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 285|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 307|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.cs b/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.cs index 785c8387..a11ebdb6 100644 --- a/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.cs +++ b/Packages/org.centurioncc.system/Runtime/Gun/MassGun/GunModel.cs @@ -48,13 +48,14 @@ public void OnGunUpdate() Internal_CheckForHandleDistance(); - if (TargetAnimator != null) + if (TargetAnimator) + { TargetAnimator.SetFloat(TriggerProgressAnimHash, GetMainTriggerPull()); - if (Behaviour != null) - Behaviour.OnGunUpdate(this); + TargetAnimator.SetInteger(CurrentBulletsCountAnimHash, MagazineRoundsRemaining); + } - if (!IsVR) - Internal_HandleDesktopInputs(); + if (Behaviour) + Behaviour.OnGunUpdate(this); if (IsInWall) { diff --git a/Packages/org.centurioncc.system/Runtime/Player/DamageDataSyncerManager.cs b/Packages/org.centurioncc.system/Runtime/Player/DamageDataSyncerManager.cs index 593eec75..528ae07c 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/DamageDataSyncerManager.cs +++ b/Packages/org.centurioncc.system/Runtime/Player/DamageDataSyncerManager.cs @@ -81,6 +81,7 @@ public override void OnHitDetection(PlayerCollider pCol, DamageData damageData, return; } + // TODO: ensure player id is not negative var victimId = pCol.player.PlayerId; var attackerId = damageData.DamagerPlayerId; diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.asset b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.asset index 0140178d..e9a937ec 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.asset +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 5 + Data: 8 - Name: Entry: 7 Data: @@ -242,16 +242,130 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _playerModel + Data: _colliders - Name: $v Entry: 7 Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _playerModel + Data: _colliders - Name: k__BackingField Entry: 7 Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Player.PlayerCollider[], CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 18|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: false + - Name: _fieldAttributes + Entry: 7 + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _followingPlayer + - Name: $v + Entry: 7 + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _followingPlayer + - Name: k__BackingField + Entry: 7 + Data: 21|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 21 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _playerModel + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _playerModel + - Name: k__BackingField + Entry: 7 + Data: 24|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Player.PlayerBase, CenturionCC.System @@ -275,7 +389,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -299,7 +413,7 @@ MonoBehaviour: Data: _transform - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _transform @@ -323,7 +437,61 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _vrcPlayerInvalid + - Name: $v + Entry: 7 + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _vrcPlayerInvalid + - Name: k__BackingField + Entry: 7 + Data: 29|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 29 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.cs b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.cs index 52b982a8..5b6c9525 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.cs +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/LightweightPlayerView.cs @@ -15,23 +15,25 @@ [SerializeField] [HideInInspector] [NewbieInject] [SerializeField] private PlayerCollider lwCollider; [SerializeField] private Transform groundPivot; + private PlayerCollider[] _colliders; + private VRCPlayerApi _followingPlayer; private PlayerBase _playerModel; private Transform _transform; + private bool _vrcPlayerInvalid = true; public override PlayerBase PlayerModel { get => _playerModel; set { - if (_playerModel == value) - return; + if (_playerModel == value) return; _playerModel = value; lwCollider.player = value; - UpdateView(); + UpdateTarget(); } } @@ -43,29 +45,24 @@ private void Start() public override void Init() { _transform = transform; + _colliders = new[] { lwCollider }; } public override PlayerCollider[] GetColliders() { - return new[] { lwCollider }; + return _colliders; } - public override void UpdateView() + public override void UpdateTarget() { + _followingPlayer = _playerModel ? _playerModel.VrcPlayer : null; + _vrcPlayerInvalid = !_playerModel || Utilities.IsValid(_followingPlayer); lwCollider.IsVisible = playerManager.IsDebug && _playerModel != null && _playerModel.IsAssigned; } public override void UpdateCollider() { - if (_playerModel == null) - { - MoveViewToOrigin(); - MoveCollidersToOrigin(); - return; - } - - var vrcPlayer = _playerModel.VrcPlayer; - if (!Utilities.IsValid(vrcPlayer)) + if (_vrcPlayerInvalid) { MoveViewToOrigin(); MoveCollidersToOrigin(); @@ -74,11 +71,11 @@ public override void UpdateCollider() // Utilities.IsValid will null-check vrcPlayer // ReSharper disable once PossibleNullReferenceException - var head = vrcPlayer.GetBonePosition(HumanBodyBones.Head); - var foot = (vrcPlayer.GetBonePosition(HumanBodyBones.LeftFoot) + - vrcPlayer.GetBonePosition(HumanBodyBones.RightFoot)) / 2F; + var head = _followingPlayer.GetBonePosition(HumanBodyBones.Head); + var foot = (_followingPlayer.GetBonePosition(HumanBodyBones.LeftFoot) + + _followingPlayer.GetBonePosition(HumanBodyBones.RightFoot)) / 2F; - _transform.SetPositionAndRotation(vrcPlayer.GetPosition(), vrcPlayer.GetRotation()); + _transform.SetPositionAndRotation(_followingPlayer.GetPosition(), _followingPlayer.GetRotation()); if (playerManager.IsStaffTeamId(_playerModel.TeamId)) { diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.asset b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.asset index dc02d540..6c2cc8b4 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.asset +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 13 + Data: 14 - Name: Entry: 7 Data: @@ -332,19 +332,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: playerView + Data: _audioManager - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: playerView + Data: _audioManager - Name: k__BackingField Entry: 7 Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Player.MassPlayer.PlayerViewBase, CenturionCC.System + Data: CenturionCC.System.Audio.AudioManager, CenturionCC.System - Name: Entry: 8 Data: @@ -362,19 +362,13 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 22|JetBrains.Annotations.CanBeNullAttribute, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -392,19 +386,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _audioManager + Data: _cachedRoleData - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _audioManager + Data: _cachedRoleData - Name: k__BackingField Entry: 7 - Data: 24|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CenturionCC.System.Audio.AudioManager, CenturionCC.System + Data: DerpyNewbie.Common.Role.RoleData, DerpyNewbie.Common - Name: Entry: 8 Data: @@ -425,7 +419,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -446,25 +440,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _cachedRoleData + Data: _cachedVrcPlayerApi - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _cachedRoleData + Data: _cachedVrcPlayerApi - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: DerpyNewbie.Common.Role.RoleData, DerpyNewbie.Common + Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -479,7 +473,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -503,13 +497,13 @@ MonoBehaviour: Data: _footstepAudio - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _footstepAudio - Name: k__BackingField Entry: 7 - Data: 30|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Audio.FootstepAudioStore, CenturionCC.System @@ -533,7 +527,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -554,31 +548,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _syncedIsDead + Data: _playerView - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _syncedIsDead + Data: _playerView - Name: k__BackingField Entry: 7 - Data: 33|System.RuntimeType, mscorlib + Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib + Data: CenturionCC.System.Player.MassPlayer.PlayerViewBase, CenturionCC.System - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 33 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -587,22 +581,70 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 34|JetBrains.Annotations.CanBeNullAttribute, 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: _playerViewNull + - Name: $v + Entry: 7 + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _playerViewNull + - Name: k__BackingField + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField Entry: 7 - Data: 36|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: - Name: Entry: 8 Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 - Name: Entry: 13 Data: @@ -620,19 +662,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _syncedPlayerId + Data: _syncedIsDead - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _syncedPlayerId + Data: _syncedIsDead - Name: k__BackingField Entry: 9 - Data: 8 + Data: 36 - Name: k__BackingField Entry: 9 - Data: 8 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -647,19 +689,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 40|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 41|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -680,13 +722,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _syncedTeamId + Data: _syncedPlayerId - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _syncedTeamId + Data: _syncedPlayerId - Name: k__BackingField Entry: 9 Data: 8 @@ -707,19 +749,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 44|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 44|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 45|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -740,43 +782,49 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: cachedVrcPlayerApi + Data: _syncedTeamId - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: cachedVrcPlayerApi + Data: _syncedTeamId - Name: k__BackingField - Entry: 7 - Data: 46|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 46 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 2 + - Name: + Entry: 7 + Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 49|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.cs b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.cs index 2227b067..3772f177 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.cs +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerModel.cs @@ -17,13 +17,18 @@ public class PlayerModel : PlayerBase [SerializeField] [HideInInspector] [NewbieInject] private PlayerManager playerManager; - [CanBeNull] public PlayerViewBase playerView; - private AudioManager _audioManager; private RoleData _cachedRoleData; + private VRCPlayerApi _cachedVrcPlayerApi; + private FootstepAudioStore _footstepAudio; + [CanBeNull] + private PlayerViewBase _playerView; + + private bool _playerViewNull = true; + [UdonSynced] [FieldChangeCallback(nameof(SyncedIsDead))] private bool _syncedIsDead; @@ -33,7 +38,16 @@ [UdonSynced] [FieldChangeCallback(nameof(SyncedPlayerId))] [UdonSynced] [FieldChangeCallback(nameof(SyncedTeamId))] private int _syncedTeamId; - public VRCPlayerApi cachedVrcPlayerApi; + [CanBeNull] + public PlayerViewBase PlayerView + { + get => _playerView; + set + { + _playerView = value; + _playerViewNull = !value; + } + } public int SyncedPlayerId { @@ -45,8 +59,8 @@ protected set var lastAssigned = IsAssigned; _syncedPlayerId = value; - cachedVrcPlayerApi = VRCPlayerApi.GetPlayerById(value); - _cachedRoleData = playerManager.RoleManager.GetPlayerRole(cachedVrcPlayerApi); + _cachedVrcPlayerApi = VRCPlayerApi.GetPlayerById(value); + _cachedRoleData = playerManager.RoleManager.GetPlayerRole(_cachedVrcPlayerApi); playerManager.Invoke_OnPlayerChanged(this, lastPlayerId, lastRole.HasPermission(), lastAssigned); if (Networking.IsMaster && lastPlayerId != value) @@ -92,7 +106,7 @@ protected set public override bool IsDead => SyncedIsDead; public override bool IsAssigned => VrcPlayer != null && VrcPlayer.IsValid(); - public override VRCPlayerApi VrcPlayer => cachedVrcPlayerApi; + public override VRCPlayerApi VrcPlayer => _cachedVrcPlayerApi; public override RoleData Role => _cachedRoleData; // Utilities.IsValid checks if it is null or not. @@ -125,10 +139,10 @@ public override void SetTeam(int teamId) public override void UpdateView() { - if (playerView == null) - return; - - playerView.UpdateView(); + if (_playerViewNull) return; + // playerViewNull will be set when playerView was changed + // ReSharper disable once PossibleNullReferenceException + _playerView.UpdateTarget(); } public override void Sync() diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerUpdater.cs b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerUpdater.cs index d67cc067..acd4bb39 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerUpdater.cs +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerUpdater.cs @@ -127,7 +127,7 @@ public string GetOrder() { var m = _distanceSortedModels[i]; r += - $"\n{i}: {m.name}, {(m.playerView != null ? m.playerView.name : null)}, {m.Position.ToString("F2")}, {NewbieUtils.GetPlayerName(m.PlayerId)}"; + $"\n{i}: {m.name}, {(m.PlayerView != null ? m.PlayerView.name : null)}, {m.Position.ToString("F2")}, {NewbieUtils.GetPlayerName(m.PlayerId)}"; } return r; @@ -166,11 +166,11 @@ private void SortStep() { var view = _views[index]; view.PlayerModel = modelAtIndex; - modelAtIndex.playerView = view; + modelAtIndex.PlayerView = view; } else { - modelAtIndex.playerView = null; + modelAtIndex.PlayerView = null; } } @@ -185,49 +185,19 @@ private void PairViewAndModel() { if (i < _views.Length) { - _distanceSortedModels[i].playerView = _views[i]; + _distanceSortedModels[i].PlayerView = _views[i]; _views[i].PlayerModel = _distanceSortedModels[i]; } else { - _distanceSortedModels[i].playerView = null; + _distanceSortedModels[i].PlayerView = null; } } } private void ViewUpdate() { - foreach (var view in _views) - view.UpdateCollider(); - - // if (!playerManager.IsDebug) return; - // - // foreach (var view in views) - // { - // var modelName = "N/A"; - // var playerId = 0; - // var teamId = 0; - // var kills = 0; - // var deaths = 0; - // var kdr = float.NaN; - // - // if (view.playerModel != null) - // { - // var model = view.playerModel; - // modelName = model.name; - // playerId = model.PlayerId; - // teamId = model.TeamId; - // kills = model.Kills; - // deaths = model.Deaths; - // kdr = kills / (float)deaths; - // } - // - // view.playerTag.SetDebugTagText($"Name : {view.name}\n" + - // $"Model : {modelName}\n" + - // $"Player: {playerId}\n" + - // $"Team : {teamId}\n" + - // $"KD(R) : {kills}/{deaths} ({kdr})"); - // } + foreach (var view in _views) view.UpdateCollider(); } } } \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.asset b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.asset index a96daaed..86130e60 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.asset +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 18 + Data: 21 - Name: Entry: 7 Data: @@ -614,10 +614,124 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _headTransform + Data: _colliders - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _colliders + - Name: k__BackingField + Entry: 7 + Data: 37|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CenturionCC.System.Player.PlayerCollider[], CenturionCC.System + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 38|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: false + - Name: _fieldAttributes + Entry: 7 + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _followingPlayer + - Name: $v + Entry: 7 + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _followingPlayer + - Name: k__BackingField + Entry: 7 + Data: 41|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 41 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _headTransform + - Name: $v + Entry: 7 + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _headTransform @@ -641,7 +755,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -665,7 +779,7 @@ MonoBehaviour: Data: _leftLowerLegTransform - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _leftLowerLegTransform @@ -689,7 +803,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -713,7 +827,7 @@ MonoBehaviour: Data: _leftUpperArmTransform - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _leftUpperArmTransform @@ -737,7 +851,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -761,7 +875,7 @@ MonoBehaviour: Data: _leftUpperLegTransform - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _leftUpperLegTransform @@ -785,7 +899,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -809,13 +923,13 @@ MonoBehaviour: Data: _playerModel - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _playerModel - Name: k__BackingField Entry: 7 - Data: 45|System.RuntimeType, mscorlib + Data: 52|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CenturionCC.System.Player.PlayerBase, CenturionCC.System @@ -839,7 +953,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -863,7 +977,7 @@ MonoBehaviour: Data: _rightLowerLegTransform - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _rightLowerLegTransform @@ -887,7 +1001,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -911,7 +1025,7 @@ MonoBehaviour: Data: _rightUpperArmTransform - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _rightUpperArmTransform @@ -935,7 +1049,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -959,7 +1073,7 @@ MonoBehaviour: Data: _rightUpperLegTransform - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _rightUpperLegTransform @@ -983,7 +1097,61 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _vrcPlayerInvalid + - Name: $v + Entry: 7 + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _vrcPlayerInvalid + - Name: k__BackingField + Entry: 7 + Data: 61|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 61 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.cs b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.cs index 7ae3c290..eb960f85 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.cs +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerView.cs @@ -22,30 +22,32 @@ [SerializeField] [HideInInspector] [NewbieInject] private Transform _bodyTransform; + private PlayerCollider[] _colliders; + private VRCPlayerApi _followingPlayer; + private Transform _headTransform; private Transform _leftLowerLegTransform; private Transform _leftUpperArmTransform; private Transform _leftUpperLegTransform; - private PlayerBase _playerModel; + private Transform _rightLowerLegTransform; private Transform _rightUpperArmTransform; private Transform _rightUpperLegTransform; + private bool _vrcPlayerInvalid = true; public override PlayerBase PlayerModel { get => _playerModel; set { - if (_playerModel == value) - return; + if (_playerModel == value) return; _playerModel = value; - var pcs = GetColliders(); foreach (var pc in pcs) pc.player = value; - UpdateView(); + UpdateTarget(); } } @@ -67,11 +69,8 @@ public override void Init() _leftLowerLegTransform = leftLowerLegCollider.transform; _rightLowerLegTransform = rightLowerLegCollider.transform; - } - public override PlayerCollider[] GetColliders() - { - return new[] + _colliders = new[] { headCollider, bodyCollider, leftUpperArmCollider, rightUpperArmCollider, @@ -80,23 +79,23 @@ public override PlayerCollider[] GetColliders() }; } - public override void UpdateView() + public override PlayerCollider[] GetColliders() + { + return _colliders; + } + + public override void UpdateTarget() { + _followingPlayer = _playerModel ? _playerModel.VrcPlayer : null; + _vrcPlayerInvalid = !_playerModel || !Utilities.IsValid(_followingPlayer); + foreach (var playerCollider in GetColliders()) - playerCollider.IsVisible = playerManager.IsDebug && _playerModel != null && _playerModel.IsAssigned; + playerCollider.IsVisible = playerManager.IsDebug && _playerModel && _playerModel.IsAssigned; } public override void UpdateCollider() { - if (_playerModel == null) - { - MoveViewToOrigin(); - MoveCollidersToOrigin(); - return; - } - - var vrcPlayer = _playerModel.VrcPlayer; - if (!Utilities.IsValid(vrcPlayer)) + if (_vrcPlayerInvalid) { MoveViewToOrigin(); MoveCollidersToOrigin(); @@ -105,22 +104,22 @@ public override void UpdateCollider() // Utilities.IsValid will null-check vrcPlayer // ReSharper disable once PossibleNullReferenceException - var head = vrcPlayer.GetBonePosition(HumanBodyBones.Head); - var neck = vrcPlayer.GetBonePosition(HumanBodyBones.Neck); - var chest = vrcPlayer.GetBonePosition(HumanBodyBones.Chest); - var hips = vrcPlayer.GetBonePosition(HumanBodyBones.Hips); - var leftUpperArm = vrcPlayer.GetBonePosition(HumanBodyBones.LeftUpperArm); - var leftLowerArm = vrcPlayer.GetBonePosition(HumanBodyBones.LeftLowerArm); - var leftUpperLeg = vrcPlayer.GetBonePosition(HumanBodyBones.LeftUpperLeg); - var leftLowerLeg = vrcPlayer.GetBonePosition(HumanBodyBones.LeftLowerLeg); - var leftFoot = vrcPlayer.GetBonePosition(HumanBodyBones.LeftFoot); - var rightUpperArm = vrcPlayer.GetBonePosition(HumanBodyBones.RightUpperArm); - var rightLowerArm = vrcPlayer.GetBonePosition(HumanBodyBones.RightLowerArm); - var rightUpperLeg = vrcPlayer.GetBonePosition(HumanBodyBones.RightUpperLeg); - var rightLowerLeg = vrcPlayer.GetBonePosition(HumanBodyBones.RightLowerLeg); - var rightFoot = vrcPlayer.GetBonePosition(HumanBodyBones.RightFoot); - - transform.SetPositionAndRotation(vrcPlayer.GetPosition(), vrcPlayer.GetRotation()); + var head = _followingPlayer.GetBonePosition(HumanBodyBones.Head); + var neck = _followingPlayer.GetBonePosition(HumanBodyBones.Neck); + var chest = _followingPlayer.GetBonePosition(HumanBodyBones.Chest); + var hips = _followingPlayer.GetBonePosition(HumanBodyBones.Hips); + var leftUpperArm = _followingPlayer.GetBonePosition(HumanBodyBones.LeftUpperArm); + var leftLowerArm = _followingPlayer.GetBonePosition(HumanBodyBones.LeftLowerArm); + var leftUpperLeg = _followingPlayer.GetBonePosition(HumanBodyBones.LeftUpperLeg); + var leftLowerLeg = _followingPlayer.GetBonePosition(HumanBodyBones.LeftLowerLeg); + var leftFoot = _followingPlayer.GetBonePosition(HumanBodyBones.LeftFoot); + var rightUpperArm = _followingPlayer.GetBonePosition(HumanBodyBones.RightUpperArm); + var rightLowerArm = _followingPlayer.GetBonePosition(HumanBodyBones.RightLowerArm); + var rightUpperLeg = _followingPlayer.GetBonePosition(HumanBodyBones.RightUpperLeg); + var rightLowerLeg = _followingPlayer.GetBonePosition(HumanBodyBones.RightLowerLeg); + var rightFoot = _followingPlayer.GetBonePosition(HumanBodyBones.RightFoot); + + transform.SetPositionAndRotation(_followingPlayer.GetPosition(), _followingPlayer.GetRotation()); if (playerManager.IsStaffTeamId(_playerModel.TeamId)) { diff --git a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerViewBase.cs b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerViewBase.cs index 99bc883d..6f9f4650 100644 --- a/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerViewBase.cs +++ b/Packages/org.centurioncc.system/Runtime/Player/MassPlayer/PlayerViewBase.cs @@ -11,7 +11,7 @@ public virtual void Init() { } - public abstract void UpdateView(); + public abstract void UpdateTarget(); public abstract void UpdateCollider(); } } \ No newline at end of file diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/AC_DefaultCocking.controller b/Packages/org.centurioncc.system/Samples/Animations/Default/AC_DefaultCocking.controller index 342bb658..5701dbe5 100644 --- a/Packages/org.centurioncc.system/Samples/Animations/Default/AC_DefaultCocking.controller +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/AC_DefaultCocking.controller @@ -72,6 +72,58 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-8176961067861007748 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: HasMagazine + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7647142972497945200} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-7647142972497945200 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_MAGAZINE_IDLE + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2764632744171555508} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 586e320fa4a7994428062f0823cd6f6f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-7601609483871372580 AnimatorStateMachine: serializedVersion: 6 @@ -97,6 +149,34 @@ AnimatorStateMachine: m_ExitPosition: {x: 900, y: 100, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -6425481294251622977} +--- !u!1107 &-7580177412430824694 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Global_HasMagazine + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7647142972497945200} + m_Position: {x: 300, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6032343199058681170} + m_Position: {x: 550, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1845850237250689623} + m_Position: {x: 420, y: 170, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 1070, y: 100, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7647142972497945200} --- !u!1101 &-7168409744931780290 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -174,6 +254,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-6035036022489666507 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: State + m_EventTreshold: 4 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3371365404244618426} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-6032343199058681170 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_MAGAZINE_INSERTING + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5307558045845105016} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2419fc4e6e094d0478a20e55fcb8cabd, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-5913742644181263169 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -226,6 +358,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-5307558045845105016 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1845850237250689623} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4983884348247331534 AnimatorState: serializedVersion: 6 @@ -253,6 +407,33 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-3371365404244618426 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_COCKING_HOLD_OPEN + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1210052330016994064} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 6c88d1b516041f9499f15c054f3770f2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-3319797899021749538 AnimatorState: serializedVersion: 6 @@ -395,97 +576,115 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: CockingProgress m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: CockingTwist m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsPickedUp m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsPickedUpGlobal m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsInWall m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsInSafeZone m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsLocal m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsVR m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: HasBullet m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: HasCocked m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsShooting m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsShootingEmpty m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: SelectorType m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: State m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Trigger m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: CurrentBulletsCount + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ReservedBulletsCount + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: HasMagazine + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -595,6 +794,18 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Global_HasMagazine + m_StateMachine: {fileID: -7580177412430824694} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} --- !u!1102 &331155756983632913 AnimatorState: serializedVersion: 6 @@ -762,6 +973,7 @@ AnimatorState: m_Transitions: - {fileID: 1101722249413111698} - {fileID: 2309313862889981368} + - {fileID: -6035036022489666507} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1047,6 +1259,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -5896640916769928062} m_Position: {x: 240, y: 30, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3371365404244618426} + m_Position: {x: 240, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -1057,6 +1272,58 @@ AnimatorStateMachine: m_ExitPosition: {x: 960, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102054312023614604} +--- !u!1101 &1210052330016994064 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 7 + m_ConditionEvent: State + m_EventTreshold: 4 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102054312023614604} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1845850237250689623 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_MAGAZINE_INSERTED + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8176961067861007748} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: af4adc7231967c24c84c0f39afe52e17, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &2309313862889981368 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -1134,6 +1401,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &2764632744171555508 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: HasMagazine + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6032343199058681170} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &4429854761972850595 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_COCKING_HOLD_OPEN.anim b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_COCKING_HOLD_OPEN.anim new file mode 100644 index 00000000..79798e27 --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_COCKING_HOLD_OPEN.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_COCKING_HOLD_OPEN + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_COCKING_HOLD_OPEN.anim.meta b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_COCKING_HOLD_OPEN.anim.meta new file mode 100644 index 00000000..815030fc --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_COCKING_HOLD_OPEN.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c88d1b516041f9499f15c054f3770f2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_IDLE.anim b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_IDLE.anim new file mode 100644 index 00000000..30b57af6 --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_IDLE.anim @@ -0,0 +1,169 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_MAGAZINE_IDLE + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Null + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2247709553 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Null + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Null + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Null + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_IDLE.anim.meta b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_IDLE.anim.meta new file mode 100644 index 00000000..4417446a --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_IDLE.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 586e320fa4a7994428062f0823cd6f6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTED.anim b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTED.anim new file mode 100644 index 00000000..7f228d07 --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTED.anim @@ -0,0 +1,169 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_MAGAZINE_INSERTED + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Null + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2247709553 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Null + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Null + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Null + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTED.anim.meta b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTED.anim.meta new file mode 100644 index 00000000..a67237bb --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTED.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af4adc7231967c24c84c0f39afe52e17 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTING.anim b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTING.anim new file mode 100644 index 00000000..1bb7ce62 --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTING.anim @@ -0,0 +1,169 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GLOBAL_MAGAZINE_INSERTING + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Null + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2247709553 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Null + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Null + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Null + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTING.anim.meta b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTING.anim.meta new file mode 100644 index 00000000..69008712 --- /dev/null +++ b/Packages/org.centurioncc.system/Samples/Animations/Default/GLOBAL_MAGAZINE_INSERTING.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2419fc4e6e094d0478a20e55fcb8cabd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Samples/Materials/M_Trail.mat b/Packages/org.centurioncc.system/Samples/Materials/M_Trail.mat index 625ac188..f510a0ea 100644 --- a/Packages/org.centurioncc.system/Samples/Materials/M_Trail.mat +++ b/Packages/org.centurioncc.system/Samples/Materials/M_Trail.mat @@ -2,21 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_Trail m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,6 +60,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -95,3 +100,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Packages/org.centurioncc.system/Samples/Prefabs/Systems/MassGun/GunModel.prefab b/Packages/org.centurioncc.system/Samples/Prefabs/Systems/MassGun/GunModel.prefab index 90ea356e..efc72698 100644 --- a/Packages/org.centurioncc.system/Samples/Prefabs/Systems/MassGun/GunModel.prefab +++ b/Packages/org.centurioncc.system/Samples/Prefabs/Systems/MassGun/GunModel.prefab @@ -27,16 +27,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3995102402883227094} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3395188381414368071} - {fileID: 5892977959011430857} - {fileID: 5788829481240152289} - {fileID: 5862062731356601620} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6932262152221869789 MonoBehaviour: @@ -68,6 +69,9 @@ MonoBehaviour: customHandle: {fileID: 1779676486330977144} bulletHolder: {fileID: 0} animator: {fileID: 0} + magazineReceiver: {fileID: 0} + allowedMagazineTypes: + canShootWithoutMagazine: 1 behaviour: {fileID: 0} availableFireModes: 01000000 projectileData: {fileID: 0} @@ -104,9 +108,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3995102402883227094} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.1, y: 0.1, z: 0.1} m_Center: {x: 0, y: -1, z: 0} --- !u!54 &7677184850373632491 @@ -116,10 +128,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3995102402883227094} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -145,8 +168,7 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 46b3d196f1ae9b64eb395ecac01efd12, - type: 2} + serializedProgramAsset: {fileID: 11400000, guid: 46b3d196f1ae9b64eb395ecac01efd12, type: 2} programSource: {fileID: 11400000, guid: 9d68084edac9ffc41af519660ab22be2, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] @@ -174,125 +196,103 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7136613846327971491} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1681763169661303168} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &5191369757376505458 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1681763169661303168} m_Modifications: - - target: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + objectReference: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2523989105462289812, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 2523989105462289812, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: orientation value: 0 objectReference: {fileID: 0} - - target: {fileID: 2641422416266906152, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 2641422416266906152, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: serializedProgramAsset value: - objectReference: {fileID: 11400000, guid: b0fc6aac21c6f6547b70e1a8c22422d8, - type: 2} - - target: {fileID: 5351564290296862675, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + objectReference: {fileID: 11400000, guid: b0fc6aac21c6f6547b70e1a8c22422d8, type: 2} + - target: {fileID: 5351564290296862675, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} - - target: {fileID: 5749588834234327608, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 5749588834234327608, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Name value: CustomGunHandle objectReference: {fileID: 0} - - target: {fileID: 5837890287203497072, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 5837890287203497072, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} - - target: {fileID: 8913374628056476637, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 8913374628056476637, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8867494980231511705, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} ---- !u!4 &5862062731356601620 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} - m_PrefabInstance: {fileID: 5191369757376505458} - m_PrefabAsset: {fileID: 0} --- !u!114 &1779676486330977144 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + m_CorrespondingSourceObject: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} m_PrefabInstance: {fileID: 5191369757376505458} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -301,112 +301,95 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ee9c786c0cc58f04e92af5a367238c52, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &5862062731356601620 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} + m_PrefabInstance: {fileID: 5191369757376505458} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5231310916433488559 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1681763169661303168} m_Modifications: - - target: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + objectReference: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2641422416266906152, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 2641422416266906152, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: serializedProgramAsset value: - objectReference: {fileID: 11400000, guid: b0fc6aac21c6f6547b70e1a8c22422d8, - type: 2} - - target: {fileID: 5351564290296862675, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + objectReference: {fileID: 11400000, guid: b0fc6aac21c6f6547b70e1a8c22422d8, type: 2} + - target: {fileID: 5351564290296862675, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} - - target: {fileID: 5749588834234327608, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 5749588834234327608, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Name value: MainGunHandle objectReference: {fileID: 0} - - target: {fileID: 5837890287203497072, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 5837890287203497072, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} - - target: {fileID: 8913374628056476637, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 8913374628056476637, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} ---- !u!4 &5892977959011430857 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} - m_PrefabInstance: {fileID: 5231310916433488559} - m_PrefabAsset: {fileID: 0} --- !u!114 &1738535210499852197 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + m_CorrespondingSourceObject: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} m_PrefabInstance: {fileID: 5231310916433488559} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -415,112 +398,95 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ee9c786c0cc58f04e92af5a367238c52, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &5892977959011430857 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} + m_PrefabInstance: {fileID: 5231310916433488559} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5262249503390552967 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1681763169661303168} m_Modifications: - - target: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + objectReference: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2641422416266906152, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 2641422416266906152, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: serializedProgramAsset value: - objectReference: {fileID: 11400000, guid: b0fc6aac21c6f6547b70e1a8c22422d8, - type: 2} - - target: {fileID: 5351564290296862675, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + objectReference: {fileID: 11400000, guid: b0fc6aac21c6f6547b70e1a8c22422d8, type: 2} + - target: {fileID: 5351564290296862675, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} - - target: {fileID: 5749588834234327608, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 5749588834234327608, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Name value: SubGunHandle objectReference: {fileID: 0} - - target: {fileID: 5837890287203497072, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 5837890287203497072, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} - - target: {fileID: 8913374628056476637, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + - target: {fileID: 8913374628056476637, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} ---- !u!4 &5788829481240152289 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} - m_PrefabInstance: {fileID: 5262249503390552967} - m_PrefabAsset: {fileID: 0} --- !u!114 &1855088412834381453 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, - type: 3} + m_CorrespondingSourceObject: {fileID: -3406448514677445366, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} m_PrefabInstance: {fileID: 5262249503390552967} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -529,3 +495,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ee9c786c0cc58f04e92af5a367238c52, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &5788829481240152289 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1824320365526063974, guid: 270316a0ca5404e4485b58d6f9731baa, type: 3} + m_PrefabInstance: {fileID: 5262249503390552967} + m_PrefabAsset: {fileID: 0} diff --git a/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag.png.meta b/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag.png.meta index acfebc8b..bd455dcb 100644 --- a/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag.png.meta +++ b/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag.png.meta @@ -30,7 +30,7 @@ TextureImporter: 213: 10503489042567317 second: T_StaffTeamTag externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -47,9 +47,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -81,10 +84,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -96,6 +104,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -108,6 +117,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -120,6 +130,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -324,9 +335,18 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + T_Creator: -1045020776354450873 + T_Dev: 1298198178494534672 + T_LocalHit: 8307519290502132361 + T_Master: 5170356158729723843 + T_Owner: 7522534649838320015 + T_RemoteHit: -583039276462248095 + T_Staff: 3902271907709959957 + T_StaffTeamTag: 10503489042567317 + T_TeamMarker: -5592695418564302548 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag2.png.meta b/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag2.png.meta index c4e4a7f0..7a0852ad 100644 --- a/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag2.png.meta +++ b/Packages/org.centurioncc.system/Samples/Textures/T_AdditionalTag2.png.meta @@ -12,7 +12,7 @@ TextureImporter: 213: 4527995327469343378 second: T_AdditionalTag2_Staff externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,10 +66,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -78,6 +86,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,6 +99,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -102,6 +112,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -180,9 +191,12 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + T_AdditionalTag2_RedTeam: 3239121061915714545 + T_AdditionalTag2_Staff: 4527995327469343378 + T_AdditionalTag2_YellowTeam: -6768393307151243553 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Samples/Textures/T_NotificationIcons.png.meta b/Packages/org.centurioncc.system/Samples/Textures/T_NotificationIcons.png.meta index a6ab0e34..67ec56d6 100644 --- a/Packages/org.centurioncc.system/Samples/Textures/T_NotificationIcons.png.meta +++ b/Packages/org.centurioncc.system/Samples/Textures/T_NotificationIcons.png.meta @@ -15,7 +15,7 @@ TextureImporter: 213: -112345115446976277 second: T_Notification_Help externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -32,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -66,10 +69,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -81,6 +89,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -93,6 +102,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -105,6 +115,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -204,9 +215,13 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + T_Notification_Error: 5044791132789640496 + T_Notification_Help: -112345115446976277 + T_Notification_Info: 3032906736800463177 + T_Notification_Warning: 9020437844946098157 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Packages/org.centurioncc.system/Samples/Textures/T_SampleHitAtlas.png.meta b/Packages/org.centurioncc.system/Samples/Textures/T_SampleHitAtlas.png.meta index 0b2e44aa..d037a733 100644 --- a/Packages/org.centurioncc.system/Samples/Textures/T_SampleHitAtlas.png.meta +++ b/Packages/org.centurioncc.system/Samples/Textures/T_SampleHitAtlas.png.meta @@ -12,7 +12,7 @@ TextureImporter: 213: -263716364795284250 second: T_SampleHitAtlas_2 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,10 +66,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -78,6 +86,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,6 +99,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -102,6 +112,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -180,9 +191,12 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + T_SampleHitAtlas_0: 3444269977315650549 + T_SampleHitAtlas_1: -4633723180024674719 + T_SampleHitAtlas_2: -263716364795284250 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index 536f2d32..4a40d89e 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -23,14 +23,14 @@ "dependencies": {} }, "dev.derpynewbie.logger": { - "version": "0.1.11", + "version": "0.2.1", "dependencies": { "com.vrchat.worlds": "^3.4.0", - "dev.derpynewbie.common": "0.3.x" + "dev.derpynewbie.common": ">=0.4.0" } }, "dev.derpynewbie.common": { - "version": "0.3.7", + "version": "0.4.0", "dependencies": { "com.vrchat.worlds": "^3.4.0" } diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index d29e1f41..aff1e65a 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: dfafff1fdfafff0fdfafff0fffffff0fdfafff0fc800c00fffffff0fffffff0fdfafff0fdf09fc0fdf09fc0fdfafffdfc800c00fdfe9c30fc820c00fdfa9ff0fdfa9ff0fdfa9ffcfdf8fff2fdf8fff0fdf8fff0fdf8fff0fffffff0fffffff0fffffff0fffffff0fffffff0fffffff0f010800c0000004800008025000080230 + m_LayerCollisionMatrix: dfafff1fdfafff07dfafff07ffffff0fdfafff07c800c007ffffff0fffffff0fdfafff07df09fc07df09fc07dfafffdfc800c007dfe9c307c820c007dfa9ff07dfa9ff07dfa9ffc7df8fff27df8fff07df8fff07df8fff07ffffff0fffffff0fffffff0fffffff0fffffff0fc908c0cf010800c0000004800008025800080238 m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 31faccb7..c6e1cb26 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -28,7 +28,10 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: [] + m_AlwaysIncludedShaders: + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a0114b73..b44a7ac2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -622,7 +622,7 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: UNITY_POST_PROCESSING_STACK_V2;UDON;VRC_SDK_VRCSDK3;UDONSHARP + 1: UNITY_POST_PROCESSING_STACK_V2;UDON;VRC_SDK_VRCSDK3;UDONSHARP;CENTURIONSYSTEM_VERBOSE_LOGGING 7: UNITY_POST_PROCESSING_STACK_V2 13: UNITY_POST_PROCESSING_STACK_V2 14: UNITY_POST_PROCESSING_STACK_V2 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a16a18c7..382077e4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -32,7 +32,7 @@ TagManager: - - - - - + - GameMagazine - GamePickup - GamePlayer - GameGun