From 7d275ae426690c4d83f44c9b1999cfb4768eac80 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sun, 3 May 2026 16:55:32 -0400 Subject: [PATCH] Glass shatter effect now works only when the hosts jump through the window. --- Assembly-CSharp.csproj | 1 + Assets/Prefabs/Glass Shatter Collision.prefab | 55 +- Assets/Scenes/witwics.unity | 768 +++++++++--------- Assets/UdonSharp/TriggerHostNotifier.asset | 296 +++++++ .../UdonSharp/TriggerHostNotifier.asset.meta | 8 + Assets/UdonSharp/TriggerHostNotifier.cs | 43 + Assets/UdonSharp/TriggerHostNotifier.cs.meta | 11 + .../UtilityScripts/BoneFollower.asset | 2 +- .../UtilityScripts/InteractToggle.asset | 2 +- .../UtilityScripts/PlayerModSetter.asset | 2 +- .../Synced/GlobalToggleObject.asset | 2 +- .../Synced/MasterToggleObject.asset | 2 +- .../UtilityScripts/TrackingDataFollower.asset | 2 +- .../UtilityScripts/WorldAudioSettings.asset | 2 +- Assets/UdonSharp/Window/GlassShatter.cs | 25 +- 15 files changed, 782 insertions(+), 439 deletions(-) create mode 100644 Assets/UdonSharp/TriggerHostNotifier.asset create mode 100644 Assets/UdonSharp/TriggerHostNotifier.asset.meta create mode 100644 Assets/UdonSharp/TriggerHostNotifier.cs create mode 100644 Assets/UdonSharp/TriggerHostNotifier.cs.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 56bba5f..ac427f6 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -78,6 +78,7 @@ + diff --git a/Assets/Prefabs/Glass Shatter Collision.prefab b/Assets/Prefabs/Glass Shatter Collision.prefab index f50280c..3a57947 100644 --- a/Assets/Prefabs/Glass Shatter Collision.prefab +++ b/Assets/Prefabs/Glass Shatter Collision.prefab @@ -31,8 +31,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2000544568636214420} - {fileID: 3581063314187638010} + - {fileID: 2000544568636214420} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4253727837975575756 @@ -57,10 +57,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1566564563436244780} + _PermissionsPanel: {fileID: 0} _AudioManager: {fileID: 0} _Colliders: - - {fileID: 5918708424213131158} - {fileID: 4855268702929540186} + - {fileID: 5918708424213131158} --- !u!114 &1566564563436244780 MonoBehaviour: m_ObjectHideFlags: 0 @@ -97,15 +98,15 @@ GameObject: m_Component: - component: {fileID: 3581063314187638010} - component: {fileID: 4855268702929540186} - - component: {fileID: 1535461656591890922} - - component: {fileID: 559608564662970528} + - component: {fileID: 3790274286551473195} + - component: {fileID: 6938366513745602467} m_Layer: 0 - m_Name: Shatter Execute + m_Name: Shatter Prepare m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3581063314187638010 Transform: m_ObjectHideFlags: 0 @@ -142,7 +143,7 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 3.75, y: 2.54, z: 1.0023762} m_Center: {x: 0.00000002856244, y: 0, z: -0.1878225} ---- !u!114 &1535461656591890922 +--- !u!114 &3790274286551473195 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -151,7 +152,7 @@ MonoBehaviour: m_GameObject: {fileID: 5908525339746916104} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3e08ce9bec1b325428a0e59cffc80965, type: 3} + m_Script: {fileID: 11500000, guid: ec635428a12dd254a9c15ac4fecaffe4, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -163,11 +164,12 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 559608564662970528} + _udonSharpBackingUdonBehaviour: {fileID: 6938366513745602467} + _PermissionsPanel: {fileID: 0} _Notify: {fileID: 1566564563436244780} - _EnterEventName: ShatterEnter - _ExitEventName: ShatterExit ---- !u!114 &559608564662970528 + _EnterEventName: PrepareEnter + _ExitEventName: PrepareExit +--- !u!114 &6938366513745602467 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -187,9 +189,9 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 8055943f2cba94741a35b99a3625b7f0, + serializedProgramAsset: {fileID: 11400000, guid: 83583c5ffdd144140b8128759fc7063b, type: 2} - programSource: {fileID: 11400000, guid: 2d43b6d98e535384a8151aa170de0def, type: 2} + programSource: {fileID: 11400000, guid: 242bb9e370e49954aab921bfc5c5a133, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 @@ -203,15 +205,15 @@ GameObject: m_Component: - component: {fileID: 2000544568636214420} - component: {fileID: 5918708424213131158} - - component: {fileID: 284550684963164945} - - component: {fileID: 7563762615754918353} + - component: {fileID: 5913626356306321521} + - component: {fileID: 4095783282581294362} m_Layer: 0 - m_Name: Shatter Prepare + m_Name: Shatter Execute m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2000544568636214420 Transform: m_ObjectHideFlags: 0 @@ -248,7 +250,7 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 3.75, y: 2.54, z: 0.7356629} m_Center: {x: 0.000000018444602, y: 0, z: -0.13783118} ---- !u!114 &284550684963164945 +--- !u!114 &5913626356306321521 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -257,7 +259,7 @@ MonoBehaviour: m_GameObject: {fileID: 6346437046247508492} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3e08ce9bec1b325428a0e59cffc80965, type: 3} + m_Script: {fileID: 11500000, guid: ec635428a12dd254a9c15ac4fecaffe4, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -269,11 +271,12 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 7563762615754918353} + _udonSharpBackingUdonBehaviour: {fileID: 4095783282581294362} + _PermissionsPanel: {fileID: 0} _Notify: {fileID: 1566564563436244780} - _EnterEventName: PrepareEnter - _ExitEventName: PrepareExit ---- !u!114 &7563762615754918353 + _EnterEventName: ShatterEnter + _ExitEventName: ShatterExit +--- !u!114 &4095783282581294362 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -293,9 +296,9 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 8055943f2cba94741a35b99a3625b7f0, + serializedProgramAsset: {fileID: 11400000, guid: 83583c5ffdd144140b8128759fc7063b, type: 2} - programSource: {fileID: 11400000, guid: 2d43b6d98e535384a8151aa170de0def, type: 2} + programSource: {fileID: 11400000, guid: 242bb9e370e49954aab921bfc5c5a133, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index a621afb..647048b 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -16115,6 +16115,12 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &271130710 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5908525339746916104, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 738516939} + m_PrefabAsset: {fileID: 0} --- !u!1 &271618226 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6634928817819609463, guid: be33bc7f6c414e6409becfa348b9310d, @@ -16151,6 +16157,98 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!1001 &275422806 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 472846499} + m_Modifications: + - target: {fileID: 3790274286551473195, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _PermissionsPanel + value: + objectReference: {fileID: 824788962} + - target: {fileID: 3790274286551473195, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3790274286551473195, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _PermissionsPanel + value: + objectReference: {fileID: 824788962} + - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + - target: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_Name + value: Glass Shatter Collision + objectReference: {fileID: 0} + - target: {fileID: 5913626356306321521, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _PermissionsPanel + value: + objectReference: {fileID: 824788962} + - target: {fileID: 5913626356306321521, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5913626356306321521, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000002980233 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} +--- !u!4 &275422807 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 275422806} + m_PrefabAsset: {fileID: 0} --- !u!1 &275868192 GameObject: m_ObjectHideFlags: 0 @@ -19398,12 +19496,6 @@ MonoBehaviour: _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} _FirstLoopCallbackFunction: SwitchToCurrentPlayerAndLocationBoardSwitcher ---- !u!1 &345367811 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 570548972} - m_PrefabAsset: {fileID: 0} --- !u!1 &345544242 GameObject: m_ObjectHideFlags: 0 @@ -20342,12 +20434,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 360160681} m_PrefabAsset: {fileID: 0} ---- !u!1 &363100244 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6346437046247508492, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 570548972} - m_PrefabAsset: {fileID: 0} --- !u!1 &364502343 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8478972476968352305, guid: be33bc7f6c414e6409becfa348b9310d, @@ -25094,8 +25180,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 570548973} - - {fileID: 508235243} + - {fileID: 275422807} + - {fileID: 738516941} m_Father: {fileID: 1427476863} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &472947359 @@ -26036,30 +26122,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1081892970} m_PrefabAsset: {fileID: 0} ---- !u!1 &508235242 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 6157097060019438105} - m_PrefabAsset: {fileID: 0} ---- !u!4 &508235243 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 6157097060019438105} - m_PrefabAsset: {fileID: 0} ---- !u!114 &508235244 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1566564563436244780, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 6157097060019438105} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508235242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &509296276 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8094191378400714075, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -28298,6 +28360,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &555127401 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6346437046247508492, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 275422806} + m_PrefabAsset: {fileID: 0} --- !u!1 &556594542 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7452660295756676056, guid: be33bc7f6c414e6409becfa348b9310d, @@ -28745,110 +28813,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1001 &570548972 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 472846499} - m_Modifications: - - target: {fileID: 284550684963164945, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 284550684963164945, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - - target: {fileID: 1535461656591890922, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 1535461656591890922, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: _AudioManager - value: - objectReference: {fileID: 1947493795} - - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - - target: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_Name - value: Glass Shatter Collision - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} ---- !u!4 &570548973 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 570548972} - m_PrefabAsset: {fileID: 0} ---- !u!114 &570548974 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1566564563436244780, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 570548972} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 345367811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &572517049 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3654857534179495643, guid: c37ec0a412d585049af93f09e1c82ec7, @@ -35981,6 +35945,115 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1001 &738516939 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 472846499} + m_Modifications: + - target: {fileID: 3790274286551473195, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _PermissionsPanel + value: + objectReference: {fileID: 824788962} + - target: {fileID: 3790274286551473195, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3790274286551473195, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _PermissionsPanel + value: + objectReference: {fileID: 824788962} + - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + - target: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_Name + value: Glass Shatter Collision + objectReference: {fileID: 0} + - target: {fileID: 5913626356306321521, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: _PermissionsPanel + value: + objectReference: {fileID: 824788962} + - target: {fileID: 5913626356306321521, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5913626356306321521, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} +--- !u!114 &738516940 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1566564563436244780, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 738516939} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814276237} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &738516941 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 738516939} + m_PrefabAsset: {fileID: 0} --- !u!1001 &738868870 PrefabInstance: m_ObjectHideFlags: 0 @@ -37234,12 +37307,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 2.7434733, y: 5, z: 0.11430004} m_Center: {x: -1.3717198, y: 2.5, z: -0.057151217} ---- !u!1 &761529274 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5908525339746916104, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 6157097060019438105} - m_PrefabAsset: {fileID: 0} --- !u!1 &762731330 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3638020402484674725, guid: be33bc7f6c414e6409becfa348b9310d, @@ -57996,6 +58063,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1232833429 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5908525339746916104, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 275422806} + m_PrefabAsset: {fileID: 0} --- !u!1 &1232957218 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9095978329605045626, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -64377,6 +64450,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} +--- !u!1 &1388097450 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6346437046247508492, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 738516939} + m_PrefabAsset: {fileID: 0} --- !u!1 &1390506330 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7417070277575405171, guid: c37ec0a412d585049af93f09e1c82ec7, @@ -65325,6 +65404,24 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4953860686005405531} m_PrefabAsset: {fileID: 0} +--- !u!1 &1413328209 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 275422806} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1413328210 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1566564563436244780, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 275422806} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413328209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1418121844 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4637207414564558123, guid: be33bc7f6c414e6409becfa348b9310d, @@ -67702,12 +67799,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1466541185} m_CullTransparentMesh: 1 ---- !u!1 &1468254142 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6346437046247508492, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 6157097060019438105} - m_PrefabAsset: {fileID: 0} --- !u!1 &1470552272 GameObject: m_ObjectHideFlags: 0 @@ -83801,12 +83892,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} ---- !u!1 &1664916317 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5908525339746916104, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - m_PrefabInstance: {fileID: 570548972} - m_PrefabAsset: {fileID: 0} --- !u!1 &1668463691 GameObject: m_ObjectHideFlags: 0 @@ -89637,6 +89722,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1768602428} m_PrefabAsset: {fileID: 0} +--- !u!1 &1814276237 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 738516939} + m_PrefabAsset: {fileID: 0} --- !u!1 &1815463996 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5200179733887901423, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -113087,97 +113178,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 27098a93425e81745a1dc84c7b56ee61, type: 3} ---- !u!1001 &6157097060019438105 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 472846499} - m_Modifications: - - target: {fileID: 284550684963164945, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 284550684963164945, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - - target: {fileID: 1535461656591890922, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 1535461656591890922, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: _AudioManager - value: - objectReference: {fileID: 1947493795} - - target: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 4253727837975575756, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - - target: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_Name - value: Glass Shatter Collision - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} --- !u!1001 &6332640093748342308 PrefabInstance: m_ObjectHideFlags: 0 @@ -113415,80 +113415,37 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} - - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} - - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} - - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} - - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} - - {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2} - - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} - - {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2} - - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} - - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} - - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} - - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} - - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} - - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} + - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} + - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, 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: 98b5c6e030fc83d48bbba9e927a456d4, 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: 73a2ec678ab61104d971005336784b32, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} + - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} + - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} + - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} + - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} + - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} + - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} @@ -113500,56 +113457,99 @@ MonoBehaviour: - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} - - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} - - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} - - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} - - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} - - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} - - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} - - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} - - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} + - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} + - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} + - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} + - {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} + - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} + - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} + - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} + - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} - - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -119002,34 +119002,10 @@ MonoBehaviour: ID: 1303 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 508235242} - ID: 1304 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 761529274} - ID: 1305 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1468254142} - ID: 1306 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 59893113} ID: 1307 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 345367811} - ID: 1308 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1664916317} - ID: 1309 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 363100244} - ID: 1310 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 12138828} ID: 1311 SerializedTypeNames: @@ -119198,6 +119174,30 @@ MonoBehaviour: ID: 1361 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1413328209} + ID: 1362 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 555127401} + ID: 1363 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1232833429} + ID: 1364 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1814276237} + ID: 1365 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1388097450} + ID: 1366 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 271130710} + ID: 1367 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -119959,12 +119959,12 @@ PrefabInstance: type: 3} propertyPath: _HostEventListeners.Array.data[9] value: - objectReference: {fileID: 570548974} + objectReference: {fileID: 1413328210} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[10] value: - objectReference: {fileID: 508235244} + objectReference: {fileID: 738516940} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _CameraEventListeners.Array.data[0] diff --git a/Assets/UdonSharp/TriggerHostNotifier.asset b/Assets/UdonSharp/TriggerHostNotifier.asset new file mode 100644 index 0000000..661a4ab --- /dev/null +++ b/Assets/UdonSharp/TriggerHostNotifier.asset @@ -0,0 +1,296 @@ +%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: TriggerHostNotifier + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 83583c5ffdd144140b8128759fc7063b, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: ec635428a12dd254a9c15ac4fecaffe4, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 7456581949401078813 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _PermissionsPanel + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PermissionsPanel + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PermissionsPanel, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Notify + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Notify + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 9|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _EnterEventName + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _EnterEventName + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ExitEventName + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ExitEventName + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/TriggerHostNotifier.asset.meta b/Assets/UdonSharp/TriggerHostNotifier.asset.meta new file mode 100644 index 0000000..674dc6b --- /dev/null +++ b/Assets/UdonSharp/TriggerHostNotifier.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 242bb9e370e49954aab921bfc5c5a133 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/TriggerHostNotifier.cs b/Assets/UdonSharp/TriggerHostNotifier.cs new file mode 100644 index 0000000..69dd5fd --- /dev/null +++ b/Assets/UdonSharp/TriggerHostNotifier.cs @@ -0,0 +1,43 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class TriggerHostNotifier : UdonSharpBehaviour +{ + [SerializeField] private PermissionsPanel _PermissionsPanel; + [Space] + [SerializeField] private UdonBehaviour _Notify = null; + [SerializeField] private string _EnterEventName = ""; + [SerializeField] private string _ExitEventName = ""; + + + public override void OnPlayerTriggerEnter(VRCPlayerApi Player) + { + if (_PermissionsPanel.IsPlayerHost(Player)) + { + if (_Notify && _EnterEventName != "") + { + _Notify.SendCustomEvent(_EnterEventName); + } + } + + base.OnPlayerTriggerEnter(Player); + } + + public override void OnPlayerTriggerExit(VRCPlayerApi Player) + { + if (_PermissionsPanel.IsPlayerHost(Player)) + { + if (_Notify && _ExitEventName != "") + { + _Notify.SendCustomEvent(_ExitEventName); + } + } + + base.OnPlayerTriggerExit(Player); + } +} diff --git a/Assets/UdonSharp/TriggerHostNotifier.cs.meta b/Assets/UdonSharp/TriggerHostNotifier.cs.meta new file mode 100644 index 0000000..0db1c16 --- /dev/null +++ b/Assets/UdonSharp/TriggerHostNotifier.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec635428a12dd254a9c15ac4fecaffe4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/Window/GlassShatter.cs b/Assets/UdonSharp/Window/GlassShatter.cs index 5117e1c..05c9d3e 100644 --- a/Assets/UdonSharp/Window/GlassShatter.cs +++ b/Assets/UdonSharp/Window/GlassShatter.cs @@ -1,7 +1,7 @@  using UdonSharp; using UnityEngine; -using VRC.Udon.Common.Interfaces; +using VRC.SDKBase; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -15,29 +15,9 @@ public class GlassShatter : UdonSharpBehaviour private bool _Prepared = false; - public void HostEnabled() - { - foreach (Collider GlassCollider in _Colliders) - { - GlassCollider.gameObject.SetActive(true); - } - } - - public void HostDisabled() - { - foreach (Collider GlassCollider in _Colliders) - { - GlassCollider.gameObject.SetActive(false); - } - } - - public void PrepareEnter() { - if (!Shattered) - { - _Prepared = true; - } + _Prepared = true; } public void PrepareExit() { @@ -48,6 +28,7 @@ public class GlassShatter : UdonSharpBehaviour { if (_Prepared && !Shattered) { + Networking.SetOwner(Networking.LocalPlayer, gameObject); Shattered = true; _Shatter_Synced(); RequestSerialization();