ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

- Lightning round now cancels buzz-in period when there's no answer or buzz-in.

Browse Source 
- Moved seat trigger for player pedestals to be permanently on the floor.
- Shifted cards and buzzers on the round 1 podium to fit the new design.
- Further improved round 1 podium lightmaps.
This commit is contained in:
Jamie Greunbaum 2025-10-05 19:45:53 -04:00
parent 02bf062e4f
commit ea4d29c8c7
23 changed files with 230 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assembly-CSharp.csproj
View File

@ -135,13 +135,11 @@
<None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile Overlay.shader" />
<None Include="Assets\Shaders\SDF Map Borders.shader" />
<None Include="Assets\Shaders\m4yc3x\MayceThickPlastic.shader" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap.shader" />
<None Include="Assets\TextMesh Pro\Shaders\TMPro_Mobile.cginc" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF SSD.shader" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Surface-Mobile.shader" />
<None Include="Assets\Shaders\ScreenUV.shader" />
<None Include="Assets\Shaders\m4yc3x\MayceIridescent.shader" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Surface.shader" />
<None Include="Assets\Shaders\BicolourMap.shader" />
<None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
@ -161,7 +159,6 @@
<None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap-Mobile.shader" />
<None Include="Assets\TextMesh Pro\Fonts\LiberationSans - OFL.txt" />
<None Include="Assets\Shaders\FrontfaceCulling.shader" />
<None Include="Assets\Shaders\m4yc3x\MayceLiquidMetal.shader" />
<None Include="Assets\Shaders\SDF Map Marker Spokes.shader" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile.shader" />
<None Include="Assets\Shaders\SDF Map Marker Lamp.shader" />

6
Assets/Materials/Paper/M_WhitePaper.mat
View File

@ -43,11 +43,11 @@ Material:
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Scale: {x: 3, y: 3}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Scale: {x: 3, y: 3}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
@ -64,7 +64,7 @@ Material:
m_Ints: []
m_Floats:
- _Bicubic: 0
- _BumpScale: 0.5
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0

BIN
Assets/Models/SM_Round1Podium.fbx
View File

Binary file not shown.

184
Assets/Prefabs/Player Podium.prefab
View File

@ -223,7 +223,7 @@ Transform:
m_GameObject: {fileID: 1279709097283225487}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.333, y: 1.014, z: -0.202}
m_LocalPosition: {x: 0.313, y: 1.014, z: -0.2642}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -588,6 +588,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4038521119021851374}
- component: {fileID: 3835712531804814992}
- component: {fileID: 1285927808057329339}
- component: {fileID: 5970510570726571662}
m_Layer: 0
m_Name: Pedestal Home
m_TagString: Untagged
@ -611,6 +614,77 @@ Transform:
- {fileID: 5913791720362352550}
m_Father: {fileID: 5984335492357139332}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!65 &3835712531804814992
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2119334099274260680}
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: 1.25, y: 1.054181, z: 1}
m_Center: {x: -0.375, y: -2.0298042, z: 0}
--- !u!114 &1285927808057329339
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2119334099274260680}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ce295bc35d40dd4c82081275b392c56, type: 3}
m_Name:
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes: []
_udonSharpBackingUdonBehaviour: {fileID: 5970510570726571662}
_Target: {fileID: 1226214083704227558}
_EventName: TeleportLocalPlayerToPedestal
--- !u!114 &5970510570726571662
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2119334099274260680}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3}
m_Name:
m_EditorClassIdentifier:
interactTextPlacement: {fileID: 0}
interactText: Stand
interactTextGO: {fileID: 0}
proximity: 0.5
SynchronizePosition: 0
AllowCollisionOwnershipTransfer: 0
Reliable: 0
_syncMethod: 0
serializedProgramAsset: {fileID: 11400000, guid: 788c1198ec928d84ca21dcac058c51eb,
type: 2}
programSource: {fileID: 11400000, guid: 0d8a2e1bd96144840bbc9095a926631b, type: 2}
serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
publicVariablesUnityEngineObjects: []
publicVariablesSerializationDataFormat: 0
--- !u!1 &2509325258865248374
GameObject:
m_ObjectHideFlags: 0
@ -682,7 +756,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &826871961533866949
RectTransform:
m_ObjectHideFlags: 0
@ -1628,7 +1702,7 @@ MonoBehaviour:
_AuxiliaryMapScreen: {fileID: 0}
_OwnershipInteract: {fileID: 2288460166211710674}
_HighlightEffect: {fileID: 6181750060712598379}
_ScorecardObject: {fileID: 5278643753074928947}
_ScorecardObject: {fileID: 2943858370906151110}
_NameplateUI: {fileID: 5247165531706728442}
_ScorecardUI: {fileID: 3651303298073640538}
_ScorecardBackground: {fileID: 4701622366132471396}
@ -2483,12 +2557,12 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
@ -2498,37 +2572,37 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: fef4b7f976be5be498f302b02c93adce,
type: 3}
@ -2715,22 +2789,22 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.50000006
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
value: -0.70710677
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.50000006
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
type: 3}
@ -2740,7 +2814,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
type: 3}
@ -2814,8 +2888,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.12507926, y: 0.73, z: 0.50020087}
m_Center: {x: 0.062539615, y: -8.8761387e-16, z: 0.7498996}
m_Size: {x: 0.73, y: 0.1250793, z: 0.50020087}
m_Center: {x: 0, y: 0.06253961, z: 0.7498996}
--- !u!4 &2108874904556183587 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c,
@ -3383,14 +3457,6 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 1232737882784910230}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5,
type: 3}
insertIndex: -1
addedObject: {fileID: 2379192055874455715}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5,
type: 3}
insertIndex: -1
addedObject: {fileID: 6796801087513683322}
m_SourcePrefab: {fileID: 100100000, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3}
--- !u!4 &5913791720362352550 stripped
Transform:
@ -3425,56 +3491,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.25, y: 1.0000004, z: 2.5000002}
m_Center: {x: 0.375, y: 0.00000014901238, z: -1.25}
--- !u!114 &2379192055874455715
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6438408659115984156}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ce295bc35d40dd4c82081275b392c56, type: 3}
m_Name:
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes: []
_udonSharpBackingUdonBehaviour: {fileID: 6796801087513683322}
_Target: {fileID: 1226214083704227558}
_EventName: TeleportLocalPlayerToPedestal
--- !u!114 &6796801087513683322
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6438408659115984156}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3}
m_Name:
m_EditorClassIdentifier:
interactTextPlacement: {fileID: 0}
interactText: Stand
interactTextGO: {fileID: 0}
proximity: 0.25
SynchronizePosition: 0
AllowCollisionOwnershipTransfer: 0
Reliable: 0
_syncMethod: 0
serializedProgramAsset: {fileID: 11400000, guid: 788c1198ec928d84ca21dcac058c51eb,
type: 2}
programSource: {fileID: 11400000, guid: 0d8a2e1bd96144840bbc9095a926631b, type: 2}
serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
publicVariablesUnityEngineObjects: []
publicVariablesSerializationDataFormat: 0
--- !u!1001 &6878968199621207562
PrefabInstance:
m_ObjectHideFlags: 0

131
Assets/Scenes/witwics.unity
View File

@ -9127,6 +9127,12 @@ PrefabInstance:
value:
objectReference: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 1285927808057329339, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 1285927808057329339, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 1304214879062622917, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: m_Navigation.m_Mode
@ -9185,7 +9191,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 3603690767504630756, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -9309,7 +9316,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -9477,7 +9485,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 7476343027295287987, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -9494,7 +9503,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 8182580785162383611, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -9505,7 +9515,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: _syncMethod
@ -16895,6 +16906,12 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 4362789101225005290}
m_PrefabAsset: {fileID: 0}
--- !u!1 &389363159 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2119334099274260680, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
m_PrefabInstance: {fileID: 937910637}
m_PrefabAsset: {fileID: 0}
--- !u!1 &389564694
GameObject:
m_ObjectHideFlags: 0
@ -19208,11 +19225,11 @@ LightProbeGroup:
- {x: -0.38842565, y: -0.32561862, z: -3.4161398}
- {x: -0.38842565, y: 0.76043856, z: -3.4161398}
- {x: -0.38842565, y: 2.3344793, z: -3.4161398}
- {x: 0.8243795, y: 4.4484243, z: -0.3487437}
- {x: 0.8243795, y: -1, z: -0.3487437}
- {x: 0.8243795, y: -0.32561862, z: -0.3487437}
- {x: 0.8243795, y: 0.76043856, z: -0.3487437}
- {x: 0.8243795, y: 2.3344793, z: -0.3487437}
- {x: 1.689443, y: 4.4484243, z: 0.95896566}
- {x: 1.689443, y: -1, z: 0.95896566}
- {x: 1.689443, y: -0.32561862, z: 0.95896566}
- {x: 1.689443, y: 0.76043856, z: 0.95896566}
- {x: 1.689443, y: 2.3344793, z: 0.95896566}
- {x: 3.7783816, y: 4.4484243, z: -1.0435119}
- {x: 3.7783816, y: -1, z: -1.0435119}
- {x: 3.7783816, y: -0.32561862, z: -1.0435119}
@ -19243,6 +19260,16 @@ LightProbeGroup:
- {x: -2.278455, y: -0.32561862, z: -0.32933414}
- {x: -2.278455, y: 0.76043856, z: -0.32933414}
- {x: -2.278455, y: 2.3344793, z: -0.32933414}
- {x: 0.8243795, y: 4.4484243, z: -0.3487437}
- {x: 0.8243795, y: -1, z: -0.3487437}
- {x: 0.8243795, y: -0.32561862, z: -0.3487437}
- {x: 0.8243795, y: 0.76043856, z: -0.3487437}
- {x: 0.8243795, y: 2.3344793, z: -0.3487437}
- {x: 2.8568344, y: 4.4484243, z: -1.440839}
- {x: 2.8568344, y: -1, z: -1.440839}
- {x: 2.8568344, y: -0.32561862, z: -1.440839}
- {x: 2.8568344, y: 0.76043856, z: -1.440839}
- {x: 2.8568344, y: 2.3344793, z: -1.440839}
m_Dering: 1
--- !u!4 &442602915
Transform:
@ -22167,10 +22194,10 @@ Light:
m_Type: 0
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 2
m_Intensity: 5
m_Range: 12
m_SpotAngle: 60
m_InnerSpotAngle: 5
m_SpotAngle: 20
m_InnerSpotAngle: 2
m_CookieSize: 10
m_Shadows:
m_Type: 0
@ -22225,13 +22252,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 524392757}
serializedVersion: 2
m_LocalRotation: {x: 0.18055575, y: -0.4925583, z: 0.68366736, w: 0.5073312}
m_LocalRotation: {x: 0.032603018, y: -0.41353756, z: 0.70635575, w: 0.5735724}
m_LocalPosition: {x: 3.7000012, y: 6, z: -1.3200006}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1868785874}
m_LocalEulerAnglesHint: {x: 121.052, y: -154.359, z: -90}
m_LocalEulerAnglesHint: {x: 141.56601, y: -213.148, z: -90}
--- !u!1 &525846578 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1177052548670801575, guid: 40955da061a841841a91c845049f1e11,
@ -22744,6 +22771,12 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1534889732}
m_PrefabAsset: {fileID: 0}
--- !u!1 &543494203 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2119334099274260680, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
m_PrefabInstance: {fileID: 4438766482650780789}
m_PrefabAsset: {fileID: 0}
--- !u!1 &543552706 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2810244043240136675, guid: e9914385266bca24db809c39e395f03c,
@ -34109,6 +34142,12 @@ PrefabInstance:
value:
objectReference: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 1285927808057329339, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 1285927808057329339, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 1304214879062622917, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: m_Navigation.m_Mode
@ -34167,7 +34206,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 3603690767504630756, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -34291,7 +34331,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -34459,7 +34500,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 7476343027295287987, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -34476,7 +34518,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 8182580785162383611, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -34487,7 +34530,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: _syncMethod
@ -46995,8 +47039,8 @@ Light:
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 2
m_Range: 12
m_SpotAngle: 60
m_InnerSpotAngle: 5
m_SpotAngle: 20
m_InnerSpotAngle: 2
m_CookieSize: 10
m_Shadows:
m_Type: 0
@ -47051,13 +47095,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1297405177}
serializedVersion: 2
m_LocalRotation: {x: 0.6802381, y: 0.18548043, z: 0.19307013, w: 0.6823467}
m_LocalRotation: {x: 0.6889833, y: 0.31061977, z: 0.1590648, w: 0.635229}
m_LocalPosition: {x: -1.7316074, y: 6, z: 2.6736927}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1868785874}
m_LocalEulerAnglesHint: {x: 121.05301, y: -35.638, z: -90}
m_LocalEulerAnglesHint: {x: 129.058, y: -76.94202, z: -90}
--- !u!1 &1299151534 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7006660050991705467, guid: be33bc7f6c414e6409becfa348b9310d,
@ -63327,6 +63371,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d8b1d1f3fc4fd944795d9342360a337f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1589685156 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2119334099274260680, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
m_PrefabInstance: {fileID: 172614115}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1592461986 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4769809374532133190, guid: be33bc7f6c414e6409becfa348b9310d,
@ -84885,6 +84935,12 @@ PrefabInstance:
value:
objectReference: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 1285927808057329339, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 1285927808057329339, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 1304214879062622917, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: m_Navigation.m_Mode
@ -84943,7 +84999,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 3603690767504630756, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -85067,7 +85124,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -85235,7 +85293,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 7476343027295287987, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -85252,7 +85311,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 8182580785162383611, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
@ -85263,7 +85323,8 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 0}
objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: _syncMethod
@ -92280,6 +92341,18 @@ MonoBehaviour:
ID: 1453
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
- gameObject: {fileID: 543494203}
ID: 1454
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
- gameObject: {fileID: 1589685156}
ID: 1455
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
- gameObject: {fileID: 389363159}
ID: 1456
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
PlayerPersistence: []

BIN
Assets/Scenes/witwics/LightingData.asset
View File

Binary file not shown.

BIN
Assets/Scenes/witwics/Lightmap-0_comp_light.exr
View File

Binary file not shown.

BIN
Assets/Scenes/witwics/ReflectionProbe-0.exr
View File

Binary file not shown.

BIN
Assets/Scenes/witwics/ReflectionProbe-1.exr
View File

Binary file not shown.

BIN
Assets/Scenes/witwics/ReflectionProbe-2.exr
View File

Binary file not shown.

BIN
Assets/Scenes/witwics/ReflectionProbe-3.exr
View File

Binary file not shown.

BIN
Assets/Scenes/witwics/ReflectionProbe-4.exr
View File

Binary file not shown.

BIN
Assets/Scenes/witwics/ReflectionProbe-5.exr
View File

Binary file not shown.

15
Assets/UdonSharp/Game Managers/GameManagerRound1.cs
View File

@ -664,9 +664,13 @@ public class GameManagerRound1 : GameManagerBase
{
if (_BuzzedInPlayer <= 0)
{
EndBuzzInPeriod();
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.Round1Incorrect);
}
WaitForBuzzInsWithoutLastPlayer();
else
{
WaitForBuzzInsWithoutLastPlayer();
}
}
@ -1301,8 +1305,6 @@ public class GameManagerRound1 : GameManagerBase
public void TiebreakerIncorrectResponse()
{
int PodiumIndex = _BuzzedInPlayer - 1;
_BuzzedInPlayer = -1;
_BuzzInAllowed = true;
@ -1402,6 +1404,8 @@ public class GameManagerRound1 : GameManagerBase
{
_BuzzInAllowed = true;
ResetBuzzers();
RequestSerialization();
}
private void EnableBuzzInPeriodForPlayer(int PlayerNumber)
@ -1417,12 +1421,13 @@ public class GameManagerRound1 : GameManagerBase
}
}
_BuzzInAllowed = true;
RequestSerialization();
}
private void WaitForBuzzInsWithoutLastPlayer()
{
_BuzzInAllowed = true;
int PodiumIndex = _BuzzedInPlayer - 1;
_BuzzedInPlayer = -1;
RequestSerialization();
@ -1451,6 +1456,8 @@ public class GameManagerRound1 : GameManagerBase
{
_BuzzInAllowed = false;
ResetBuzzers();
RequestSerialization();
}
private void ResetBuzzers()

10
Assets/UdonSharp/Podium/PlayerPodium.cs
View File

@ -5,7 +5,6 @@ using TMPro;
using VRC.SDKBase;
using VRC.SDK3.UdonNetworkCalling;
using VRC.Udon.Common.Interfaces;
using System.Runtime.CompilerServices;
using UnityEngine.UI;
@ -59,6 +58,8 @@ public class PlayerPodium : UdonSharpBehaviour
private int _FlashingScoreboardCounter = 0;
private const int MAX_FLASH_COUNTER = 8;
private const float MIN_AVATAR_EYE_HEIGHT = 0.745f;
private const float FLASHING_SCOREBOARD_PERIOD = 0.15f;
void Start()
@ -281,7 +282,7 @@ public class PlayerPodium : UdonSharpBehaviour
break;
}
SendCustomEventDelayedSeconds(nameof(TickFlashingScoreboard), 0.15f);
SendCustomEventDelayedSeconds(nameof(TickFlashingScoreboard), FLASHING_SCOREBOARD_PERIOD);
}
else {
ResetScoreboardColours();
@ -382,7 +383,10 @@ public class PlayerPodium : UdonSharpBehaviour
_PedestalHeight = value;
_Pedestal.transform.localPosition = new Vector3(
_Pedestal.transform.localPosition.x,
-_PedestalHeight,
-Mathf.Clamp(
_PedestalHeight,
MIN_AVATAR_EYE_HEIGHT,
Networking.LocalPlayer.GetAvatarEyeHeightMaximumAsMeters()),
_Pedestal.transform.localPosition.z
);
}

2
Assets/UdonSharp/UtilityScripts/BoneFollower.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: BoneFollower
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/InteractToggle.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: InteractToggle
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: PlayerModSetter
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: GlobalToggleObject
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: MasterToggleObject
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: TrackingDataFollower
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: WorldAudioSettings
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
type: 2}
udonAssembly:
assemblyError:

BIN
Raw Files/Round1Podium.blend
View File

Binary file not shown.