From 0f2767b62c2ee392f9abe529f014b8b3c2d32fa2 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Wed, 20 May 2026 01:01:06 -0400 Subject: [PATCH] Choice cards now use VRCObjectSync. --- Assets/Prefabs/Choice Card.prefab | 362 +---- Assets/Prefabs/Player Podium.prefab | 257 +++- Assets/Scenes/witwics.unity | 1260 ++++++++++------- .../Game Managers/GameManagerRound1.cs | 8 +- .../Interacts/PickupInteractCallback.cs | 2 - Assets/UdonSharp/Podiums/ChoiceCard.asset | 303 +++- Assets/UdonSharp/Podiums/ChoiceCard.cs | 112 +- .../UdonSharp/Podiums/ChoiceCardGroup.asset | 542 ++++++- Assets/UdonSharp/Podiums/ChoiceCardGroup.cs | 199 ++- Assets/UdonSharp/Podiums/PlayerPodium.cs | 6 +- 10 files changed, 2066 insertions(+), 985 deletions(-) diff --git a/Assets/Prefabs/Choice Card.prefab b/Assets/Prefabs/Choice Card.prefab index 4e7db6f..6040eb1 100644 --- a/Assets/Prefabs/Choice Card.prefab +++ b/Assets/Prefabs/Choice Card.prefab @@ -195,35 +195,31 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6270148561517928951 +--- !u!1 &4112856245971471645 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5977885955148531860} - - component: {fileID: 6325496298733158921} - - component: {fileID: 6178931772031611902} - - component: {fileID: 135493468127288616} - - component: {fileID: 5747985586494662186} - - component: {fileID: 6524184763710631069} - - component: {fileID: 3549727416854527859} - m_Layer: 0 - m_Name: Choice Card_looper + - component: {fileID: 4420626131256341250} + - component: {fileID: 6414529169846131411} + - component: {fileID: 3378448461906870724} + m_Layer: 13 + m_Name: Choice Card Manager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5977885955148531860 +--- !u!4 &4420626131256341250 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6270148561517928951} + m_GameObject: {fileID: 4112856245971471645} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -232,16 +228,16 @@ Transform: m_Children: [] m_Father: {fileID: 790038199363530877} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6325496298733158921 +--- !u!114 &6414529169846131411 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6270148561517928951} - m_Enabled: 0 + m_GameObject: {fileID: 4112856245971471645} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bea5fa186e4e67342a4be5316722cfb4, type: 3} + m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -253,16 +249,22 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 6178931772031611902} - sync: {fileID: 7283672609641221461} - data: {fileID: 8391138595911400321} ---- !u!114 &6178931772031611902 + _udonSharpBackingUdonBehaviour: {fileID: 3378448461906870724} + ChoiceNumber: 0 + CardGroup: {fileID: 0} + _Pickup: {fileID: 8449231392663437977} + _ObjectSync: {fileID: 3119743514857899696} + CardInteractObject: {fileID: 8870628026642093391} + _Mesh: {fileID: 8103913657558548278} + _SpawnPosition: {fileID: 0} + _HeldPosition: {fileID: 0} +--- !u!114 &3378448461906870724 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6270148561517928951} + m_GameObject: {fileID: 4112856245971471645} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} @@ -275,110 +277,10 @@ MonoBehaviour: SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 - _syncMethod: 0 - serializedProgramAsset: {fileID: 11400000, guid: aa7dfdcc5dda8f846b435b9da336970a, + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 2bde40f0de0d2814daa3b6cd7e581e72, type: 2} - programSource: {fileID: 11400000, guid: f55d258c4edbbe146a41756b51674e63, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &135493468127288616 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6270148561517928951} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 033ca15a573c15f4abfff7cd4357218c, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 5747985586494662186} - sync: {fileID: 7283672609641221461} - data: {fileID: 8391138595911400321} ---- !u!114 &5747985586494662186 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6270148561517928951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Use - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 0 - serializedProgramAsset: {fileID: 11400000, guid: 3246074af68639e4ca3785ac7744faf3, - type: 2} - programSource: {fileID: 11400000, guid: f46a04b3664ce2d4382238a1ede0f168, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &6524184763710631069 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6270148561517928951} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a082bb6c340547f4e9849389bcdc72c1, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 3549727416854527859} - sync: {fileID: 7283672609641221461} - data: {fileID: 8391138595911400321} ---- !u!114 &3549727416854527859 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6270148561517928951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Use - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 0 - serializedProgramAsset: {fileID: 11400000, guid: 17a25010d3e727149bc8de32418caf1a, - type: 2} - programSource: {fileID: 11400000, guid: 6b246d48ea259674cb15ba990bf99ec0, type: 2} + programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 @@ -392,12 +294,13 @@ GameObject: m_Component: - component: {fileID: 790038199363530877} - component: {fileID: 1491000360205470262} - - component: {fileID: 7847633811780037068} - component: {fileID: 973738300308612844} - component: {fileID: 8449231392663437977} - - component: {fileID: 7283672609641221461} - - component: {fileID: 2917566267679481404} - - component: {fileID: 5619874437821735354} + - component: {fileID: 3119743514857899696} + - component: {fileID: 8870628026642093391} + - component: {fileID: 7509585427864051925} + - component: {fileID: 5297450530140816950} + - component: {fileID: 7338222483864858306} m_Layer: 13 m_Name: Choice Card m_TagString: Untagged @@ -420,8 +323,7 @@ Transform: m_Children: - {fileID: 6934925868593136729} - {fileID: 6780178683120054528} - - {fileID: 7178783728671776891} - - {fileID: 5977885955148531860} + - {fileID: 4420626131256341250} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1491000360205470262 @@ -445,32 +347,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.5, y: 0.005, z: 0.1} m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &7847633811780037068 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6482999695541853627} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Choose - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 2bde40f0de0d2814daa3b6cd7e581e72, - type: 2} - programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 --- !u!54 &973738300308612844 Rigidbody: m_ObjectHideFlags: 0 @@ -517,7 +393,7 @@ MonoBehaviour: allowManipulationWhenEquipped: 1 orientation: 0 AutoHold: 2 - InteractionText: Pick Up + InteractionText: Choose UseText: Use useEventBroadcastType: 0 UseDownEventName: @@ -531,7 +407,7 @@ MonoBehaviour: pickupable: 1 proximity: 2 version: 0 ---- !u!114 &7283672609641221461 +--- !u!114 &3119743514857899696 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -540,7 +416,21 @@ MonoBehaviour: m_GameObject: {fileID: 6482999695541853627} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73412ff0ee736d748bcef5ca61afd71d, type: 3} + m_Script: {fileID: -1783056023, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + AllowCollisionOwnershipTransfer: 0 + ForceKinematicOnRemote: 1 +--- !u!114 &8870628026642093391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6482999695541853627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa2793bec313c634a9159054b022bfbb, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -552,56 +442,10 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 5619874437821735354} - networkDataOptimization: 0 - data: {fileID: 8391138595911400321} - looper: {fileID: 6325496298733158921} - fixedLooper: {fileID: 135493468127288616} - lateLooper: {fileID: 6524184763710631069} - rigid: {fileID: 973738300308612844} - pickup: {fileID: 8449231392663437977} - respawnHeight: -10 - smoothingTime: -0.25 - allowTheftFromSelf: 1 - allowTheftWhenAttachedToPlayer: 1 - kinematicWhileHeld: 1 - syncIsKinematic: 1 - syncPickupable: 0 - sleepOnSpawn: 1 - runEveryFrameOnOwner: 0 - eventListeners: [] - _behaviourEventListeners: [] - _classEventListeners: [] - customStates: [] - enterFirstCustomStateOnStart: 0 - debugLogs: 0 - kinematicWhileAttachedToPlayer: 1 - useWorldSpaceTransforms: 0 - useWorldSpaceTransformsWhenHeldOrAttachedToPlayer: 0 - syncCollisions: 1 - syncParticleCollisions: 1 - allowOutOfOrderData: 0 - takeOwnershipOfOtherObjectsOnCollision: 1 - allowOthersToTakeOwnershipOnCollision: 1 - positionDesyncThreshold: 0.015 - rotationDesyncThreshold: 0.995 - minimumSleepFrames: 4 - spawnPos: {x: 0, y: 0, z: 0} - spawnRot: {x: -0, y: -0, z: -0, w: 1} - _state: -1 - localTransformFlag: 1 - leftHandFlag: 0 - kinematicFlag: 1 - pickupableFlag: 1 - bounceFlag: 0 - sleepFlag: 0 - autoSmoothingTime: 0 - lastKinematic: 1 - lastPickupable: 1 - _showInternalObjects: 0 - showInternalObjects: 0 - unparentInternalDataObject: 0 ---- !u!114 &2917566267679481404 + _udonSharpBackingUdonBehaviour: {fileID: 7338222483864858306} + _CallbackObject: {fileID: 6414529169846131411} + _InteractCallbackFunction: ChoiceCardInteract +--- !u!114 &7509585427864051925 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -610,7 +454,7 @@ MonoBehaviour: m_GameObject: {fileID: 6482999695541853627} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3} + m_Script: {fileID: 11500000, guid: 2b02b023f226de14f9feb829806abc3c, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -622,13 +466,14 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 7847633811780037068} - ChoiceNumber: 1 - CardGroup: {fileID: 0} - _Mesh: {fileID: 8103913657558548278} - _SpawnPosition: {fileID: 0} - _HeldPosition: {fileID: 0} ---- !u!114 &5619874437821735354 + _udonSharpBackingUdonBehaviour: {fileID: 5297450530140816950} + _CallbackObject: {fileID: 6414529169846131411} + _SendOwnershipTransferRequest: 0 + _OnPickupCallbackFunction: ChoiceCardPickedUp + _OnDropCallbackFunction: + _UseDownCallbackFunction: + _UseUpCallbackFunction: +--- !u!114 &5297450530140816950 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -647,93 +492,36 @@ MonoBehaviour: SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 - _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 011009d075591eb439541bd2b381210d, + _syncMethod: 2 + serializedProgramAsset: {fileID: 11400000, guid: f4f5ffed807c4e54e9967bed703330e8, type: 2} - programSource: {fileID: 11400000, guid: f2db2b81059e41b4fbce86f13207c26a, type: 2} + programSource: {fileID: 11400000, guid: 8a529462baaa2674899ff9ce101c5aa9, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &6886899310538936877 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7178783728671776891} - - component: {fileID: 8391138595911400321} - - component: {fileID: 2617317641955143246} - m_Layer: 0 - m_Name: Choice Card_dataUltra - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7178783728671776891 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6886899310538936877} - serializedVersion: 2 - 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: 790038199363530877} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8391138595911400321 +--- !u!114 &7338222483864858306 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6886899310538936877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85dd2eca6a5b7b4396e13ced0f8e66e, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 2617317641955143246} - sync: {fileID: 7283672609641221461} - lastDeserialization: 0 ---- !u!114 &2617317641955143246 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6886899310538936877} + m_GameObject: {fileID: 6482999695541853627} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} m_Name: m_EditorClassIdentifier: interactTextPlacement: {fileID: 0} - interactText: Use + interactText: Choose interactTextGO: {fileID: 0} proximity: 2 SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 0 - serializedProgramAsset: {fileID: 11400000, guid: e6297c9d4177fb247b0654c8e167c1eb, + serializedProgramAsset: {fileID: 11400000, guid: 0b1672d769a098a48a503e3b254ed201, type: 2} - programSource: {fileID: 11400000, guid: bc9cfe466e2297342b46ff2f42676890, type: 2} + programSource: {fileID: 11400000, guid: 36a2cae6185521143adc5e9f17c3b674, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index a661035..c981690 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -134,6 +134,42 @@ Transform: - {fileID: 6870780070157004044} m_Father: {fileID: 9043478063159764907} m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} +--- !u!1 &774511624642313370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4642601734963104639} + m_Layer: 0 + m_Name: Choice Cards Enabler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4642601734963104639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774511624642313370} + serializedVersion: 2 + 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: 2978271015408449549} + - {fileID: 78434554900276400} + - {fileID: 6190117174038594721} + - {fileID: 2250248657447934369} + - {fileID: 9149069322342715399} + m_Father: {fileID: 5617792120913924276} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1244661691447859818 GameObject: m_ObjectHideFlags: 1 @@ -378,12 +414,12 @@ Transform: m_GameObject: {fileID: 2072657426130996047} serializedVersion: 2 m_LocalRotation: {x: -0.25881582, y: -0, z: -0, w: 0.96592677} - m_LocalPosition: {x: 0, y: 0, z: 0.12} + m_LocalPosition: {x: 0, y: -0.0148, z: 0.120000005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4784420777705181201} - m_Father: {fileID: 5617792120913924276} + m_Father: {fileID: 4642601734963104639} m_LocalEulerAnglesHint: {x: -30, y: 0, z: 0} --- !u!1 &2509325258865248374 GameObject: @@ -411,12 +447,12 @@ Transform: m_GameObject: {fileID: 2509325258865248374} serializedVersion: 2 m_LocalRotation: {x: -0.7071065, y: -0, z: -0, w: 0.7071071} - m_LocalPosition: {x: 0, y: 0.2613, z: -0.062} + m_LocalPosition: {x: 0, y: 0.26129997, z: -0.062000006} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8577831597274818056} - m_Father: {fileID: 5617792120913924276} + m_Father: {fileID: 4642601734963104639} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!95 &3292427936088400333 Animator: @@ -1048,7 +1084,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5617792120913924276 Transform: m_ObjectHideFlags: 0 @@ -1062,11 +1098,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2978271015408449549} - - {fileID: 78434554900276400} - - {fileID: 6190117174038594721} - - {fileID: 2250248657447934369} - - {fileID: 9149069322342715399} + - {fileID: 4642601734963104639} m_Father: {fileID: 5984335492357139332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4424524232366912296 @@ -1092,10 +1124,11 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 8462795151643791661} _Podium: {fileID: 1226214083704227558} + _ChoiceCardEnabler: {fileID: 774511624642313370} _ChoiceCards: - - {fileID: 6984570406273449552} - - {fileID: 5337512749652812684} - - {fileID: 8788051151229107463} + - {fileID: 1267647417107331775} + - {fileID: 4281547526140684131} + - {fileID: 616103289091848680} _ChoiceCardText: - {fileID: 4583055032373359887} - {fileID: 1542133310407370963} @@ -1667,7 +1700,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &9149069322342715399 Transform: m_ObjectHideFlags: 0 @@ -1677,11 +1710,11 @@ Transform: m_GameObject: {fileID: 5957486306513083280} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000002533197} - m_LocalPosition: {x: 0, y: 0.187, z: 0.1565} + m_LocalPosition: {x: 0, y: 0.18700004, z: 0.1565} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5617792120913924276} + m_Father: {fileID: 4642601734963104639} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!65 &2039829568681020909 BoxCollider: @@ -1860,12 +1893,12 @@ Transform: m_GameObject: {fileID: 6327497061561740258} serializedVersion: 2 m_LocalRotation: {x: -0.25881582, y: -0, z: -0, w: 0.96592677} - m_LocalPosition: {x: 0, y: 0, z: -0.12} + m_LocalPosition: {x: 0, y: -0.0148, z: -0.120000005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6592967937484051270} - m_Father: {fileID: 5617792120913924276} + m_Father: {fileID: 4642601734963104639} m_LocalEulerAnglesHint: {x: -30, y: 0, z: 0} --- !u!1 &6494273791062881839 GameObject: @@ -3145,12 +3178,12 @@ Transform: m_GameObject: {fileID: 9148953967701599947} serializedVersion: 2 m_LocalRotation: {x: -0.25881582, y: -0, z: -0, w: 0.96592677} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.0148, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7537098398815702477} - m_Father: {fileID: 5617792120913924276} + m_Father: {fileID: 4642601734963104639} m_LocalEulerAnglesHint: {x: -30, y: 0, z: 0} --- !u!1001 &93565828674477749 PrefabInstance: @@ -4704,6 +4737,32 @@ PrefabInstance: value: objectReference: {fileID: 6325496298733158921, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: CardGroup + value: + objectReference: {fileID: 4424524232366912296} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: ChoiceNumber + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: _HeldPosition + value: + objectReference: {fileID: 2250248657447934369} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: _SpawnPosition + value: + objectReference: {fileID: 2978271015408449549} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -4721,17 +4780,41 @@ PrefabInstance: value: objectReference: {fileID: 7283672609641221461, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} +--- !u!114 &1267647417107331775 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + m_PrefabInstance: {fileID: 5229641065418514540} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &4583055032373359887 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8577424976867415395, guid: d83c707b77b55e84daa10ea35b1e8fdf, @@ -4750,18 +4833,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5229641065418514540} m_PrefabAsset: {fileID: 0} ---- !u!114 &6984570406273449552 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, - type: 3} - m_PrefabInstance: {fileID: 5229641065418514540} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &5874992881257390907 PrefabInstance: m_ObjectHideFlags: 0 @@ -4858,6 +4929,32 @@ PrefabInstance: value: objectReference: {fileID: 6325496298733158921, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: CardGroup + value: + objectReference: {fileID: 4424524232366912296} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: ChoiceNumber + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: _HeldPosition + value: + objectReference: {fileID: 2250248657447934369} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: _SpawnPosition + value: + objectReference: {fileID: 6190117174038594721} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -4875,17 +4972,41 @@ PrefabInstance: value: objectReference: {fileID: 7283672609641221461, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} +--- !u!114 &616103289091848680 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + m_PrefabInstance: {fileID: 5874992881257390907} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &2774508140835993176 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8577424976867415395, guid: d83c707b77b55e84daa10ea35b1e8fdf, @@ -4904,18 +5025,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5874992881257390907} m_PrefabAsset: {fileID: 0} ---- !u!114 &8788051151229107463 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, - type: 3} - m_PrefabInstance: {fileID: 5874992881257390907} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &6878968199621207562 PrefabInstance: m_ObjectHideFlags: 0 @@ -5382,6 +5491,32 @@ PrefabInstance: value: objectReference: {fileID: 6325496298733158921, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: CardGroup + value: + objectReference: {fileID: 4424524232366912296} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: ChoiceNumber + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: _HeldPosition + value: + objectReference: {fileID: 2250248657447934369} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: _SpawnPosition + value: + objectReference: {fileID: 78434554900276400} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -5399,12 +5534,24 @@ PrefabInstance: value: objectReference: {fileID: 7283672609641221461, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5422,9 +5569,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5337512749652812684 stripped +--- !u!114 &4281547526140684131 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2917566267679481404, guid: d83c707b77b55e84daa10ea35b1e8fdf, + m_CorrespondingSourceObject: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} m_PrefabInstance: {fileID: 7093134782831148464} m_PrefabAsset: {fileID: 0} @@ -5973,6 +6120,12 @@ PrefabInstance: value: objectReference: {fileID: 6325496298733158921, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6414529169846131411, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 6482999695541853627, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: m_Name @@ -6000,12 +6153,24 @@ PrefabInstance: value: objectReference: {fileID: 7283672609641221461, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7509585427864051925, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} - target: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 8391138595911400321, guid: d83c707b77b55e84daa10ea35b1e8fdf, type: 3} + - target: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8870628026642093391, guid: d83c707b77b55e84daa10ea35b1e8fdf, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 9e5f3e4..d48ee3c 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -4172,6 +4172,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &112548883 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7537871362026368550, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1 &112898042 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7529788859688686457, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -8952,6 +8958,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2136439120} m_Modifications: + - target: {fileID: 78595187083798106, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 279866426270687155, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -8982,12 +8993,19 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 450509189954036018, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 480585817991929088, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 497259478815785786, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 497259478815785786, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 529059399529170502, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9002,12 +9020,19 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 539074216792060133, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 604159123653676994, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 616103289091848680, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 616103289091848680, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 618989912945973853, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9018,7 +9043,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 688773622251974132, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 745496000928898405, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 745496000928898405, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 758524307634163980, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9028,7 +9060,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 793378590324903846, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 925022177518064008, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9092,6 +9125,12 @@ PrefabInstance: value: objectReference: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 1267647417107331775, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1267647417107331775, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1277409865031452039, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9113,7 +9152,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1304326104985373937, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1308355964467323367, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9156,11 +9196,18 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1570414613251225248, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1570414613251225248, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1593342540512249393, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1593342540512249393, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1618227748963132736, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -9171,6 +9218,11 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1732893919503721741, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1766502199382857038, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Mesh @@ -9186,13 +9238,20 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1794858485046500128, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 1834422657366255871, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1834422657366255871, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9233,7 +9292,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2259619033527165541, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9245,6 +9305,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2352008203549114553, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2352008203549114553, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9294,6 +9360,12 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 2664072310590131366, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2664072310590131366, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2665040028511114726, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9303,7 +9375,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2736916431090604218, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2778745229560357004, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9324,7 +9397,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2843702744343018216, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2901349880325940619, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9354,12 +9428,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3041335693682627708, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 3067769207063836276, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3067769207063836276, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3112740238437272457, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 3164820738811214726, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3200879201637768123, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9389,7 +9475,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3280774963962359097, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3290744769684855706, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9443,6 +9530,17 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 3780772836946022467, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3782769961823481604, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9473,7 +9571,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3791159264989671022, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3801675978665040074, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9483,7 +9582,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3866144428122439609, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3922666842683793504, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9504,13 +9604,20 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4099806150413963565, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4128577260680745220, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 4128577260680745220, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 4161118036448953326, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4161118036448953326, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4204982213565396515, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9526,6 +9633,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4281547526140684131, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4281547526140684131, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4322517306009686976, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9535,7 +9648,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4386570698081868781, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4388808763258160335, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9723,7 +9837,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5292349962435968324, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5337512749652812684, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9787,7 +9902,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5794290425952435731, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -10049,7 +10165,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7173880259882967192, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -10255,7 +10372,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8943319256687070045, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 9001351926520298607, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Enabled @@ -10324,54 +10442,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} ---- !u!1 &172614120 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3096322638613673858, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} ---- !u!1 &172614121 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2481339920395584600, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} ---- !u!1 &172614122 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 471787259892875980, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} ---- !u!1 &172614123 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1016411128462700822, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} ---- !u!1 &172614124 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3849428023357856839, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} ---- !u!1 &172614125 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4466672453150601117, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} ---- !u!1 &172614126 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2276393905415192987, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} ---- !u!1 &172614127 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1657400220333290049, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} --- !u!198 &173137748 stripped ParticleSystem: m_CorrespondingSourceObject: {fileID: 4768441412256177385, guid: 5066b3b269b691d458beae6cb7911193, @@ -14361,6 +14431,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &308912626 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6592192839948333229, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1 &312861885 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3399896408265175220, guid: 2b99fd9657c68844b83eb85741ade184, @@ -16954,6 +17030,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &408160000 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6592192839948333229, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1 &408428549 GameObject: m_ObjectHideFlags: 0 @@ -26155,6 +26237,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &727585403 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4301549049396625086, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + m_PrefabInstance: {fileID: 8272999532935149685} + m_PrefabAsset: {fileID: 0} --- !u!1 &728697464 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7878496430163110028, guid: be33bc7f6c414e6409becfa348b9310d, @@ -27541,6 +27629,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &765781636 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4967363850375715688, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!1 &766483133 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1319322105371860801, guid: c37ec0a412d585049af93f09e1c82ec7, @@ -30737,6 +30831,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 596933551} m_PrefabAsset: {fileID: 0} +--- !u!1 &903212545 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8178719581124210033, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!4 &904261777 stripped Transform: m_CorrespondingSourceObject: {fileID: 2291016102578546175, guid: 700c7675bc7fcf547a888725c3536e38, @@ -31438,6 +31538,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2136439120} m_Modifications: + - target: {fileID: 78595187083798106, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 279866426270687155, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31468,12 +31573,19 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 450509189954036018, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 480585817991929088, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 497259478815785786, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 497259478815785786, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 529059399529170502, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31488,12 +31600,19 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 539074216792060133, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 604159123653676994, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 616103289091848680, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 616103289091848680, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 618989912945973853, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31504,7 +31623,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 688773622251974132, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 745496000928898405, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 745496000928898405, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 758524307634163980, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31514,7 +31640,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 793378590324903846, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 925022177518064008, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31578,6 +31705,12 @@ PrefabInstance: value: objectReference: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 1267647417107331775, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1267647417107331775, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1277409865031452039, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31599,7 +31732,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1304326104985373937, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1308355964467323367, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31642,11 +31776,18 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1570414613251225248, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1570414613251225248, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1593342540512249393, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1593342540512249393, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1618227748963132736, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -31657,6 +31798,11 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1732893919503721741, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1766502199382857038, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Mesh @@ -31672,13 +31818,20 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1794858485046500128, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 1834422657366255871, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1834422657366255871, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31719,7 +31872,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2259619033527165541, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31731,6 +31885,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2352008203549114553, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2352008203549114553, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31780,6 +31940,12 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 2664072310590131366, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2664072310590131366, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2665040028511114726, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31789,7 +31955,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2736916431090604218, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2778745229560357004, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31810,7 +31977,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2843702744343018216, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2901349880325940619, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31840,12 +32008,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3041335693682627708, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 3067769207063836276, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3067769207063836276, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3112740238437272457, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 3164820738811214726, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3200879201637768123, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31875,7 +32055,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3280774963962359097, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3290744769684855706, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31929,6 +32110,17 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 3780772836946022467, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3782769961823481604, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31959,7 +32151,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3791159264989671022, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3801675978665040074, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -31969,7 +32162,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3866144428122439609, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3922666842683793504, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31990,13 +32184,20 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4099806150413963565, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4128577260680745220, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 4128577260680745220, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 4161118036448953326, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4161118036448953326, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4204982213565396515, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -32012,6 +32213,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4281547526140684131, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4281547526140684131, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4322517306009686976, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -32021,7 +32228,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4386570698081868781, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4388808763258160335, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -32209,7 +32417,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5292349962435968324, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5337512749652812684, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -32278,7 +32487,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5794290425952435731, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -32540,7 +32750,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7173880259882967192, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -32746,7 +32957,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8943319256687070045, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 9001351926520298607, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Enabled @@ -32815,54 +33027,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} ---- !u!1 &937910642 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3096322638613673858, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} ---- !u!1 &937910643 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2481339920395584600, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} ---- !u!1 &937910644 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 471787259892875980, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} ---- !u!1 &937910645 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1016411128462700822, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} ---- !u!1 &937910646 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3849428023357856839, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} ---- !u!1 &937910647 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4466672453150601117, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} ---- !u!1 &937910648 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2276393905415192987, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} ---- !u!1 &937910649 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1657400220333290049, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} --- !u!1 &938262254 GameObject: m_ObjectHideFlags: 0 @@ -32931,6 +33095,12 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 755894344250147792, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 755894344250147792, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} - target: {fileID: 1186979139362781963, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: _MarkerMesh @@ -32993,6 +33163,12 @@ PrefabInstance: value: objectReference: {fileID: 1601383531174877316, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} + - target: {fileID: 1824200836929615434, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1824200836929615434, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} - target: {fileID: 2675039169023975669, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: m_LocalScale.x @@ -33053,6 +33229,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3156534050252334387, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3855851560336711948, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: serializationData.Prefab @@ -33065,6 +33246,12 @@ PrefabInstance: value: objectReference: {fileID: 4089442974016229272, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} + - target: {fileID: 4273614253258701270, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4273614253258701270, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} - target: {fileID: 4346564460065018373, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: m_AnchoredPosition.x @@ -43280,6 +43467,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2f1b9568997cc4f4c85452d8d1bb3344, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1169760577 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7537871362026368550, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!4 &1169973742 stripped Transform: m_CorrespondingSourceObject: {fileID: 2388802515724131620, guid: b85f701cb04cd0c45a23d3d8e6da9cd3, @@ -43521,12 +43714,24 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1768602428} m_PrefabAsset: {fileID: 0} +--- !u!1 &1175667885 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6582535567461379608, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + m_PrefabInstance: {fileID: 938385720} + m_PrefabAsset: {fileID: 0} --- !u!1 &1176275284 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} m_PrefabInstance: {fileID: 306921567} m_PrefabAsset: {fileID: 0} +--- !u!1 &1178746431 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6592192839948333229, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!1 &1180325604 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5756147957348299915, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -44797,6 +45002,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1255439616 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8178719581124210033, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!1 &1255998691 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7618135886182503325, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -47542,6 +47753,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &1340012852 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4967363850375715688, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1341089309 PrefabInstance: m_ObjectHideFlags: 0 @@ -47940,6 +48157,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 98354744} m_PrefabAsset: {fileID: 0} +--- !u!1 &1349577823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6582535567461379608, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + m_PrefabInstance: {fileID: 8272999532935149685} + m_PrefabAsset: {fileID: 0} --- !u!1 &1349708922 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5671163308681527780, guid: e9914385266bca24db809c39e395f03c, @@ -48351,6 +48574,12 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &1354794507 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8178719581124210033, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1 &1355919009 GameObject: m_ObjectHideFlags: 0 @@ -65269,6 +65498,12 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &1696130827 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7537871362026368550, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1 &1697147127 stripped GameObject: m_CorrespondingSourceObject: {fileID: 280863215230845098, guid: 126991d511ca61841a0ef899b6c038a6, @@ -69183,6 +69418,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1831441061} m_PrefabAsset: {fileID: 0} +--- !u!1 &1832304735 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4967363850375715688, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1832440711 PrefabInstance: m_ObjectHideFlags: 0 @@ -72827,6 +73068,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!1 &1940768912 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4301549049396625086, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + m_PrefabInstance: {fileID: 938385720} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1941376487 PrefabInstance: m_ObjectHideFlags: 0 @@ -83974,6 +84221,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2136439120} m_Modifications: + - target: {fileID: 78595187083798106, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 279866426270687155, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84004,12 +84256,19 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 450509189954036018, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 480585817991929088, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 497259478815785786, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 497259478815785786, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 529059399529170502, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84024,12 +84283,19 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 539074216792060133, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 604159123653676994, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 616103289091848680, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 616103289091848680, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 618989912945973853, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84040,7 +84306,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 688773622251974132, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 745496000928898405, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 745496000928898405, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 758524307634163980, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84050,7 +84323,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 793378590324903846, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 925022177518064008, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84114,6 +84388,12 @@ PrefabInstance: value: objectReference: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 1267647417107331775, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1267647417107331775, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1277409865031452039, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84135,7 +84415,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1304326104985373937, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1308355964467323367, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84178,11 +84459,18 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1570414613251225248, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1570414613251225248, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1593342540512249393, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1593342540512249393, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1618227748963132736, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -84193,6 +84481,11 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1732893919503721741, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1794858485046500128, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -84202,13 +84495,20 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1794858485046500128, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 1834422657366255871, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1834422657366255871, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84249,7 +84549,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2259619033527165541, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84261,6 +84562,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2352008203549114553, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2352008203549114553, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84310,6 +84617,12 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 2664072310590131366, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2664072310590131366, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2665040028511114726, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84319,7 +84632,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2736916431090604218, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2778745229560357004, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84340,7 +84654,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2843702744343018216, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2901349880325940619, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84370,12 +84685,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3041335693682627708, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 3067769207063836276, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3067769207063836276, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3112740238437272457, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 3164820738811214726, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3200879201637768123, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84405,7 +84732,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3280774963962359097, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3290744769684855706, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84459,6 +84787,17 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + - target: {fileID: 3780772836946022467, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3782769961823481604, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84489,7 +84828,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3791159264989671022, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3801675978665040074, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -84499,7 +84839,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3866144428122439609, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 3922666842683793504, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84520,13 +84861,20 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4099806150413963565, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4128577260680745220, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 4128577260680745220, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 4161118036448953326, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4161118036448953326, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4204982213565396515, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84542,6 +84890,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4281547526140684131, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4281547526140684131, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4322517306009686976, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84551,7 +84905,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4386570698081868781, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4388808763258160335, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84739,7 +85094,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5292349962435968324, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5337512749652812684, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -84803,7 +85159,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5794290425952435731, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -85065,7 +85422,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7173880259882967192, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -85265,7 +85623,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8943319256687070045, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 9001351926520298607, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Enabled @@ -85334,12 +85693,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} ---- !u!1 &4438766482650780794 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3096322638613673858, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} --- !u!114 &4438766482650780795 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -85352,48 +85705,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8b1d1f3fc4fd944795d9342360a337f, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &4438766482650780796 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2481339920395584600, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4438766482650780797 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 471787259892875980, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4438766482650780798 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1016411128462700822, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4438766482650780799 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3849428023357856839, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4438766482650780800 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4466672453150601117, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4438766482650780801 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2276393905415192987, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4438766482650780802 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1657400220333290049, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4439941099814456201 PrefabInstance: m_ObjectHideFlags: 0 @@ -89095,88 +89406,78 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} - - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} - - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} - - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, 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: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} - - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} - - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} - - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} - - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} + - {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2} + - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} + - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} + - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} + - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} + - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} + - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} - - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} - - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} + - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} + - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} + - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} + - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: f0af75d9b9b8f914ba8665902d2e4ca2, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} @@ -89190,50 +89491,62 @@ MonoBehaviour: - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} + - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} + - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} + - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} + - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} + - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: f0af75d9b9b8f914ba8665902d2e4ca2, type: 2} + - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} - - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} - - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} + - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, 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: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} - - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} - - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: 95cabe87a71968e40bc320845e1ad497, type: 2} + - {fileID: 2100000, guid: be9d7d6979fe6a145a7dd1942f885a82, type: 2} - {fileID: 2100000, guid: e633280d5439fd24cbf88344782787d3, type: 2} + - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - {fileID: 2100000, guid: 7719e11364cd14941a3eadd7caca9a0e, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -90089,74 +90402,10 @@ MonoBehaviour: ID: 198 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1558294107} - ID: 199 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780796} - ID: 200 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780794} - ID: 201 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1889182717} ID: 202 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780793} - ID: 203 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780802} - ID: 204 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780801} - ID: 205 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1265023767} - ID: 206 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780800} - ID: 207 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780799} - ID: 208 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 57263404} - ID: 209 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780798} - ID: 210 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 4438766482650780797} - ID: 211 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 498107023} ID: 212 SerializedTypeNames: @@ -90296,74 +90545,10 @@ MonoBehaviour: ID: 239 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1081417466} - ID: 240 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614121} - ID: 241 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614120} - ID: 242 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1522466319} ID: 243 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614119} - ID: 244 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614127} - ID: 245 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614126} - ID: 246 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 526668270} - ID: 247 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614125} - ID: 248 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614124} - ID: 249 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 503353588} - ID: 250 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614123} - ID: 251 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 172614122} - ID: 252 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 492581047} ID: 253 SerializedTypeNames: @@ -90503,74 +90688,10 @@ MonoBehaviour: ID: 280 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1337513406} - ID: 281 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910643} - ID: 282 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910642} - ID: 283 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 735590427} ID: 284 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910641} - ID: 285 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910649} - ID: 286 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910648} - ID: 287 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1047388942} - ID: 288 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910647} - ID: 289 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910646} - ID: 290 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1701731760} - ID: 291 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910645} - ID: 292 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937910644} - ID: 293 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1404849345} ID: 294 SerializedTypeNames: @@ -94874,6 +94995,158 @@ MonoBehaviour: - VRC.SDK3.Components.VRCPickup - VRC.SDK3.Components.VRCObjectSync - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 727585403} + ID: 1381 + SerializedTypeNames: + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1349577823} + ID: 1382 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1940768912} + ID: 1383 + SerializedTypeNames: + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1175667885} + ID: 1384 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 765781636} + ID: 1385 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1255439616} + ID: 1386 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1178746431} + ID: 1387 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1169760577} + ID: 1388 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1832304735} + ID: 1389 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 903212545} + ID: 1390 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 308912626} + ID: 1391 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 112548883} + ID: 1392 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1340012852} + ID: 1393 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1354794507} + ID: 1394 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 408160000} + ID: 1395 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1696130827} + ID: 1396 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1558294107} + ID: 199 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 4438766482650780793} + ID: 203 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1265023767} + ID: 206 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 57263404} + ID: 209 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1081417466} + ID: 240 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 172614119} + ID: 244 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 526668270} + ID: 247 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 503353588} + ID: 250 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1337513406} + ID: 281 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 937910641} + ID: 285 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1047388942} + ID: 288 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1701731760} + ID: 291 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -95795,6 +96068,12 @@ PrefabInstance: value: objectReference: {fileID: 531104161809362512, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} + - target: {fileID: 755894344250147792, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 755894344250147792, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} - target: {fileID: 1186979139362781963, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: serializationData.Prefab @@ -95807,6 +96086,12 @@ PrefabInstance: value: objectReference: {fileID: 1601383531174877316, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} + - target: {fileID: 1824200836929615434, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1824200836929615434, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} - target: {fileID: 2675039169023975669, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: m_LocalPosition.x @@ -95857,6 +96142,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3156534050252334387, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3855851560336711948, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: serializationData.Prefab @@ -95869,6 +96159,12 @@ PrefabInstance: value: objectReference: {fileID: 4089442974016229272, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} + - target: {fileID: 4273614253258701270, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4273614253258701270, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, + type: 3} - target: {fileID: 5347838594196847929, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, type: 3} propertyPath: serializationData.Prefab diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 370ed59..bf5469d 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -722,7 +722,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "LockInChoice"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "LockInChoice"); _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", false); } @@ -1258,7 +1258,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "LockInChoice"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "LockInChoice"); _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", false); } @@ -1669,7 +1669,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableChoiceCards", true, _QuestionIndex % _PlayerPodiums[i].GetColourOptionsCount()); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "EnableChoiceCards", true, _QuestionIndex % _PlayerPodiums[i].GetColourOptionsCount()); } } @@ -1677,7 +1677,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableChoiceCards", false, 0); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "EnableChoiceCards", false, 0); } } diff --git a/Assets/UdonSharp/Interacts/PickupInteractCallback.cs b/Assets/UdonSharp/Interacts/PickupInteractCallback.cs index 1131cbe..1ec9cec 100644 --- a/Assets/UdonSharp/Interacts/PickupInteractCallback.cs +++ b/Assets/UdonSharp/Interacts/PickupInteractCallback.cs @@ -13,8 +13,6 @@ public class PickupInteractCallback : UdonSharpBehaviour public override void Interact() { - Debug.Log("[PickupInteractCallback] Interaction!!!"); - if (_InteractCallbackFunction != "" && Utilities.IsValid(_CallbackObject)) { _CallbackObject.SendCustomEvent(_InteractCallbackFunction); diff --git a/Assets/UdonSharp/Podiums/ChoiceCard.asset b/Assets/UdonSharp/Podiums/ChoiceCard.asset index 666bec0..698c3ea 100644 --- a/Assets/UdonSharp/Podiums/ChoiceCard.asset +++ b/Assets/UdonSharp/Podiums/ChoiceCard.asset @@ -20,7 +20,7 @@ MonoBehaviour: scriptVersion: 2 compiledVersion: 2 behaviourSyncMode: 4 - hasInteractEvent: 1 + hasInteractEvent: 0 scriptID: -4699376671505787403 serializationData: SerializedFormat: 2 @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 5 + Data: 9 - Name: Entry: 7 Data: @@ -150,12 +150,219 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 11|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: _Pickup + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Pickup + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Components.VRCPickup, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 13 + - 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 15|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 16|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: _ObjectSync + - Name: $v + Entry: 7 + Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ObjectSync + - Name: k__BackingField + Entry: 7 + Data: 18|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Components.VRCObjectSync, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 18 + - 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: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 20|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: CardInteractObject + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: CardInteractObject + - Name: k__BackingField + Entry: 7 + Data: 22|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UdonSharp.UdonSharpBehaviour, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 24|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -179,13 +386,13 @@ MonoBehaviour: Data: _Mesh - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Mesh - Name: k__BackingField Entry: 7 - Data: 12|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule @@ -194,7 +401,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -209,13 +416,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -239,13 +446,13 @@ MonoBehaviour: Data: _SpawnPosition - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _SpawnPosition - Name: k__BackingField Entry: 7 - Data: 16|System.RuntimeType, mscorlib + Data: 31|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Transform, UnityEngine.CoreModule @@ -254,7 +461,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -269,13 +476,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -299,16 +506,16 @@ MonoBehaviour: Data: _HeldPosition - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _HeldPosition - Name: k__BackingField Entry: 9 - Data: 16 + Data: 31 - Name: k__BackingField Entry: 9 - Data: 16 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,13 +530,73 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 36|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: _AnchorMode + - Name: $v + Entry: 7 + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AnchorMode + - Name: k__BackingField + Entry: 7 + Data: 38|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CardAnchorMode, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Podiums/ChoiceCard.cs b/Assets/UdonSharp/Podiums/ChoiceCard.cs index c69af34..4102e36 100644 --- a/Assets/UdonSharp/Podiums/ChoiceCard.cs +++ b/Assets/UdonSharp/Podiums/ChoiceCard.cs @@ -1,34 +1,82 @@  using UdonSharp; using UnityEngine; -using VRC.SDK3.UdonNetworkCalling; -using VRC.Udon.Common.Interfaces; +using VRC.SDK3.Components; +using VRC.SDKBase; +using VRC.Udon.Common; + + +public enum CardAnchorMode +{ + None, + AtSpawn, + InHeldPosition +} [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class ChoiceCard : UdonSharpBehaviour { [UdonSynced] public int ChoiceNumber = 0; + [Space] [SerializeField] private ChoiceCardGroup CardGroup = null; - + [Space] + [SerializeField] private VRCPickup _Pickup; + [SerializeField] private VRCObjectSync _ObjectSync; + [Space] + [SerializeField] private UdonSharpBehaviour CardInteractObject; [SerializeField] private MeshRenderer _Mesh; [SerializeField] private Transform _SpawnPosition; [SerializeField] private Transform _HeldPosition; + [UdonSynced] private CardAnchorMode _AnchorMode = CardAnchorMode.None; - public override void OnPickup() + + public override void OnOwnershipTransferred(VRCPlayerApi Player) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CardGroup, NetworkEventTarget.All, "ChoiceCardPickedUp", ChoiceNumber); + if (Utilities.IsValid(_Pickup)) + { + Networking.SetOwner(Player, _Pickup.gameObject); + } + + base.OnOwnershipTransferred(Player); } - public override void Interact() + public override void OnDeserialization(DeserializationResult Result) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CardGroup, NetworkEventTarget.All, "ChoiceCardInteract", ChoiceNumber); + _SetPosition_Synced(); + + base.OnDeserialization(Result); } - public void SetCardGroup(ChoiceCardGroup ParentCardGroup) + + public void ChoiceCardPickedUp() { - CardGroup = ParentCardGroup; + CardGroup.ChoiceCardPickedUp(ChoiceNumber); + _ObjectSync.enabled = true; + } + + public void ChoiceCardInteract() + { + CardGroup.ChoiceCardInteract(ChoiceNumber); + _ObjectSync.enabled = false; + } + + + public new void DisableInteractive(bool Disable) + { + CardInteractObject.DisableInteractive = + (Networking.IsOwner(gameObject) && !Networking.LocalPlayer.IsUserInVR()) + ? Disable + : true; + } + + public void SetPickupable(bool Pickupable) + { + _Pickup.pickupable = + (Networking.IsOwner(gameObject) && Networking.LocalPlayer.IsUserInVR()) + ? Pickupable + : false; } public void SetColourMaterial(Material Colour) @@ -36,21 +84,47 @@ public class ChoiceCard : UdonSharpBehaviour _Mesh.sharedMaterial = Colour; } - [NetworkCallable] + public void SetToHeldPosition() { - transform.SetParent(_HeldPosition, false); - transform.localPosition = Vector3.zero; - transform.localEulerAngles = Vector3.zero; - InteractionText = "Reveal"; + _Pickup.Drop(); + _ObjectSync.enabled = false; + _Pickup.InteractionText = "Reveal"; + + _AnchorMode = CardAnchorMode.InHeldPosition; + _SetPosition_Synced(); + + RequestSerialization(); } - [NetworkCallable] public void ResetPosition() { - transform.SetParent(_SpawnPosition, false); - transform.localPosition = Vector3.zero; - transform.localEulerAngles = Vector3.zero; - InteractionText = "Choose"; + _Pickup.Drop(); + _Pickup.InteractionText = "Choose"; + + _AnchorMode = CardAnchorMode.AtSpawn; + _SetPosition_Synced(); + + RequestSerialization(); + } + + private void _SetPosition_Synced() + { + _ObjectSync.enabled = false; + + switch (_AnchorMode) + { + case CardAnchorMode.None: + case CardAnchorMode.AtSpawn: + _Pickup.transform.SetParent(_SpawnPosition, false); + _Pickup.transform.localPosition = Vector3.zero; + _Pickup.transform.localRotation = Quaternion.identity; + break; + case CardAnchorMode.InHeldPosition: + _Pickup.transform.SetParent(_HeldPosition, false); + _Pickup.transform.localPosition = Vector3.zero; + _Pickup.transform.localRotation = Quaternion.identity; + break; + } } } diff --git a/Assets/UdonSharp/Podiums/ChoiceCardGroup.asset b/Assets/UdonSharp/Podiums/ChoiceCardGroup.asset index ea31bcf..7fa3e4c 100644 --- a/Assets/UdonSharp/Podiums/ChoiceCardGroup.asset +++ b/Assets/UdonSharp/Podiums/ChoiceCardGroup.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 15 - Name: Entry: 7 Data: @@ -116,31 +116,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ChoiceCards + Data: _ChoiceCardEnabler - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ChoiceCards + Data: _ChoiceCardEnabler - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ChoiceCard[], Assembly-CSharp + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 9|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -155,13 +149,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -182,25 +176,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ChoiceCardText + Data: _ChoiceCards - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ChoiceCardText + Data: _ChoiceCards - Name: k__BackingField Entry: 7 - Data: 13|System.RuntimeType, mscorlib + Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: TMPro.TextMeshProUGUI[], Unity.TextMeshPro + Data: ChoiceCard[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 13 + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -242,19 +242,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ChoiceCardColourOptions + Data: _ChoiceCardText - Name: $v Entry: 7 Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ChoiceCardColourOptions + Data: _ChoiceCardText - Name: k__BackingField Entry: 7 Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Material[], UnityEngine.CoreModule + Data: TMPro.TextMeshProUGUI[], Unity.TextMeshPro - Name: Entry: 8 Data: @@ -302,19 +302,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PCCardHeldPosition + Data: _ChoiceCardColourOptions - Name: $v Entry: 7 Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PCCardHeldPosition + Data: _ChoiceCardColourOptions - Name: k__BackingField Entry: 7 Data: 21|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.GameObject, UnityEngine.CoreModule + Data: UnityEngine.Material[], UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -362,25 +362,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PCCardAnimator + Data: _PCCardHeldPosition - Name: $v Entry: 7 Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PCCardAnimator + Data: _PCCardHeldPosition - Name: k__BackingField - Entry: 7 - Data: 25|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 25 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -395,13 +389,463 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 26|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: _PCCardAnimator + - Name: $v + Entry: 7 + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PCCardAnimator + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 28 + - 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: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 30|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: _Enabled + - Name: $v + Entry: 7 + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Enabled + - Name: k__BackingField + Entry: 7 + Data: 32|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Colour + - Name: $v + Entry: 7 + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Colour + - Name: k__BackingField + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 38|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ChoiceTextVisibleForAllPlayers + - Name: $v + Entry: 7 + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ChoiceTextVisibleForAllPlayers + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 41|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _DisableInteractive + - Name: $v + Entry: 7 + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _DisableInteractive + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 44|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _SetPickupable + - Name: $v + Entry: 7 + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SetPickupable + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ChoiceLocked + - Name: $v + Entry: 7 + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ChoiceLocked + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _TurnForward + - Name: $v + Entry: 7 + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TurnForward + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -425,22 +869,16 @@ MonoBehaviour: Data: _SelectedChoice - Name: $v Entry: 7 - Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _SelectedChoice - Name: k__BackingField - Entry: 7 - Data: 29|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 36 - Name: k__BackingField Entry: 9 - Data: 29 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -455,13 +893,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 31|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Podiums/ChoiceCardGroup.cs b/Assets/UdonSharp/Podiums/ChoiceCardGroup.cs index d3875fa..bf3b9fe 100644 --- a/Assets/UdonSharp/Podiums/ChoiceCardGroup.cs +++ b/Assets/UdonSharp/Podiums/ChoiceCardGroup.cs @@ -2,43 +2,78 @@ using TMPro; using UdonSharp; using UnityEngine; -using VRC.SDK3.Components; -using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; -using VRC.Udon.Common.Interfaces; +using VRC.Udon.Common; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class ChoiceCardGroup : UdonSharpBehaviour { [SerializeField] private PlayerPodium _Podium; + [SerializeField] private GameObject _ChoiceCardEnabler; [SerializeField] private ChoiceCard[] _ChoiceCards; [SerializeField] private TextMeshProUGUI[] _ChoiceCardText; [SerializeField] private Material[] _ChoiceCardColourOptions; [SerializeField] private GameObject _PCCardHeldPosition; + [SerializeField] private Animator _PCCardAnimator; + [UdonSynced] private bool _Enabled = false; + [UdonSynced] private int _Colour = -1; + [UdonSynced] private bool _ChoiceTextVisibleForAllPlayers = false; + [UdonSynced] private bool _DisableInteractive = false; + [UdonSynced] private bool _SetPickupable = true; + [UdonSynced] private bool _ChoiceLocked = false; + [UdonSynced] private bool _TurnForward = false; [UdonSynced] private int _SelectedChoice = -1; - void Start() + public override void OnDeserialization(DeserializationResult Result) { - for (int i = 0; i < _ChoiceCards.Length; i++) - { - ChoiceCard Card = _ChoiceCards[i]; + _SetEnabled_Synced(); + _InteractiveAndPickupable_Synced(); + _SetColourChoice_Synced(); + _MakeChoiceTextVisible_Synced(); + _TurnForward_Synced(); - Card.SetCardGroup(this); - } + base.OnDeserialization(Result); } - [NetworkCallable] + public override void OnOwnershipTransferred(VRCPlayerApi Player) + { + foreach (ChoiceCard Card in _ChoiceCards) + { + Networking.SetOwner(Player, Card.gameObject); + } + + base.OnOwnershipTransferred(Player); + } + + + public void SetEnabled(bool Enable, int ColourChoice) + { + _Enabled = Enable; + _SetEnabled_Synced(); + + ResetCards(ColourChoice, false); + + MakeChoiceTextVisible(false, false); + + RequestSerialization(); + } + private void _SetEnabled_Synced() + { + _ChoiceCardEnabler.gameObject.SetActive(_Enabled); + } + + public void ChoiceCardPickedUp(int ChoiceNumber) { _SelectedChoice = ChoiceNumber; + RequestSerialization(); } - [NetworkCallable] public void ChoiceCardInteract(int ChoiceNumber) { if (_SelectedChoice == ChoiceNumber) @@ -49,55 +84,45 @@ public class ChoiceCardGroup : UdonSharpBehaviour _SelectedChoice = ChoiceNumber; - VRCPlayerApi Player = Networking.GetOwner(_Podium.gameObject); - Debug.Assert(Player != null); - - for (int i = 0; i < _ChoiceCards.Length; i++) + foreach (ChoiceCard Card in _ChoiceCards) { - ChoiceCard Card = _ChoiceCards[i]; - - _PCCardAnimator.SetBool("Turn Forward", false); - Card.DisableInteractive = false; + Card.DisableInteractive(false); if (Card.ChoiceNumber == _SelectedChoice) { - if (!Player.IsUserInVR()) - { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)Card, NetworkEventTarget.All, "SetToHeldPosition"); - Card.DisableInteractive = true; - } + Card.SetToHeldPosition(); + Card.DisableInteractive(true); } else { Card.ResetPosition(); } } + + RequestSerialization(); + } + + private void _TurnForward_Synced() + { + _PCCardAnimator.SetBool("Turn Forward", _TurnForward); } private void RevealChoice() { - VRCPlayerApi Player = Networking.GetOwner(_Podium.gameObject); - if (Player != null && !Player.IsUserInVR()) + foreach (ChoiceCard Card in _ChoiceCards) { - for (int i = 0; i < _ChoiceCards.Length; i++) + if (Card.ChoiceNumber == _SelectedChoice) { - ChoiceCard Card = _ChoiceCards[i]; + Card.SetToHeldPosition(); + _TurnForward = true; + _TurnForward_Synced(); + Card.DisableInteractive(true); - if (Card.ChoiceNumber == _SelectedChoice) - { - VRCPickup Pickup = Card.GetComponent(); - if (Pickup != null) - { - Pickup.Drop(); - } - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)Card, NetworkEventTarget.All, "SetToHeldPosition"); - _PCCardAnimator.SetBool("Turn Forward", true); - Card.DisableInteractive = true; - } - else - { - Card.ResetPosition(); - } + RequestSerialization(); + } + else + { + Card.ResetPosition(); } } } @@ -118,37 +143,36 @@ public class ChoiceCardGroup : UdonSharpBehaviour } } - [NetworkCallable] - public void MakeChoiceTextVisible() + public void MakeChoiceTextVisible(bool VisibleForAllPlayers = false, bool RequestSerialisation = true) { - for (int i = 0; i < _ChoiceCards.Length && i < _ChoiceCardText.Length; i++) + _ChoiceTextVisibleForAllPlayers = VisibleForAllPlayers; + _MakeChoiceTextVisible_Synced(true); + + if (RequestSerialisation) { - _ChoiceCardText[i].gameObject.SetActive(true); + RequestSerialization(); + } + } + private void _MakeChoiceTextVisible_Synced(bool VisibleLocally = false) + { + for (int i = 0; i < _ChoiceCardText.Length; i++) + { + _ChoiceCardText[i].gameObject.SetActive(VisibleLocally || _ChoiceTextVisibleForAllPlayers); } } public void LockInChoice() { - for (int i = 0; i < _ChoiceCards.Length; i++) - { - ChoiceCard Card = _ChoiceCards[i]; - if (Card.ChoiceNumber == _SelectedChoice) { Card.DisableInteractive = false; continue; } - Card.DisableInteractive = true; - VRCPickup Pickup = Card.GetComponent(); - if (Pickup != null) { Pickup.pickupable = false; } - } + _ChoiceLocked = true; + _InteractiveAndPickupable_Synced(); + RequestSerialization(); } - public void ResetCards(int Colour = 0) + public void ResetCards(int Colour = 0, bool RequestSerialisation = true) { _SelectedChoice = -1; - VRCPlayerApi Player = Networking.GetOwner(_Podium.gameObject); - Debug.Assert(Player != null); - - bool IsInVR = Player.IsUserInVR(); - - for (int i = 0; i < _ChoiceCards.Length; i++) + for (int i = 0; i < _ChoiceCards.Length && i < _ChoiceCardText.Length; i++) { ChoiceCard Card = _ChoiceCards[i]; @@ -156,18 +180,51 @@ public class ChoiceCardGroup : UdonSharpBehaviour _ChoiceCardText[i].text = ""; _ChoiceCardText[i].gameObject.SetActive(false); - Card.SetColourMaterial(_ChoiceCardColourOptions[Colour]); + _Colour = Colour; + _SetColourChoice_Synced(); - Card.DisableInteractive = IsInVR; - - VRCPickup Pickup = Card.GetComponent(); - if (Pickup != null) - { - Pickup.pickupable = IsInVR; - } + _DisableInteractive = false; + _SetPickupable = true; } - _PCCardAnimator.SetBool("Turn Forward", false); + _TurnForward = false; + _TurnForward_Synced(); + + _ChoiceLocked = false; + + _InteractiveAndPickupable_Synced(); + + if (RequestSerialisation) + { + RequestSerialization(); + } + } + private void _SetColourChoice_Synced() + { + foreach (ChoiceCard Card in _ChoiceCards) + { + Card.SetColourMaterial(_ChoiceCardColourOptions[(_Colour >= 0 && _Colour < _ChoiceCardColourOptions.Length) ? _Colour : 0]); + } + } + + private void _InteractiveAndPickupable_Synced() + { + if (_ChoiceLocked) + { + foreach (ChoiceCard Card in _ChoiceCards) + { + Card.DisableInteractive(Card.ChoiceNumber != _SelectedChoice || _TurnForward); + Card.SetPickupable(Card.ChoiceNumber == _SelectedChoice); + } + } + else + { + foreach (ChoiceCard Card in _ChoiceCards) + { + Card.DisableInteractive(_DisableInteractive); + Card.SetPickupable(_SetPickupable); + } + } } public int GetColourOptionsCount() diff --git a/Assets/UdonSharp/Podiums/PlayerPodium.cs b/Assets/UdonSharp/Podiums/PlayerPodium.cs index c294918..978a01f 100644 --- a/Assets/UdonSharp/Podiums/PlayerPodium.cs +++ b/Assets/UdonSharp/Podiums/PlayerPodium.cs @@ -185,9 +185,7 @@ public class PlayerPodium : UdonSharpBehaviour [NetworkCallable] public void EnableChoiceCards(bool Enable, int ColourChoice) { - _ChoiceCards.gameObject.SetActive(Enable); - _ChoiceCards.ResetCards(ColourChoice); - _ChoiceCards.SendCustomNetworkEvent(NetworkEventTarget.Owner, "MakeChoiceTextVisible"); + _ChoiceCards.SetEnabled(Enable, ColourChoice); } [NetworkCallable] @@ -200,7 +198,7 @@ public class PlayerPodium : UdonSharpBehaviour public void LockInChoice() { _ChoiceCards.LockInChoice(); - _ChoiceCards.SendCustomNetworkEvent(NetworkEventTarget.All, "MakeChoiceTextVisible"); + _ChoiceCards.MakeChoiceTextVisible(true); } public bool VerifyMultipleChoiceResponse(int CorrectResponse)