From f4dc5dd668cd527510de83adc4c782e7787f718b Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Tue, 16 Sep 2025 13:52:20 -0400 Subject: [PATCH] Podium pedestal height is now synced across clients. --- Assets/Prefabs/Player Podium.prefab | 58 +- Assets/UdonSharp/Podium/PlayerPodium.asset | 759 +++++++++++---------- Assets/UdonSharp/Podium/PlayerPodium.cs | 24 +- 3 files changed, 456 insertions(+), 385 deletions(-) diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index 650aa12..e7cd090 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -383,7 +383,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -511,7 +511,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -846,7 +846,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -934,7 +934,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1213,7 +1213,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1299,7 +1299,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1502,7 +1502,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1608,7 +1608,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1624,6 +1624,7 @@ MonoBehaviour: _RiskCards: {fileID: 5882532645313673403} _Buzzer: {fileID: 1145695079806890482} _Pedestal: {fileID: 6438408659115984156} + _VideoLoadIndicator: {fileID: 0} _AuxiliaryVideoScreen: {fileID: 0} _AuxiliaryMapScreen: {fileID: 0} _OwnershipInteract: {fileID: 2288460166211710674} @@ -1709,7 +1710,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1759,7 +1760,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1809,7 +1810,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1946,7 +1947,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 + SerializedFormat: 0 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -2407,8 +2408,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2536,8 +2536,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2665,8 +2664,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2794,8 +2792,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2913,8 +2910,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -3141,8 +3137,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -3385,8 +3380,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -3509,8 +3503,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -3614,8 +3607,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -3743,8 +3735,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -3832,8 +3823,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name diff --git a/Assets/UdonSharp/Podium/PlayerPodium.asset b/Assets/UdonSharp/Podium/PlayerPodium.asset index 7b7138d..fc63444 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.asset +++ b/Assets/UdonSharp/Podium/PlayerPodium.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 24 + Data: 25 - Name: Entry: 7 Data: @@ -536,10 +536,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _EnableOwnershipTransfer + Data: _PedestalHeight - Name: $v Entry: 7 Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PedestalHeight + - Name: k__BackingField + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, 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: 3 + Data: 1 + - 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: 2 + - Name: + Entry: 7 + Data: 38|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 39|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: _EnableOwnershipTransfer + - Name: $v + Entry: 7 + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EnableOwnershipTransfer @@ -563,19 +629,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 42|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 38|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 43|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -599,13 +665,13 @@ MonoBehaviour: Data: _ChoiceCards - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ChoiceCards - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 45|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ChoiceCardGroup, Assembly-CSharp @@ -629,13 +695,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 42|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 47|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -644,7 +710,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 43|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 48|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Objects @@ -653,7 +719,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -677,13 +743,13 @@ MonoBehaviour: Data: _RiskCards - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RiskCards - Name: k__BackingField Entry: 7 - Data: 46|System.RuntimeType, mscorlib + Data: 51|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RiskCardGroup, Assembly-CSharp @@ -707,13 +773,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 47|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: 48|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -737,13 +803,13 @@ MonoBehaviour: Data: _Buzzer - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Buzzer - Name: k__BackingField Entry: 7 - Data: 50|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Buzzer, Assembly-CSharp @@ -767,13 +833,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -797,7 +863,7 @@ MonoBehaviour: Data: _Pedestal - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Pedestal @@ -821,13 +887,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -851,13 +917,13 @@ MonoBehaviour: Data: _VideoLoadIndicator - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoLoadIndicator - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 62|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoLoadIndicator, Assembly-CSharp @@ -881,13 +947,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 64|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -911,13 +977,13 @@ MonoBehaviour: Data: _AuxiliaryVideoScreen - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AuxiliaryVideoScreen - Name: k__BackingField Entry: 7 - Data: 61|System.RuntimeType, mscorlib + Data: 66|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Transform, UnityEngine.CoreModule @@ -926,7 +992,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 61 + Data: 66 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -941,13 +1007,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 62|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: 63|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 68|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -971,16 +1037,16 @@ MonoBehaviour: Data: _AuxiliaryMapScreen - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AuxiliaryMapScreen - Name: k__BackingField Entry: 9 - Data: 61 + Data: 66 - Name: k__BackingField Entry: 9 - Data: 61 + Data: 66 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -995,13 +1061,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 65|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: 66|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1025,13 +1091,13 @@ MonoBehaviour: Data: _OwnershipInteract - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _OwnershipInteract - Name: k__BackingField Entry: 7 - Data: 68|System.RuntimeType, mscorlib + Data: 73|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CustomEventInteraction, Assembly-CSharp @@ -1055,82 +1121,10 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - - Name: - Entry: 7 - Data: 70|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: _HighlightEffect - - Name: $v - Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _HighlightEffect - - 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: true - - Name: _fieldAttributes - Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 3 - - Name: - Entry: 7 - Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 74|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Effects - - Name: - Entry: 8 - Data: - Name: Entry: 7 Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1154,13 +1148,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ScorecardObject + Data: _HighlightEffect - Name: $v Entry: 7 Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ScorecardObject + Data: _HighlightEffect - Name: k__BackingField Entry: 9 Data: 11 @@ -1182,240 +1176,12 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 78|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: _NameplateUI - - Name: $v - Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _NameplateUI - - Name: k__BackingField - Entry: 7 - Data: 80|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 80 - - 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: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 82|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: _ScorecardUI - - Name: $v - Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ScorecardUI - - Name: k__BackingField - Entry: 9 - Data: 80 - - Name: k__BackingField - Entry: 9 - Data: 80 - - 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: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 85|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: _ScorecardBackground - - Name: $v - Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ScorecardBackground - - Name: k__BackingField - Entry: 7 - Data: 87|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.UI.Image, UnityEngine.UI - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 87 - - 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: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 89|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: _SpawnPoint - - Name: $v - Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _SpawnPoint - - Name: k__BackingField - Entry: 9 - Data: 61 - - 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: true - - Name: _fieldAttributes - Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 92|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1424,13 +1190,241 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 93|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 79|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 - Data: Miscellaneous + Data: Effects - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 80|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: _ScorecardObject + - Name: $v + Entry: 7 + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ScorecardObject + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 83|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: _NameplateUI + - Name: $v + Entry: 7 + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _NameplateUI + - Name: k__BackingField + Entry: 7 + Data: 85|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 85 + - 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: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 87|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: _ScorecardUI + - Name: $v + Entry: 7 + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ScorecardUI + - Name: k__BackingField + Entry: 9 + Data: 85 + - Name: k__BackingField + Entry: 9 + Data: 85 + - 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: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 90|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: _ScorecardBackground + - Name: $v + Entry: 7 + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ScorecardBackground + - Name: k__BackingField + Entry: 7 + Data: 92|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Image, UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 92 + - 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: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 - Name: Entry: 7 Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1454,10 +1448,82 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FlashingScoreboardCounter + Data: _SpawnPoint - Name: $v Entry: 7 Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SpawnPoint + - Name: k__BackingField + Entry: 9 + Data: 66 + - Name: k__BackingField + Entry: 9 + Data: 66 + - 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: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 98|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Miscellaneous + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 99|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: _FlashingScoreboardCounter + - Name: $v + Entry: 7 + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FlashingScoreboardCounter @@ -1481,7 +1547,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index b7e46c3..19094f0 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -23,6 +23,8 @@ public class PlayerPodium : UdonSharpBehaviour [UdonSynced, FieldChangeCallback(nameof(ShowScoreCard))] private bool _ShowScoreCard = false; [UdonSynced, FieldChangeCallback(nameof(FlashScoreboard))] private bool _FlashScoreboard = false; + [UdonSynced, FieldChangeCallback(nameof(PedestalHeight))] private float _PedestalHeight = 0.0f; + [UdonSynced, FieldChangeCallback(nameof(EnableOwnershipTransfer))] private bool _EnableOwnershipTransfer = true; [Space] @@ -129,11 +131,8 @@ public class PlayerPodium : UdonSharpBehaviour private void AdjustPedestalHeight(VRCPlayerApi Player) { - _Pedestal.transform.localPosition = new Vector3( - _Pedestal.transform.localPosition.x, - -Player.GetAvatarEyeHeightAsMeters(), - _Pedestal.transform.localPosition.z - ); + PedestalHeight = Player.GetAvatarEyeHeightAsMeters(); + RequestSerialization(); } [NetworkCallable] @@ -370,6 +369,21 @@ public class PlayerPodium : UdonSharpBehaviour get => _FlashScoreboard; } + private float PedestalHeight + { + set + { + _PedestalHeight = value; + _Pedestal.transform.localPosition = new Vector3( + _Pedestal.transform.localPosition.x, + -_PedestalHeight, + _Pedestal.transform.localPosition.z + ); + } + get => _PedestalHeight; + } + + private bool EnableOwnershipTransfer { set