From f2ce892d1e86c1093583acf0c77064825a7c73f3 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Tue, 16 Sep 2025 14:49:36 -0400 Subject: [PATCH] - Pedestals reworked, and have a teleport interactible added to them. - Added a Potato Mode button to the camera admin panel. --- Assets/Models/SM_PlayerPedestal.fbx | Bin 11868 -> 11788 bytes Assets/Prefabs/Full Camera System.prefab | 10 + Assets/Prefabs/Player Podium.prefab | 126 +++++-- Assets/Scenes/witwics.unity | 408 ++++++++++++++++++++--- Assets/UdonSharp/Podium/PlayerPodium.cs | 6 + Assets/VRChatCameraSystem | 2 +- 6 files changed, 482 insertions(+), 70 deletions(-) diff --git a/Assets/Models/SM_PlayerPedestal.fbx b/Assets/Models/SM_PlayerPedestal.fbx index 93f337437d6598a3924346146152c470adf67e29..83af6f1b6fd6ef5d62a89cfd74e3e1dd21129957 100644 GIT binary patch delta 1072 zcmY*YZAepL6n^h*+f}DaQrOD*o%?dLg4D_bLQM6Q`p?Sx!K(2HYp+es1QjB z^8Jy0{HP!G(+{K{g_1=?{fMNXB%*#)1nQ5rqh z%A(swpsyKcYiScb(a389AzL6<07y722HVAGxXY5+=EELhorxm@N8L zQ&N6h8)JYYTum_C?)FCnJSE)L4ghXzMpilJNfTYa#@q@vC{v7NNi?Bub1n1{zkVlo7to|@;!N?Y($Z>VKr&#HJ%ei!Zz#36yTmY8jf6!# z9w2qG64q&;qXs2oqD=-ZTWz2V;HF|ZN}m|=*)hx=C?0`Zh`M!H)Z~iV<%OYb%Hxmg5O*rr|$_jCFpTzUpf? XNOID8_bD;L(>{}pc5^a1Ya03o(7WXJ delta 1168 zcmeB)xf8R2mywZUG9RO^nJEJULpUP?0}wH=0x?@~YI1&Fil+jQU4kUe?VFjClUWRr z?Alz&*uu@CFgZwQ^G}}H;(EVzfXbnO-9ITSHMyi%N1K6x87QU-#2oIa`MIejMU_5N zzT~h?KBSUf-vty0S?U9l4ofX6$xKcyPLTleK%(|QT)~)}z`)qY?662t_wB7Zf&RwE zrwlWaDi|LrcRIUFymH&w#o&tb(Zp8=O(t0ye0}jq;?>17?W@~o^D{iRmiaEG1~DoZ zXp~Sueoke2ejdo4)C$kMl+?)!RPz{9C-bZMG5(tzr>4xbNNsW;hp==iQ1uR|PEdHT z_$B711_K!k?9es=C=`HgPJf~y&Fq}3fnTL(++W1;%(^D_G=q?R!cxv>#&bgNGEcHM zcx=S&@yD@UD`LO%IWaSV`HrqUYwjl=mNWS8@Yr)h9sAGY*S|3@m30q0?(k&2Rt)<` zNxj@3oQwEbvhFdQ_I~2<q~giH8Y@Ie-`>29g7@If0lBh(VzO z@-IjY2!q%lIglCjsy$g>OMP;Iij?>}VA2PL@ z_zN^oe!S1+p<2`GZ@)8a^>ijHDmj3>%aEcodAFp&gJj|AK^!<(hGZo>E6A0_Gbd~7`cH1q?EwJw C;vA9y diff --git a/Assets/Prefabs/Full Camera System.prefab b/Assets/Prefabs/Full Camera System.prefab index 8acd2b3..3a2dc49 100644 --- a/Assets/Prefabs/Full Camera System.prefab +++ b/Assets/Prefabs/Full Camera System.prefab @@ -1724,6 +1724,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument value: SendLiveCamera4 objectReference: {fileID: 0} + - target: {fileID: 8677806729761797939, guid: d9c86bf2ae995824c8d5c5b8311de1a0, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8735248757666063835, guid: d9c86bf2ae995824c8d5c5b8311de1a0, type: 3} propertyPath: m_AnchorMax.x @@ -1744,6 +1749,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 5423613212279373759} + - target: {fileID: 8783432893374596763, guid: d9c86bf2ae995824c8d5c5b8311de1a0, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument + value: TogglePotato + objectReference: {fileID: 0} - target: {fileID: 9029733884110592572, guid: d9c86bf2ae995824c8d5c5b8311de1a0, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index e7cd090..b6f0051 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -383,7 +383,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -511,7 +511,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -846,7 +846,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -934,7 +934,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1299,7 +1299,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1502,7 +1502,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1608,7 +1608,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1710,7 +1710,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1760,7 +1760,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1810,7 +1810,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -1947,7 +1947,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -2408,7 +2408,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, + type: 3} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2536,7 +2537,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, + type: 3} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2664,7 +2666,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, + type: 3} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2792,7 +2795,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, + type: 3} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -2910,7 +2914,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -3137,7 +3142,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -3262,7 +3268,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3} insertIndex: -1 - addedObject: {fileID: 8560623035584941186} + addedObject: {fileID: 4505031650078111987} + - 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: @@ -3276,8 +3290,8 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6167885581044250701} m_PrefabAsset: {fileID: 0} ---- !u!64 &8560623035584941186 -MeshCollider: +--- !u!65 &4505031650078111987 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3294,10 +3308,59 @@ MeshCollider: 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} + serializedVersion: 3 + m_Size: {x: 0.75, y: 0.70000035, z: 2.5} + 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 @@ -3380,7 +3443,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, + type: 3} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -3503,7 +3567,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, + type: 3} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -3607,7 +3672,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -3735,7 +3801,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, + type: 3} - target: {fileID: 8201583978510698366, guid: 951f1ffb73ac3374e904b18fa5f6d87a, type: 3} propertyPath: m_Name @@ -3823,7 +3890,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 1008826..a65c1f5 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -8923,6 +8923,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -20538,6 +20544,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!1 &500303143 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6438408659115984156, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!1 &500987583 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5264929373340086470, guid: be33bc7f6c414e6409becfa348b9310d, @@ -22244,6 +22256,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 547548764} m_CullTransparentMesh: 1 +--- !u!1 &548952826 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6438408659115984156, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1 &549602626 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9213222445483219211, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -26198,6 +26216,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a14cb14e50950304eab77b70f4649c38, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &674142368 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5423613212279373759, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + m_PrefabInstance: {fileID: 1559839983} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674142360} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &678242348 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2805056360774473063, guid: be33bc7f6c414e6409becfa348b9310d, @@ -33102,6 +33132,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -34834,7 +34870,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.0000038146973, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &974801524 MonoBehaviour: @@ -47197,11 +47233,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 974801523} + - {fileID: 1968514083} m_Father: {fileID: 967689108} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -200} + m_AnchoredPosition: {x: 320, y: -520} m_SizeDelta: {x: 640, y: 320} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1333952429 @@ -52476,6 +52513,140 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1491430254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1491430255} + - component: {fileID: 1491430257} + - component: {fileID: 1491430256} + m_Layer: 22 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1491430255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491430254} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1968514083} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1491430256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491430254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Potato Mode + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1491430257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491430254} + m_CullTransparentMesh: 1 --- !u!1 &1494039835 GameObject: m_ObjectHideFlags: 0 @@ -61120,6 +61291,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1581171745 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6438408659115984156, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1582278623 PrefabInstance: m_ObjectHideFlags: 0 @@ -72521,6 +72698,139 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1968514082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1968514083} + - component: {fileID: 1968514086} + - component: {fileID: 1968514085} + - component: {fileID: 1968514084} + m_Layer: 22 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1968514083 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1968514082} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1491430255} + m_Father: {fileID: 1333952428} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -132} + m_SizeDelta: {x: 320, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1968514084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1968514082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1968514085} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 674142368} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: TogglePotato + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1968514085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1968514082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1968514086 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1968514082} + m_CullTransparentMesh: 1 --- !u!1 &1970434647 GameObject: m_ObjectHideFlags: 0 @@ -82061,6 +82371,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84372,65 +84688,65 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - {fileID: 2100000, guid: c4e4a6e05f1eb9e40b245c97b9837de1, type: 2} - {fileID: 2100000, guid: 1f89d6919019b0f448994cf16358a645, type: 2} - {fileID: 2100000, guid: 0f5c040cb557f6c499cd572a32b794b1, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -89029,6 +89345,18 @@ MonoBehaviour: ID: 1114 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 500303143} + ID: 1115 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1581171745} + ID: 1116 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 548952826} + ID: 1117 + 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/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index 19094f0..4f34a33 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -321,6 +321,12 @@ public class PlayerPodium : UdonSharpBehaviour } + public void TeleportLocalPlayerToPedestal() + { + Networking.LocalPlayer.TeleportTo(_SpawnPoint.position, _SpawnPoint.rotation); + } + + public string PlayerName { set diff --git a/Assets/VRChatCameraSystem b/Assets/VRChatCameraSystem index 745f7c6..727992e 160000 --- a/Assets/VRChatCameraSystem +++ b/Assets/VRChatCameraSystem @@ -1 +1 @@ -Subproject commit 745f7c62d3ba11153aed2bd6a0ec43789a10e773 +Subproject commit 727992e71a2c1570dc9cab3561af2b7a187cc91b