diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 819e955..876fed7 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -76,6 +76,7 @@
+
diff --git a/Assets/Models/SM_PlayerPedestal.fbx b/Assets/Models/SM_PlayerPedestal.fbx
new file mode 100644
index 0000000..85abb54
Binary files /dev/null and b/Assets/Models/SM_PlayerPedestal.fbx differ
diff --git a/Assets/Models/SM_PlayerPedestal.fbx.meta b/Assets/Models/SM_PlayerPedestal.fbx.meta
new file mode 100644
index 0000000..1a124ca
--- /dev/null
+++ b/Assets/Models/SM_PlayerPedestal.fbx.meta
@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: a6a608f7995dbbd4a85564a2feec0dc5
+ModelImporter:
+ serializedVersion: 22200
+ internalIDToNameTable: []
+ externalObjects: {}
+ materials:
+ materialImportMode: 0
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ removeConstantScaleCurves: 0
+ motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings:
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
+ animationCompression: 1
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
+ animationWrapMode: 0
+ extraExposedTransformPaths: []
+ extraUserProperties: []
+ clipAnimations: []
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 1
+ importPhysicalCameras: 1
+ importVisibility: 1
+ importBlendShapes: 1
+ importCameras: 1
+ importLights: 1
+ nodeNameCollisionStrategy: 1
+ fileIdsGeneration: 2
+ swapUVChannels: 0
+ generateSecondaryUV: 0
+ useFileUnits: 1
+ keepQuads: 0
+ weldVertices: 1
+ bakeAxisConversion: 0
+ preserveHierarchy: 0
+ skinWeightsMode: 0
+ maxBonesPerVertex: 4
+ minBoneWeight: 0.001
+ optimizeBones: 1
+ meshOptimizationFlags: -1
+ indexFormat: 0
+ secondaryUVAngleDistortion: 8
+ secondaryUVAreaDistortion: 15.000001
+ secondaryUVHardAngle: 88
+ secondaryUVMarginMethod: 1
+ secondaryUVMinLightmapResolution: 40
+ secondaryUVMinObjectScale: 1
+ secondaryUVPackMargin: 4
+ useFileScale: 1
+ strictVertexDataChecks: 0
+ tangentSpace:
+ normalSmoothAngle: 60
+ normalImportMode: 0
+ tangentImportMode: 3
+ normalCalculationMode: 4
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ referencedClips: []
+ importAnimation: 0
+ humanDescription:
+ serializedVersion: 3
+ human: []
+ skeleton: []
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
+ feetSpacing: 0
+ globalScale: 1
+ rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 1
+ lastHumanDescriptionAvatarSource: {instanceID: 0}
+ autoGenerateAvatarMappingIfUnspecified: 1
+ animationType: 0
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ importBlendShapeDeformPercent: 1
+ remapMaterialsIfMaterialImportModeIsNone: 0
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Bench.prefab b/Assets/Prefabs/Bench.prefab
index 8ce95ba..05e0f87 100644
--- a/Assets/Prefabs/Bench.prefab
+++ b/Assets/Prefabs/Bench.prefab
@@ -113,8 +113,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
- m_Size: {x: 10, y: 0.39999995, z: 10.007246}
- m_Center: {x: 0, y: 0, z: -4.67029}
+ m_Size: {x: 10, y: 5, z: 10.007246}
+ m_Center: {x: 0, y: -2.3, z: -4.67029}
--- !u!1001 &280146278937554367
PrefabInstance:
m_ObjectHideFlags: 0
@@ -157,7 +157,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -252,7 +252,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -347,7 +347,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -442,7 +442,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -537,7 +537,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -632,7 +632,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -727,7 +727,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -822,7 +822,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -917,7 +917,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
@@ -1012,7 +1012,7 @@ PrefabInstance:
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8606668710667308998, guid: fe115f1e76c3273488b4f7bc38fddda1,
type: 3}
diff --git a/Assets/Prefabs/Border Plane.prefab b/Assets/Prefabs/Border Plane.prefab
index f9dbdfc..86dda21 100644
--- a/Assets/Prefabs/Border Plane.prefab
+++ b/Assets/Prefabs/Border Plane.prefab
@@ -11,7 +11,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: c5353190a485a134481a9d9e089ecfc1,
type: 3}
propertyPath: m_LocalPosition.x
- value: -2.62
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c5353190a485a134481a9d9e089ecfc1,
type: 3}
@@ -21,7 +21,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: c5353190a485a134481a9d9e089ecfc1,
type: 3}
propertyPath: m_LocalPosition.z
- value: 4.6
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c5353190a485a134481a9d9e089ecfc1,
type: 3}
@@ -66,7 +66,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: c5353190a485a134481a9d9e089ecfc1,
type: 3}
propertyPath: m_Name
- value: SM_FloorPlane
+ value: Border Plane
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
diff --git a/Assets/Prefabs/CustomSeat.prefab b/Assets/Prefabs/CustomSeat.prefab
index a8f42e7..1dddc90 100644
--- a/Assets/Prefabs/CustomSeat.prefab
+++ b/Assets/Prefabs/CustomSeat.prefab
@@ -174,7 +174,7 @@ Transform:
m_GameObject: {fileID: 6415852515024147226}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -8.99, y: 0.748, z: -3.5752475}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -222,8 +222,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
- m_Size: {x: 0.6395731, y: 0.20344114, z: 0.6394608}
- m_Center: {x: 0, y: 0.6416409, z: 0.11362755}
+ m_Size: {x: 0.6395731, y: 0.2, z: 0.6394608}
+ m_Center: {x: 0, y: 0.3, z: 0.11362755}
--- !u!114 &3989300430648522456
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab
index d321e92..b6a900f 100644
--- a/Assets/Prefabs/Player Podium.prefab
+++ b/Assets/Prefabs/Player Podium.prefab
@@ -547,6 +547,38 @@ Transform:
- {fileID: 4784420777705181201}
m_Father: {fileID: 5617792120913924276}
m_LocalEulerAnglesHint: {x: -30, y: 0, z: 0}
+--- !u!1 &2119334099274260680
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4038521119021851374}
+ m_Layer: 0
+ m_Name: Pedestal Home
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4038521119021851374
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2119334099274260680}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 1.75, z: -0.5}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 5913791720362352550}
+ m_Father: {fileID: 5984335492357139332}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2509325258865248374
GameObject:
m_ObjectHideFlags: 0
@@ -1343,6 +1375,7 @@ Transform:
- {fileID: 7780879094676330011}
- {fileID: 7566631391838123814}
- {fileID: 9043478063159764907}
+ - {fileID: 4038521119021851374}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1226214083704227558
@@ -1373,6 +1406,7 @@ MonoBehaviour:
_ChoiceCards: {fileID: 4424524232366912296}
_RiskCards: {fileID: 5882532645313673403}
_Buzzer: {fileID: 1145695079806890482}
+ _Pedestal: {fileID: 6438408659115984156}
_AuxiliaryVideoScreen: {fileID: 0}
_AuxiliaryMapScreen: {fileID: 0}
_OwnershipInteract: {fileID: 2288460166211710674}
@@ -2806,6 +2840,117 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &6167885581044250701
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 4038521119021851374}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.5000004
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.50000024
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.49999967
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.4999997
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -90
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_Name
+ value: Pedestal
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 8560623035584941186}
+ m_SourcePrefab: {fileID: 100100000, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3}
+--- !u!4 &5913791720362352550 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ m_PrefabInstance: {fileID: 6167885581044250701}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &6438408659115984156 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5,
+ type: 3}
+ m_PrefabInstance: {fileID: 6167885581044250701}
+ m_PrefabAsset: {fileID: 0}
+--- !u!64 &8560623035584941186
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6438408659115984156}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 5
+ m_Convex: 1
+ m_CookingOptions: 30
+ m_Mesh: {fileID: -5495902117074765545, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3}
--- !u!1001 &6878968199621207562
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity
index 5f5c790..9a39ecd 100644
--- a/Assets/Scenes/witwics.unity
+++ b/Assets/Scenes/witwics.unity
@@ -1396,6 +1396,11 @@ PrefabInstance:
value:
objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
+ - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: _syncMethod
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 7430433894510113568, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: serializationData.Prefab
@@ -8700,6 +8705,12 @@ PrefabInstance:
propertyPath: _syncMethod
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
+ type: 3}
+ propertyPath: serializationData.Prefab
+ value:
+ objectReference: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
+ type: 3}
- target: {fileID: 6693907286767766257, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: m_Name
@@ -12224,13 +12235,13 @@ Transform:
m_GameObject: {fileID: 285397120}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -30.78, y: 1, z: 2.3200002}
+ m_LocalPosition: {x: -2, y: 1, z: -0.24999976}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1768602429}
- {fileID: 1720149716}
- m_Father: {fileID: 1276291775}
+ m_Father: {fileID: 1657587667}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &288612731 stripped
GameObject:
@@ -13321,6 +13332,11 @@ PrefabInstance:
value:
objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
+ - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: _syncMethod
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 7430433894510113568, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: serializationData.Prefab
@@ -13995,6 +14011,111 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1499591484}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &344488387
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 344488388}
+ - component: {fileID: 344488389}
+ - component: {fileID: 344488391}
+ - component: {fileID: 344488390}
+ m_Layer: 0
+ m_Name: Audience Silence Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &344488388
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 344488387}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -1.0999985, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1657587667}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &344488389
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 344488387}
+ 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: 1
+ serializedVersion: 3
+ m_Size: {x: 7.259323, y: 42.43669, z: 42.716873}
+ m_Center: {x: -2.0168934, y: 21.218346, z: 0}
+--- !u!114 &344488390
+MonoBehaviour:
+ m_ObjectHideFlags: 2
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 344488387}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ interactTextPlacement: {fileID: 0}
+ interactText: Use
+ interactTextGO: {fileID: 0}
+ proximity: 2
+ SynchronizePosition: 0
+ AllowCollisionOwnershipTransfer: 0
+ Reliable: 0
+ _syncMethod: 2
+ serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1,
+ type: 2}
+ programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2}
+ serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
+ publicVariablesUnityEngineObjects: []
+ publicVariablesSerializationDataFormat: 0
+--- !u!114 &344488391
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 344488387}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0fa4104b3414f05428aa283f01b2ca53, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ serializationData:
+ SerializedFormat: 2
+ SerializedBytes:
+ ReferencedUnityObjects: []
+ SerializedBytesString:
+ Prefab: {fileID: 0}
+ PrefabModificationsReferencedUnityObjects: []
+ PrefabModifications: []
+ SerializationNodes: []
+ _udonSharpBackingUdonBehaviour: {fileID: 344488390}
+ _MikedVoiceDistanceNear: 0
+ _MikedVoiceDistanceFar: 5
--- !u!1 &344722282 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8391297230877510633, guid: 899ce13087fd5974f88dcbccaea2df85,
@@ -14032,13 +14153,13 @@ Transform:
m_GameObject: {fileID: 345544242}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -31.78, y: 1.5, z: 2.8200002}
+ m_LocalPosition: {x: -3, y: 1.5, z: 0.25000024}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 91371484}
- {fileID: 1058862683}
- m_Father: {fileID: 1276291775}
+ m_Father: {fileID: 1657587667}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &346921159 stripped
GameObject:
@@ -18755,6 +18876,11 @@ PrefabInstance:
value:
objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
+ - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: _syncMethod
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 7430433894510113568, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: serializationData.Prefab
@@ -20533,13 +20659,13 @@ Transform:
m_GameObject: {fileID: 530310355}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -28.78, y: 0, z: 2.3200002}
+ m_LocalPosition: {x: 0, y: 0, z: -0.24999976}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1862992062}
- {fileID: 2024292608}
- m_Father: {fileID: 1276291775}
+ m_Father: {fileID: 1657587667}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &530695307
GameObject:
@@ -25600,13 +25726,13 @@ Transform:
m_GameObject: {fileID: 731366887}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -29.78, y: 0.5, z: 2.8200002}
+ m_LocalPosition: {x: -1, y: 0.5, z: 0.25000024}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 633609067}
- {fileID: 832323182}
- m_Father: {fileID: 1276291775}
+ m_Father: {fileID: 1657587667}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &734018435 stripped
GameObject:
@@ -26909,8 +27035,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
- m_Size: {x: 12.217293, y: 5, z: 11}
- m_Center: {x: 0, y: 2.5, z: 0}
+ m_Size: {x: 11.839521, y: 5, z: 11}
+ m_Center: {x: 0.18888569, y: 2.5, z: 0}
--- !u!1 &772889382 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4680653884435436470, guid: 899ce13087fd5974f88dcbccaea2df85,
@@ -28310,6 +28436,11 @@ PrefabInstance:
value:
objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
+ - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: _syncMethod
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 7430433894510113568, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: serializationData.Prefab
@@ -29577,6 +29708,11 @@ PrefabInstance:
value:
objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
+ - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: _syncMethod
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 7430433894510113568, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: serializationData.Prefab
@@ -30709,6 +30845,12 @@ PrefabInstance:
propertyPath: _syncMethod
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
+ type: 3}
+ propertyPath: serializationData.Prefab
+ value:
+ objectReference: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
+ type: 3}
- target: {fileID: 6693907286767766257, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: m_Name
@@ -40583,6 +40725,11 @@ PrefabInstance:
value:
objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
+ - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: _syncMethod
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 7430433894510113568, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: serializationData.Prefab
@@ -42063,10 +42210,7 @@ Transform:
- {fileID: 1757939442}
- {fileID: 772205214}
- {fileID: 1762618933}
- - {fileID: 530310356}
- - {fileID: 731366888}
- - {fileID: 285397121}
- - {fileID: 345544243}
+ - {fileID: 1657587667}
- {fileID: 1343307840}
- {fileID: 1143449486}
- {fileID: 2063457642}
@@ -55341,7 +55485,7 @@ PrefabInstance:
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: -11.01
objectReference: {fileID: 0}
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
@@ -55351,22 +55495,22 @@ PrefabInstance:
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
propertyPath: m_LocalPosition.z
- value: 0
+ value: -7.49
objectReference: {fileID: 0}
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
propertyPath: m_LocalRotation.w
- value: 0.7071068
+ value: -0.9961946
objectReference: {fileID: 0}
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
propertyPath: m_LocalRotation.y
- value: -0.7071068
+ value: 0.08715705
objectReference: {fileID: 0}
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
@@ -55381,7 +55525,7 @@ PrefabInstance:
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -90
+ value: 350
objectReference: {fileID: 0}
- target: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38,
type: 3}
@@ -58539,6 +58683,42 @@ Transform:
- {fileID: 1607542514}
m_Father: {fileID: 1027471609}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1657587666
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1657587667}
+ m_Layer: 0
+ m_Name: Bleachers
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1657587667
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1657587666}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -28.78, y: 0, z: 2.57}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 344488388}
+ - {fileID: 530310356}
+ - {fileID: 731366888}
+ - {fileID: 285397121}
+ - {fileID: 345544243}
+ m_Father: {fileID: 1276291775}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1658730385
GameObject:
m_ObjectHideFlags: 0
@@ -75512,6 +75692,12 @@ PrefabInstance:
propertyPath: _syncMethod
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
+ type: 3}
+ propertyPath: serializationData.Prefab
+ value:
+ objectReference: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
+ type: 3}
- target: {fileID: 6693907286767766257, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: m_Name
@@ -77562,12 +77748,12 @@ MonoBehaviour:
DynamicPrefabs: []
DynamicMaterials:
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
+ - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
- {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
- {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
@@ -77580,17 +77766,17 @@ MonoBehaviour:
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
+ - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
- {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
- {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2}
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
- - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2}
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
+ - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
- {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2}
LightMapsNear: []
LightMapsFar: []
@@ -82149,6 +82335,10 @@ MonoBehaviour:
ID: 1101
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
+ - gameObject: {fileID: 344488387}
+ ID: 1105
+ SerializedTypeNames:
+ - VRC.Udon.UdonBehaviour
portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
PlayerPersistence: []
diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs
index 8471c05..0b6d5b5 100644
--- a/Assets/UdonSharp/Game Managers/CaseManager.cs
+++ b/Assets/UdonSharp/Game Managers/CaseManager.cs
@@ -217,7 +217,7 @@ public class CaseManager : UdonSharpBehaviour
public string ContinueToRound2()
{
_Round3Manager.DeinitialiseGameMode();
- _Round2Manager.InitialiseGameMode();
+ _Round2Manager.DeinitialiseGameMode();
_Round1Manager.DeinitialiseGameMode();
_HostCard.SetGameManager(_Round2Manager);
diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs
index f6172ab..9178a0b 100644
--- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs
+++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs
@@ -96,7 +96,6 @@ public class GameManagerBase : UdonSharpBehaviour
{
_AllowInteractionFromHostCard = true;
- SetOwnershipOfObjects(_CaseManager.GetHostOwner());
EnableMicrophone(true);
}
diff --git a/Assets/UdonSharp/Podium/PlayerPedestal.asset b/Assets/UdonSharp/Podium/PlayerPedestal.asset
new file mode 100644
index 0000000..a18e004
--- /dev/null
+++ b/Assets/UdonSharp/Podium/PlayerPedestal.asset
@@ -0,0 +1,53 @@
+%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: PlayerPedestal
+ m_EditorClassIdentifier:
+ serializedUdonProgramAsset: {fileID: 11400000, guid: cf0528a56d98f904196dc5fd6ff9a6d0,
+ type: 2}
+ udonAssembly:
+ assemblyError:
+ sourceCsScript: {fileID: 11500000, guid: 0488c1879dee4d34cb20df436d804afe, type: 3}
+ scriptVersion: 2
+ compiledVersion: 2
+ behaviourSyncMode: 4
+ hasInteractEvent: 0
+ scriptID: -7966647205400568113
+ 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: 0
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
diff --git a/Assets/UdonSharp/Podium/PlayerPedestal.asset.meta b/Assets/UdonSharp/Podium/PlayerPedestal.asset.meta
new file mode 100644
index 0000000..8478989
--- /dev/null
+++ b/Assets/UdonSharp/Podium/PlayerPedestal.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c349502dacabed447b393fb564c5c6e5
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UdonSharp/Podium/PlayerPedestal.cs b/Assets/UdonSharp/Podium/PlayerPedestal.cs
new file mode 100644
index 0000000..a315f51
--- /dev/null
+++ b/Assets/UdonSharp/Podium/PlayerPedestal.cs
@@ -0,0 +1,12 @@
+
+using UdonSharp;
+using UnityEngine;
+using VRC.SDKBase;
+using VRC.Udon;
+
+
+[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
+public class PlayerPedestal : UdonSharpBehaviour
+{
+
+}
diff --git a/Assets/UdonSharp/Podium/PlayerPedestal.cs.meta b/Assets/UdonSharp/Podium/PlayerPedestal.cs.meta
new file mode 100644
index 0000000..4617a49
--- /dev/null
+++ b/Assets/UdonSharp/Podium/PlayerPedestal.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0488c1879dee4d34cb20df436d804afe
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UdonSharp/Podium/PlayerPodium.asset b/Assets/UdonSharp/Podium/PlayerPodium.asset
index 9cc32cb..e2d3e71 100644
--- a/Assets/UdonSharp/Podium/PlayerPodium.asset
+++ b/Assets/UdonSharp/Podium/PlayerPodium.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
- Data: 18
+ Data: 19
- Name:
Entry: 7
Data:
@@ -734,25 +734,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _AuxiliaryVideoScreen
+ Data: _Pedestal
- Name: $v
Entry: 7
Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _AuxiliaryVideoScreen
+ Data: _Pedestal
- Name: k__BackingField
- Entry: 7
- Data: 50|System.RuntimeType, mscorlib
- - Name:
- Entry: 1
- Data: UnityEngine.Transform, UnityEngine.CoreModule
- - 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
@@ -767,13 +761,13 @@ MonoBehaviour:
Data: true
- 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: 1
- Name:
Entry: 7
- Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule
+ Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -794,19 +788,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _AuxiliaryMapScreen
+ Data: _AuxiliaryVideoScreen
- Name: $v
Entry: 7
- Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _AuxiliaryMapScreen
+ Data: _AuxiliaryVideoScreen
- Name: k__BackingField
- Entry: 9
- Data: 50
+ Entry: 7
+ Data: 53|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: UnityEngine.Transform, UnityEngine.CoreModule
+ - Name:
+ Entry: 8
+ Data:
- Name: k__BackingField
Entry: 9
- Data: 50
+ Data: 53
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -848,16 +848,70 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _OwnershipInteract
+ Data: _AuxiliaryMapScreen
- Name: $v
Entry: 7
Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _AuxiliaryMapScreen
+ - Name: k__BackingField
+ Entry: 9
+ Data: 53
+ - Name: k__BackingField
+ Entry: 9
+ Data: 53
+ - 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: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 58|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: _OwnershipInteract
+ - Name: $v
+ Entry: 7
+ Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _OwnershipInteract
- Name: k__BackingField
Entry: 7
- Data: 57|System.RuntimeType, mscorlib
+ Data: 60|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CustomEventInteraction, Assembly-CSharp
@@ -881,13 +935,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
- Data: 58|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: 59|UnityEngine.SerializeField, UnityEngine.CoreModule
+ Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -911,7 +965,7 @@ MonoBehaviour:
Data: _BuzzedInEffect
- Name: $v
Entry: 7
- Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _BuzzedInEffect
@@ -935,13 +989,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
- Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 3
- Name:
Entry: 7
- Data: 62|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
+ Data: 65|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
@@ -950,67 +1004,13 @@ MonoBehaviour:
Data:
- Name:
Entry: 7
- Data: 63|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
+ Data: 66|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: Effects
- Name:
Entry: 8
Data:
- - Name:
- Entry: 7
- Data: 64|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: 65|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: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- - Name:
- Entry: 12
- Data: 1
- Name:
Entry: 7
Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -1034,25 +1034,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _NameplateUI
+ Data: _ScorecardObject
- Name: $v
Entry: 7
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _NameplateUI
+ Data: _ScorecardObject
- Name: k__BackingField
- Entry: 7
- Data: 69|System.RuntimeType, mscorlib
- - Name:
- Entry: 1
- Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro
- - Name:
- Entry: 8
- Data:
+ Entry: 9
+ Data: 11
- Name: k__BackingField
Entry: 9
- Data: 69
+ Data: 11
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1067,13 +1061,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
- Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule
+ Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -1094,19 +1088,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _ScorecardUI
+ Data: _NameplateUI
- Name: $v
Entry: 7
- Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _ScorecardUI
+ Data: _NameplateUI
- Name: k__BackingField
- Entry: 9
- Data: 69
+ Entry: 7
+ Data: 72|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro
+ - Name:
+ Entry: 8
+ Data:
- Name: k__BackingField
Entry: 9
- Data: 69
+ Data: 72
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1143,6 +1143,60 @@ MonoBehaviour:
- Name:
Entry: 8
Data:
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _ScorecardUI
+ - Name: $v
+ Entry: 7
+ Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _ScorecardUI
+ - Name: k__BackingField
+ Entry: 9
+ Data: 72
+ - Name: k__BackingField
+ Entry: 9
+ Data: 72
+ - 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: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 77|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:
diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs
index 1285d36..2da140e 100644
--- a/Assets/UdonSharp/Podium/PlayerPodium.cs
+++ b/Assets/UdonSharp/Podium/PlayerPodium.cs
@@ -29,6 +29,7 @@ public class PlayerPodium : UdonSharpBehaviour
[SerializeField] private ChoiceCardGroup _ChoiceCards;
[SerializeField] private RiskCardGroup _RiskCards;
[SerializeField] private Buzzer _Buzzer;
+ [SerializeField] private GameObject _Pedestal;
[SerializeField] private Transform _AuxiliaryVideoScreen;
[SerializeField] private Transform _AuxiliaryMapScreen;
@@ -61,6 +62,16 @@ public class PlayerPodium : UdonSharpBehaviour
base.OnPlayerLeft(Player);
}
+ public override void OnAvatarEyeHeightChanged(VRCPlayerApi Player, float PrevEyeHeightAsMeters)
+ {
+ if (Player.playerId == _PlayerID)
+ {
+ AdjustPedestalHeight(Player);
+ }
+
+ base.OnAvatarEyeHeightChanged(Player, PrevEyeHeightAsMeters);
+ }
+
public void SetPlayerName()
{
@@ -77,6 +88,9 @@ public class PlayerPodium : UdonSharpBehaviour
PlayerName = Networking.LocalPlayer.displayName;
_PlayerID = Networking.LocalPlayer.playerId;
+ _Pedestal.SetActive(true);
+ AdjustPedestalHeight(Networking.LocalPlayer);
+
EnableOwnershipTransfer = false;
RequestSerialization();
@@ -89,12 +103,22 @@ public class PlayerPodium : UdonSharpBehaviour
_PlayerID = -1;
EnableOwnershipTransfer = true;
+ _Pedestal.SetActive(false);
RequestSerialization();
}
public int GetPlayerID() { return _PlayerID; }
+ private void AdjustPedestalHeight(VRCPlayerApi Player)
+ {
+ _Pedestal.transform.localPosition = new Vector3(
+ _Pedestal.transform.localPosition.x,
+ -Player.GetAvatarEyeHeightAsMeters(),
+ _Pedestal.transform.localPosition.z
+ );
+ }
+
[NetworkCallable]
public void DisplayScore()
{