diff --git a/Assets/Models/Maps/SM_FloorMap_Marker.fbx b/Assets/Models/Maps/SM_FloorMap_Marker.fbx index b639810..814d55e 100644 Binary files a/Assets/Models/Maps/SM_FloorMap_Marker.fbx and b/Assets/Models/Maps/SM_FloorMap_Marker.fbx differ diff --git a/Assets/Prefabs/Maps/Floor Map Marker.prefab b/Assets/Prefabs/Maps/Floor Map Marker.prefab index 7f6bb06..85d2da9 100644 --- a/Assets/Prefabs/Maps/Floor Map Marker.prefab +++ b/Assets/Prefabs/Maps/Floor Map Marker.prefab @@ -1,8 +1,195 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &187197970655244645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5322098915965692100} + - component: {fileID: 8867583303265072469} + - component: {fileID: 3577978770062254084} + - component: {fileID: 547314753207044197} + - component: {fileID: 5247549083949363208} + - component: {fileID: 1655335726719840776} + - component: {fileID: 7454896920621652886} + m_Layer: 0 + m_Name: Floor Map Marker_looper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5322098915965692100 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187197970655244645} + 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: 5082763046106789134} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8867583303265072469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187197970655244645} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bea5fa186e4e67342a4be5316722cfb4, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 3577978770062254084} + sync: {fileID: 0} + data: {fileID: 6230711059175777959} +--- !u!114 &3577978770062254084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187197970655244645} + 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: aa7dfdcc5dda8f846b435b9da336970a, + type: 2} + programSource: {fileID: 11400000, guid: f55d258c4edbbe146a41756b51674e63, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &547314753207044197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187197970655244645} + 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: 5247549083949363208} + sync: {fileID: 0} + data: {fileID: 6230711059175777959} +--- !u!114 &5247549083949363208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187197970655244645} + 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 &1655335726719840776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187197970655244645} + 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: 7454896920621652886} + sync: {fileID: 0} + data: {fileID: 6230711059175777959} +--- !u!114 &7454896920621652886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187197970655244645} + 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} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 --- !u!1 &2021344617608295602 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20,7 +207,7 @@ GameObject: m_IsActive: 1 --- !u!4 &8339261632433557154 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35,7 +222,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &888791735404605251 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55,11 +242,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 9158833659205316080} - sync: {fileID: 8806955951299008898} + sync: {fileID: 0} lastDeserialization: 0 --- !u!114 &9158833659205316080 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -83,6 +270,193 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!1 &3961955652034062452 +GameObject: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1466203331352687848} + - component: {fileID: 3916117566373761626} + - component: {fileID: 5072198286084956007} + - component: {fileID: 4654858292478167167} + - component: {fileID: 4393268031661407840} + - component: {fileID: 420155950263346153} + - component: {fileID: 2962668568156490464} + m_Layer: 0 + m_Name: Floor Map Marker_looper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1466203331352687848 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961955652034062452} + 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: 5082763046106789134} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3916117566373761626 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961955652034062452} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bea5fa186e4e67342a4be5316722cfb4, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 5072198286084956007} + sync: {fileID: 6454771573221516140} + data: {fileID: 5546324385030961877} +--- !u!114 &5072198286084956007 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961955652034062452} + 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: aa7dfdcc5dda8f846b435b9da336970a, + type: 2} + programSource: {fileID: 11400000, guid: f55d258c4edbbe146a41756b51674e63, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &4654858292478167167 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961955652034062452} + 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: 4393268031661407840} + sync: {fileID: 6454771573221516140} + data: {fileID: 5546324385030961877} +--- !u!114 &4393268031661407840 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961955652034062452} + 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 &420155950263346153 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961955652034062452} + 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: 2962668568156490464} + sync: {fileID: 6454771573221516140} + data: {fileID: 5546324385030961877} +--- !u!114 &2962668568156490464 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961955652034062452} + 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} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 --- !u!1 &4297745741448618298 GameObject: m_ObjectHideFlags: 0 @@ -270,7 +644,7 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &6763626477900162237 +--- !u!1 &5790956683994179080 GameObject: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -278,6 +652,172 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: + - component: {fileID: 525998421081513003} + - component: {fileID: 5546324385030961877} + - component: {fileID: 1779897947455945593} + m_Layer: 0 + m_Name: Floor Map Marker_dataUltra + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &525998421081513003 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790956683994179080} + 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: 5082763046106789134} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5546324385030961877 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790956683994179080} + 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: 1779897947455945593} + sync: {fileID: 6454771573221516140} + lastDeserialization: 0 +--- !u!114 &1779897947455945593 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790956683994179080} + 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: e6297c9d4177fb247b0654c8e167c1eb, + type: 2} + programSource: {fileID: 11400000, guid: bc9cfe466e2297342b46ff2f42676890, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &5930464935340522025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 664733621394011090} + - component: {fileID: 6230711059175777959} + - component: {fileID: 1289423263657786925} + m_Layer: 0 + m_Name: Floor Map Marker_dataUltra + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &664733621394011090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930464935340522025} + 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: 5082763046106789134} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6230711059175777959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930464935340522025} + 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: 1289423263657786925} + sync: {fileID: 0} + lastDeserialization: 0 +--- !u!114 &1289423263657786925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930464935340522025} + 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: e6297c9d4177fb247b0654c8e167c1eb, + type: 2} + programSource: {fileID: 11400000, guid: bc9cfe466e2297342b46ff2f42676890, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &6763626477900162237 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: - component: {fileID: 7110916396358877185} - component: {fileID: 4378191350400971135} - component: {fileID: 4397193397240291185} @@ -294,7 +834,7 @@ GameObject: m_IsActive: 1 --- !u!4 &7110916396358877185 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -309,7 +849,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4378191350400971135 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -329,11 +869,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 4397193397240291185} - sync: {fileID: 8806955951299008898} + sync: {fileID: 0} data: {fileID: 888791735404605251} --- !u!114 &4397193397240291185 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -359,7 +899,7 @@ MonoBehaviour: publicVariablesSerializationDataFormat: 0 --- !u!114 &6661078953970214780 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -379,11 +919,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 6516237364175525808} - sync: {fileID: 8806955951299008898} + sync: {fileID: 0} data: {fileID: 888791735404605251} --- !u!114 &6516237364175525808 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -409,7 +949,7 @@ MonoBehaviour: publicVariablesSerializationDataFormat: 0 --- !u!114 &7540355109082095914 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -429,11 +969,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 5007883342809673366} - sync: {fileID: 8806955951299008898} + sync: {fileID: 0} data: {fileID: 888791735404605251} --- !u!114 &5007883342809673366 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -642,6 +1182,22 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 7110916396358877185} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 02b4b8ced7ec91947943a7a393611db0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 664733621394011090} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 02b4b8ced7ec91947943a7a393611db0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5322098915965692100} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 02b4b8ced7ec91947943a7a393611db0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 525998421081513003} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 02b4b8ced7ec91947943a7a393611db0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1466203331352687848} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 02b4b8ced7ec91947943a7a393611db0, type: 3} @@ -662,11 +1218,11 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 02b4b8ced7ec91947943a7a393611db0, type: 3} insertIndex: -1 - addedObject: {fileID: 8806955951299008898} + addedObject: {fileID: 6454771573221516140} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 02b4b8ced7ec91947943a7a393611db0, type: 3} insertIndex: -1 - addedObject: {fileID: 1452217682034521887} + addedObject: {fileID: 2537769877770091953} m_SourcePrefab: {fileID: 100100000, guid: 02b4b8ced7ec91947943a7a393611db0, type: 3} --- !u!4 &5082763046106789134 stripped Transform: @@ -690,7 +1246,7 @@ Rigidbody: serializedVersion: 4 m_Mass: 1 m_Drag: 0 - m_AngularDrag: 10 + m_AngularDrag: 1.5 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -764,7 +1320,7 @@ MonoBehaviour: _GameManager: {fileID: 0} _UnlitLampMaterial: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} _LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2} - _LocationFindingEnabled: 0 + _Active: 0 --- !u!114 &4753408817013827661 MonoBehaviour: m_ObjectHideFlags: 0 @@ -791,7 +1347,7 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!114 &8806955951299008898 +--- !u!114 &6454771573221516140 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -812,21 +1368,21 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 1452217682034521887} + _udonSharpBackingUdonBehaviour: {fileID: 2537769877770091953} networkDataOptimization: 0 - data: {fileID: 888791735404605251} - looper: {fileID: 4378191350400971135} - fixedLooper: {fileID: 6661078953970214780} - lateLooper: {fileID: 7540355109082095914} + data: {fileID: 5546324385030961877} + looper: {fileID: 3916117566373761626} + fixedLooper: {fileID: 4654858292478167167} + lateLooper: {fileID: 420155950263346153} rigid: {fileID: 8400434393310507939} pickup: {fileID: 53336026198256052} respawnHeight: -10 smoothingTime: -0.25 - allowTheftFromSelf: 0 - allowTheftWhenAttachedToPlayer: 0 + allowTheftFromSelf: 1 + allowTheftWhenAttachedToPlayer: 1 kinematicWhileHeld: 1 syncIsKinematic: 1 - syncPickupable: 1 + syncPickupable: 0 sleepOnSpawn: 1 runEveryFrameOnOwner: 0 eventListeners: [] @@ -861,7 +1417,7 @@ MonoBehaviour: _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 ---- !u!114 &1452217682034521887 +--- !u!114 &2537769877770091953 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 4c3621b..8996e0a 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -738,12 +738,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1 &61967789 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1032576827} - m_PrefabAsset: {fileID: 0} --- !u!1 &62162009 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3673620022433988923, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -1432,23 +1426,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 682992727} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -1460,10 +1492,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -1475,6 +1538,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -1485,6 +1558,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1500,17 +1583,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 2 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -1525,12 +1634,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -1542,6 +1663,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -1551,6 +1678,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -1584,6 +1715,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &100177057 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 341561119} + m_PrefabAsset: {fileID: 0} --- !u!1 &105044289 GameObject: m_ObjectHideFlags: 0 @@ -1874,23 +2011,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 631841152} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -1902,10 +2077,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -1917,6 +2123,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -1927,6 +2143,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1942,17 +2168,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 7 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -1967,12 +2219,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -1984,6 +2248,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -1993,6 +2263,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -4992,6 +5266,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 136444697} m_CullTransparentMesh: 1 +--- !u!1 &137642663 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 652699947} + m_PrefabAsset: {fileID: 0} --- !u!1 &139576159 stripped GameObject: m_CorrespondingSourceObject: {fileID: 744764791484571813, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -7085,12 +7365,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 212102007} m_Mesh: {fileID: -462981019419857548, guid: 0a9bbff6014b2d64fa5a051d50c141f6, type: 3} ---- !u!1 &223266475 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1674398003} - m_PrefabAsset: {fileID: 0} --- !u!1 &224730389 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3378133619498976289, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -7141,23 +7415,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1873901186} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -7169,10 +7481,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -7184,6 +7527,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -7194,6 +7547,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7209,17 +7572,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 6 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -7234,12 +7623,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -7251,6 +7652,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -7260,6 +7667,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -7541,23 +7952,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1839016322} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -7569,10 +8018,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -7584,6 +8064,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -7594,6 +8084,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7609,17 +8109,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 8 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -7634,12 +8160,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -7651,6 +8189,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -7660,6 +8204,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -8361,6 +8909,12 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1 &334637528 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1674398003} + m_PrefabAsset: {fileID: 0} --- !u!1001 &336011328 PrefabInstance: m_ObjectHideFlags: 0 @@ -8659,23 +9213,61 @@ PrefabInstance: propertyPath: pickupable value: 1 objectReference: {fileID: 0} - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -8687,10 +9279,51 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: lastPickupable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: pickupableFlag + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -8702,6 +9335,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -8712,6 +9355,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8727,17 +9380,53 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 1 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: lastPickupable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: pickupableFlag + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -8752,12 +9441,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -8779,6 +9480,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -8788,6 +9495,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -9412,7 +10123,7 @@ MonoBehaviour: ExactGun: {fileID: 0} ExactGrip: {fileID: 0} allowManipulationWhenEquipped: 0 - orientation: 1 + orientation: 0 AutoHold: 1 InteractionText: Pick Up UseText: Advance @@ -10789,12 +11500,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443746715} m_CullTransparentMesh: 1 ---- !u!1 &444650538 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 98354744} - m_PrefabAsset: {fileID: 0} --- !u!1 &445422021 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7848016644991658239, guid: 126991d511ca61841a0ef899b6c038a6, @@ -12231,12 +12936,6 @@ Transform: m_Children: [] m_Father: {fileID: 841163055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &515806902 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1721402005} - m_PrefabAsset: {fileID: 0} --- !u!1 &519037387 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4889006440271006080, guid: 126991d511ca61841a0ef899b6c038a6, @@ -12388,12 +13087,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} ---- !u!1 &528840488 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 120860306} - m_PrefabAsset: {fileID: 0} --- !u!1 &530695307 GameObject: m_ObjectHideFlags: 0 @@ -12812,6 +13505,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555532035} m_CullTransparentMesh: 1 +--- !u!1 &558598742 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1081892970} + m_PrefabAsset: {fileID: 0} --- !u!1 &558715346 GameObject: m_ObjectHideFlags: 0 @@ -13633,12 +14332,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &605609728 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 247036822} - m_PrefabAsset: {fileID: 0} --- !u!1 &609177023 GameObject: m_ObjectHideFlags: 0 @@ -13677,6 +14370,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &612787303 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 98354744} + m_PrefabAsset: {fileID: 0} --- !u!1 &612926145 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7590994631439921647, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -13768,6 +14467,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &621335392 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 279344813} + m_PrefabAsset: {fileID: 0} --- !u!1 &622069907 GameObject: m_ObjectHideFlags: 0 @@ -14108,23 +14813,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 65693453} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -14136,10 +14879,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -14151,6 +14925,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -14161,6 +14945,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14176,17 +14970,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 13 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -14201,12 +15021,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -14218,6 +15050,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -14227,6 +15065,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -14619,12 +15461,6 @@ Transform: - {fileID: 98354745} m_Father: {fileID: 938262255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &684859113 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 98354744} - m_PrefabAsset: {fileID: 0} --- !u!1 &689682820 GameObject: m_ObjectHideFlags: 0 @@ -14702,12 +15538,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1 &701721530 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1148878836} - m_PrefabAsset: {fileID: 0} --- !u!1 &703481060 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8788222747555985630, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -16169,6 +16999,12 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &777373438 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 120860306} + m_PrefabAsset: {fileID: 0} --- !u!1 &781127846 stripped GameObject: m_CorrespondingSourceObject: {fileID: 595062701666623122, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -16337,12 +17173,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 782193421} m_CullTransparentMesh: 1 ---- !u!1 &783784264 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 279344813} - m_PrefabAsset: {fileID: 0} --- !u!1 &785548300 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4376628796629608410, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -17098,6 +17928,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &823091968 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1168807827} + m_PrefabAsset: {fileID: 0} --- !u!1 &824788955 GameObject: m_ObjectHideFlags: 0 @@ -17762,6 +18598,12 @@ MonoBehaviour: _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} _LocationBoard: {fileID: 1748199014} +--- !u!1 &866157750 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1721402005} + m_PrefabAsset: {fileID: 0} --- !u!1 &867564311 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6999913234720998839, guid: 126991d511ca61841a0ef899b6c038a6, @@ -17780,6 +18622,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &874477255 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1032576827} + m_PrefabAsset: {fileID: 0} --- !u!1 &874721749 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4341943151507095776, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -18144,12 +18992,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} ---- !u!1 &903628030 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1168807827} - m_PrefabAsset: {fileID: 0} --- !u!1 &906252250 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6494273791062881839, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -18431,12 +19273,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &937349095 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1148878836} - m_PrefabAsset: {fileID: 0} --- !u!1001 &937910637 PrefabInstance: m_ObjectHideFlags: 0 @@ -19075,6 +19911,12 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &959047707 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1941376487} + m_PrefabAsset: {fileID: 0} --- !u!1 &967689107 GameObject: m_ObjectHideFlags: 0 @@ -19679,6 +20521,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &999795215 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 279344813} + m_PrefabAsset: {fileID: 0} --- !u!1 &1000008371 stripped GameObject: m_CorrespondingSourceObject: {fileID: 595733888095426192, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -20024,6 +20872,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1016737136} m_CullTransparentMesh: 1 +--- !u!1 &1019610669 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 652699947} + m_PrefabAsset: {fileID: 0} --- !u!1 &1028173551 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6924239406671179013, guid: 126991d511ca61841a0ef899b6c038a6, @@ -20304,23 +21158,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 87761582} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -20332,10 +21224,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -20347,6 +21270,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -20357,6 +21290,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -20372,17 +21315,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 12 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -20397,12 +21366,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -20414,6 +21395,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -20423,6 +21410,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -20577,6 +21568,12 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1033473246 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1168807827} + m_PrefabAsset: {fileID: 0} --- !u!1 &1033478777 GameObject: m_ObjectHideFlags: 0 @@ -20762,6 +21759,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1039916969 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 247036822} + m_PrefabAsset: {fileID: 0} --- !u!1 &1043608558 GameObject: m_ObjectHideFlags: 0 @@ -20907,12 +21910,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} ---- !u!1 &1049584524 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1721402005} - m_PrefabAsset: {fileID: 0} --- !u!1 &1059914104 GameObject: m_ObjectHideFlags: 0 @@ -21742,12 +22739,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1081514437} m_CullTransparentMesh: 1 ---- !u!1 &1081586939 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1032576827} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1081892970 PrefabInstance: m_ObjectHideFlags: 0 @@ -21756,23 +22747,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1289016884} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -21784,10 +22813,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -21799,6 +22859,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -21809,6 +22879,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -21824,17 +22904,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 3 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -21849,12 +22955,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -21866,6 +22984,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -21875,6 +22999,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -22067,12 +23195,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} ---- !u!1 &1117653501 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 120860306} - m_PrefabAsset: {fileID: 0} --- !u!1 &1117711067 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6026601609796981239, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -22134,30 +23256,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1123401065} m_PrefabAsset: {fileID: 0} ---- !u!1 &1124961664 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1168807827} - m_PrefabAsset: {fileID: 0} --- !u!1 &1134073944 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6204471231925583325, guid: 899ce13087fd5974f88dcbccaea2df85, type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1 &1134607193 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1941376487} - m_PrefabAsset: {fileID: 0} --- !u!1 &1137621809 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5468700754070302975, guid: 899ce13087fd5974f88dcbccaea2df85, type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1139345400 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1941376487} + m_PrefabAsset: {fileID: 0} --- !u!1 &1145254420 GameObject: m_ObjectHideFlags: 0 @@ -22360,23 +23476,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1723193653} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -22388,10 +23542,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -22403,6 +23588,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -22413,6 +23608,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -22428,17 +23633,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 11 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -22453,12 +23684,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -22470,6 +23713,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -22479,6 +23728,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -22610,23 +23863,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 609177024} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -22638,10 +23929,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -22653,6 +23975,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -22663,6 +23995,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -22678,17 +24020,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 5 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -22703,12 +24071,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -22720,6 +24100,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -22729,6 +24115,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -22762,12 +24152,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} ---- !u!1 &1186932013 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1941376487} - m_PrefabAsset: {fileID: 0} --- !u!1 &1191613641 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8574651234393399738, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -23685,12 +25069,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1230794203 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 341561119} - m_PrefabAsset: {fileID: 0} --- !u!1 &1231090884 stripped GameObject: m_CorrespondingSourceObject: {fileID: 637710644105101912, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -23715,6 +25093,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1241186162 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1674398003} + m_PrefabAsset: {fileID: 0} --- !u!1 &1241308916 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8353362151060951662, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -23733,12 +25117,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} ---- !u!1 &1250599640 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 247036822} - m_PrefabAsset: {fileID: 0} --- !u!1 &1252904786 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7365550511971398666, guid: 126991d511ca61841a0ef899b6c038a6, @@ -24690,12 +26068,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1332307263 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1081892970} - m_PrefabAsset: {fileID: 0} --- !u!1 &1332564798 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8217538266216982907, guid: 126991d511ca61841a0ef899b6c038a6, @@ -25101,6 +26473,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345492638} m_CullTransparentMesh: 1 +--- !u!1 &1346704380 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1721402005} + m_PrefabAsset: {fileID: 0} --- !u!1 &1347311699 GameObject: m_ObjectHideFlags: 0 @@ -25654,12 +27032,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1380484466} m_CullTransparentMesh: 1 ---- !u!1 &1381377098 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1674398003} - m_PrefabAsset: {fileID: 0} --- !u!1 &1389375729 GameObject: m_ObjectHideFlags: 0 @@ -25852,12 +27224,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1394546106} m_CullTransparentMesh: 1 ---- !u!1 &1395868352 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 652699947} - m_PrefabAsset: {fileID: 0} --- !u!1 &1396228228 stripped GameObject: m_CorrespondingSourceObject: {fileID: 478413952971619036, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -27691,6 +29057,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1489668639 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 120860306} + m_PrefabAsset: {fileID: 0} --- !u!1 &1494209301 GameObject: m_ObjectHideFlags: 0 @@ -27947,6 +29319,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1508004763 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 341561119} + m_PrefabAsset: {fileID: 0} --- !u!1 &1509411847 GameObject: m_ObjectHideFlags: 0 @@ -28574,6 +29952,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 247036822} m_PrefabAsset: {fileID: 0} +--- !u!1 &1544869331 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1148878836} + m_PrefabAsset: {fileID: 0} --- !u!1 &1547939851 GameObject: m_ObjectHideFlags: 0 @@ -28728,6 +30112,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} +--- !u!1 &1554269948 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 98354744} + m_PrefabAsset: {fileID: 0} --- !u!1 &1557764383 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7800140222510886830, guid: 126991d511ca61841a0ef899b6c038a6, @@ -30190,6 +31580,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1577817307 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 247036822} + m_PrefabAsset: {fileID: 0} --- !u!1 &1584051217 GameObject: m_ObjectHideFlags: 0 @@ -30665,12 +32061,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} ---- !u!1 &1638295124 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 279344813} - m_PrefabAsset: {fileID: 0} --- !u!1 &1639842109 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5173051387814944106, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -31294,23 +32684,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 744280523} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -31322,10 +32750,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -31337,6 +32796,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -31347,6 +32816,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -31362,17 +32841,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 10 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -31387,12 +32892,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -31404,6 +32921,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -31413,6 +32936,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -31745,23 +33272,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 538618263} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -31773,10 +33338,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -31788,6 +33384,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -31798,6 +33404,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -31813,17 +33429,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 4 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -31838,12 +33480,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -31855,6 +33509,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -31864,6 +33524,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -32159,12 +33823,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 798b7832f4df7a742b21d63916ec105b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1752348982 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 341561119} - m_PrefabAsset: {fileID: 0} --- !u!1 &1754220551 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8206286595602460010, guid: 126991d511ca61841a0ef899b6c038a6, @@ -32201,12 +33859,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1168807827} m_PrefabAsset: {fileID: 0} ---- !u!1 &1765358122 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 1081892970} - m_PrefabAsset: {fileID: 0} --- !u!1 &1768246284 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, @@ -32544,6 +34196,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1796667932 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1081892970} + m_PrefabAsset: {fileID: 0} --- !u!1 &1799158945 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2023483734267633743, guid: 126991d511ca61841a0ef899b6c038a6, @@ -32832,12 +34490,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1817081116} m_CullTransparentMesh: 1 ---- !u!1 &1819791970 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, - type: 3} - m_PrefabInstance: {fileID: 652699947} - m_PrefabAsset: {fileID: 0} --- !u!1 &1825304344 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6446307684127584104, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -34767,23 +36419,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 837765980} m_Modifications: - - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + - target: {fileID: 420155950263346153, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 547314753207044197, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 888791735404605251, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1275156301651896935, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 1289423263657786925, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1655335726719840776, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 1779897947455945593, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2743538605529502682, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2962668568156490464, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _GameManager @@ -34795,10 +36485,41 @@ PrefabInstance: value: objectReference: {fileID: 3347526162110312282, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 3503581246339815423, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3577978770062254084, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3916117566373761626, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 4378191350400971135, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393268031661407840, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 4397193397240291185, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -34810,6 +36531,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4654858292478167167, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 4753408817013827661, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5007883342809673366, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -34820,6 +36551,16 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5072198286084956007, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5082763046106789134, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -34835,17 +36576,43 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5247549083949363208, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546324385030961877, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Name value: Marker 9 objectReference: {fileID: 0} + - target: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6230711059175777959, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 6272355876826584370, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - target: {fileID: 6454771573221516140, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 6516237364175525808, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: m_Enabled @@ -34860,12 +36627,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 6661078953970214780, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7454896920621652886, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7540355109082095914, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 7732218697696289664, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: serializationData.Prefab @@ -34877,6 +36656,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8867583303265072469, guid: aecb18996fccac6488cfcd38604796da, + type: 3} - target: {fileID: 9158833659205316080, guid: aecb18996fccac6488cfcd38604796da, type: 3} propertyPath: _syncMethod @@ -34886,6 +36671,10 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7081636587618379353, guid: aecb18996fccac6488cfcd38604796da, type: 3} - {fileID: 4297745741448618298, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 2021344617608295602, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 6763626477900162237, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 5930464935340522025, guid: aecb18996fccac6488cfcd38604796da, type: 3} + - {fileID: 187197970655244645, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aecb18996fccac6488cfcd38604796da, type: 3} @@ -35522,6 +37311,12 @@ Transform: - {fileID: 341561120} m_Father: {fileID: 938262255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1990164701 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3961955652034062452, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1148878836} + m_PrefabAsset: {fileID: 0} --- !u!1 &1991362173 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7034199273745288373, guid: 126991d511ca61841a0ef899b6c038a6, @@ -37007,6 +38802,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &2061764290 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5790956683994179080, guid: aecb18996fccac6488cfcd38604796da, + type: 3} + m_PrefabInstance: {fileID: 1032576827} + m_PrefabAsset: {fileID: 0} --- !u!1 &2063804006 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1829400999671884876, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -42296,36 +44097,36 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, 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: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} + - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} + - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -44115,214 +45916,214 @@ MonoBehaviour: ID: 61 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 100177057} + ID: 527 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1508004763} + ID: 528 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1241186162} + ID: 529 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 334637528} + ID: 530 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1544869331} + ID: 531 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1990164701} + ID: 532 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2061764290} + ID: 533 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 874477255} + ID: 534 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 137642663} + ID: 535 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1019610669} + ID: 536 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 612787303} + ID: 537 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1554269948} + ID: 538 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1796667932} + ID: 539 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 558598742} + ID: 540 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1346704380} + ID: 541 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 866157750} + ID: 542 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 823091968} + ID: 543 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1033473246} + ID: 544 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1039916969} + ID: 545 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1577817307} + ID: 546 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1489668639} + ID: 547 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 777373438} + ID: 548 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 621335392} + ID: 549 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 999795215} + ID: 550 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 959047707} + ID: 551 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1139345400} + ID: 552 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1161237311} ID: 466 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1230794203} - ID: 467 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1752348982} - ID: 468 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1035978671} ID: 471 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 223266475} - ID: 472 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1381377098} - ID: 473 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 330719276} ID: 476 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 937349095} - ID: 477 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 701721530} - ID: 478 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1425984946} ID: 481 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1081586939} - ID: 482 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 61967789} - ID: 483 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1768246284} ID: 486 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1395868352} - ID: 487 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1819791970} - ID: 488 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1349505156} ID: 491 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 684859113} - ID: 492 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 444650538} - ID: 493 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 507775552} ID: 496 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1332307263} - ID: 497 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1765358122} - ID: 498 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 56104913} ID: 501 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 515806902} - ID: 502 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1049584524} - ID: 503 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1763914210} ID: 506 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 903628030} - ID: 507 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1124961664} - ID: 508 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1544448187} ID: 511 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1250599640} - ID: 512 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 605609728} - ID: 513 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 377220563} ID: 516 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1117653501} - ID: 517 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 528840488} - ID: 518 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 225100308} ID: 521 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 783784264} - ID: 522 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1638295124} - ID: 523 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 656047005} ID: 526 SerializedTypeNames: - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1134607193} - ID: 527 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1186932013} - ID: 528 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index b216703..1ee773d 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 12 + Data: 15 - Name: Entry: 7 Data: @@ -488,13 +488,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _StageIndex + Data: _ActiveMarker - Name: $v Entry: 7 Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _StageIndex + Data: _ActiveMarker - Name: k__BackingField Entry: 9 Data: 29 @@ -518,13 +518,73 @@ MonoBehaviour: Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 36|UdonSharp.FieldChangeCallbackAttribute, 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: _StageIndex + - Name: $v + Entry: 7 + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 9 + Data: 29 + - Name: k__BackingField + Entry: 9 + Data: 29 + - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -545,13 +605,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -560,7 +620,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 37 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -575,7 +635,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -599,13 +659,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -629,13 +689,67 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 42|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 46|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: _RunTimer + - Name: $v + Entry: 7 + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _RunTimer + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -659,7 +773,7 @@ MonoBehaviour: Data: _Timer - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Timer @@ -683,13 +797,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 45|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 52|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -713,7 +827,7 @@ MonoBehaviour: Data: _SuccessCounter - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _SuccessCounter @@ -737,13 +851,79 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 56|UdonSharp.FieldChangeCallbackAttribute, 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: _FailureCounter + - Name: $v + Entry: 7 + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FailureCounter + - Name: k__BackingField + Entry: 9 + Data: 29 + - Name: k__BackingField + Entry: 9 + Data: 29 + - 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: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index de968f8..cf596d6 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -3,6 +3,7 @@ using UdonSharp; using UnityEngine; using VRC.SDK3.Data; using VRC.SDK3.UdonNetworkCalling; +using VRC.SDKBase; using VRC.Udon.Common.Interfaces; @@ -39,34 +40,50 @@ public class GameManagerRound3 : GameManagerBase [SerializeField] private AudioManager _AudioManager; [UdonSynced, FieldChangeCallback(nameof(CurrentlyActiveMap))] private ContinentMap _CurrentlyActiveMap = ContinentMap.INDEX_MAX; + [UdonSynced, FieldChangeCallback(nameof(ActiveMarker))] private int _ActiveMarker = 0; [UdonSynced] private int _StageIndex = 0; private DataDictionary _ContinentData; [UdonSynced] private GameStatus _GameStatus = GameStatus.Pregame; + [UdonSynced] private bool _RunTimer = false; [UdonSynced] private int _Timer = TIMER_LENGTH; private const float LENGTH_OF_ONE_SECOND = 1.022222222222222222222f; private const int TIMER_LENGTH = 45; - [UdonSynced] private int _SuccessCounter = 0; + [UdonSynced, FieldChangeCallback(nameof(SuccessCounter))] private int _SuccessCounter = 0; + [UdonSynced, FieldChangeCallback(nameof(FailureCounter))] private int _FailureCounter = 0; + private const int MAX_SUCCESS_COUNT = 8; + private const int MAX_FAILURE_COUNT = 2; public override void InitialiseGameMode() { _StageIndex = 0; - _SuccessCounter = 0; - _Timer = TIMER_LENGTH; + SuccessCounter = 0; + FailureCounter = 0; + + _Timer = TIMER_LENGTH; + _RunTimer = false; + + InitialiseMarkers(); + GetCurrentMap().RandomiseCountries(); + + RequestSerialization(); + base.InitialiseGameMode(); + } + + private void InitialiseMarkers() + { for (int i = 0; i < _Markers.Length; i++) { - _Markers[i].Initialise(); + Networking.SetOwner(Networking.GetOwner(gameObject), _Markers[i].gameObject); + _Markers[i].SendCustomNetworkEvent(NetworkEventTarget.All, "Initialise"); } - _Markers[0].SetPickupable(true); - GetCurrentMap().RandomiseCountries(); - RequestSerialization(); - - base.InitialiseGameMode(); + _ActiveMarker = 0; + GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.All, "SetPickupable", true); } @@ -118,7 +135,7 @@ public class GameManagerRound3 : GameManagerBase public void BeginRound() { - GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); + GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.All, "Activated", true); UpdateInterface(); @@ -132,13 +149,21 @@ public class GameManagerRound3 : GameManagerBase _GameStatus = GameStatus.Begin; _Timer = TIMER_LENGTH; - SendCustomEventDelayedSeconds(nameof(TickTimer), LENGTH_OF_ONE_SECOND); + SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(BeginTimerTick)); RequestSerialization(); } + [NetworkCallable] + public void BeginTimerTick() + { + _RunTimer = true; + SendCustomEventDelayedSeconds(nameof(TickTimer), LENGTH_OF_ONE_SECOND); + } public void TickTimer() { + if (!_RunTimer) return; + _Timer--; if (_Timer < 0) { @@ -146,17 +171,21 @@ public class GameManagerRound3 : GameManagerBase return; } - SendCustomEventDelayedSeconds(nameof(TickTimer), LENGTH_OF_ONE_SECOND); + BeginTimerTick(); RequestSerialization(); } + [NetworkCallable] public void CorrectResponse() { - _SuccessCounter++; - if (_SuccessCounter >= MAX_SUCCESS_COUNT) + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, + "PlaySFX", SFXEventType.MapCorrect); + + SuccessCounter++; + if (SuccessCounter >= MAX_SUCCESS_COUNT) { - SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(GameHasBeenWon)); + GameHasBeenWon(); } else { @@ -166,9 +195,19 @@ public class GameManagerRound3 : GameManagerBase RequestSerialization(); } + [NetworkCallable] public void IncorrectResponse() { - SetUpNextCountry(); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, + "PlaySFX", SFXEventType.MapIncorrect); + + FailureCounter++; + if (FailureCounter >= MAX_FAILURE_COUNT) + { + SetUpNextCountry(); + } + + RequestSerialization(); } @@ -179,35 +218,46 @@ public class GameManagerRound3 : GameManagerBase public FloorMapMarker GetCurrentMarker() { - return _Markers[GetCurrentMap().GetCurrentCountryIndex()]; + return _Markers[ActiveMarker]; } public string GetCurrentCountry() { - return GetCurrentMap().GetCurrentCountry(); + return GetCurrentMap().GetCountry(ActiveMarker); } public string GetCurrentCity() { - return GetCurrentMap().GetCurrentCity(); + return GetCurrentMap().GetCity(ActiveMarker); } public void SetUpNextCountry() { - int NextCountry = GetCurrentMap().NextCountry(); - if (NextCountry < 0) + GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.All, "Activated", false); + + FailureCounter = 0; + ActiveMarker++; + UpdateInterface(); + + RequestSerialization(); + } + + private void ActivateMarker() + { + if (ActiveMarker >= FloorMap.MAX_SELECTED_COUNTRIES) { // If we ran out of countries, lose the game here. SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(GameHasBeenLost), true); return; } - GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); - UpdateInterface(); + GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.All, "Activated", true); } [NetworkCallable] public void GameHasBeenWon() { + _RunTimer = false; + if ((int)_GameStatus <= (int)GameStatus.Begin) { GameStatusUpdate(GameStatus.Win); @@ -244,18 +294,20 @@ public class GameManagerRound3 : GameManagerBase [NetworkCallable] public void GameHasBeenLost(bool RanOutOfMarkers) { - if ((int)_GameStatus != (int)GameStatus.Win) + _RunTimer = false; + + if (_GameStatus != GameStatus.Win) { for (int i = 0; i < _Markers.Length; i++) { - _Markers[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", false); + _Markers[i].SendCustomNetworkEvent(NetworkEventTarget.All, "Activated", false); } GameStatusUpdate(RanOutOfMarkers ? GameStatus.RanOutOfMarkers : GameStatus.RanOutOfTime); HostCardBetweenRoundsInterface GameLossInterface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); - GameLossInterface.HeaderUI.text = "The player has lost. " + _SuccessCounter + " countries in " + TIMER_LENGTH + " seconds."; + GameLossInterface.HeaderUI.text = "The player has run out of " + (RanOutOfMarkers ? "markers" : "time") + ". " + SuccessCounter + " countries in " + TIMER_LENGTH + " seconds."; StopFinalRoundMusic(); SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 2.5f); @@ -299,18 +351,6 @@ public class GameManagerRound3 : GameManagerBase } - public void PlayCorrectSound() - { - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, - "PlaySFX", SFXEventType.MapCorrect); - } - - public void PlayIncorrectSound() - { - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, - "PlaySFX", SFXEventType.MapIncorrect); - } - private void UpdateInterface() { HostCardCaptureCarmenInterface CaptureCarmenInterface = @@ -351,4 +391,32 @@ public class GameManagerRound3 : GameManagerBase } get => _CurrentlyActiveMap; } + + public int ActiveMarker + { + set + { + _ActiveMarker = value; + ActivateMarker(); + } + get => _ActiveMarker; + } + + private int SuccessCounter + { + set + { + _SuccessCounter = value; + } + get => _SuccessCounter; + } + + private int FailureCounter + { + set + { + _FailureCounter = value; + } + get => _FailureCounter; + } } diff --git a/Assets/UdonSharp/Maps/FloorMap.asset b/Assets/UdonSharp/Maps/FloorMap.asset index be42735..dfd075c 100644 --- a/Assets/UdonSharp/Maps/FloorMap.asset +++ b/Assets/UdonSharp/Maps/FloorMap.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 6 + Data: 5 - Name: Entry: 7 Data: @@ -110,19 +110,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentCountry + Data: _Activate - Name: $v Entry: 7 Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentCountry + Data: _Activate - Name: k__BackingField Entry: 7 Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: System.Boolean, mscorlib - Name: Entry: 8 Data: @@ -146,76 +146,16 @@ MonoBehaviour: Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 9|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: _Activate - - Name: $v - Entry: 7 - Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Activate - - Name: k__BackingField - Entry: 7 - Data: 11|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 11 - - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 13|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 14|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 10|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -239,13 +179,13 @@ MonoBehaviour: Data: _RandomisedCountriesAndCities - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RandomisedCountriesAndCities - Name: k__BackingField Entry: 7 - Data: 16|System.RuntimeType, mscorlib + Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -254,7 +194,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 12 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -269,19 +209,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 18|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 14|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 19|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 15|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -305,13 +245,13 @@ MonoBehaviour: Data: _ChosenCountries - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ChosenCountries - Name: k__BackingField Entry: 7 - Data: 21|System.RuntimeType, mscorlib + Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -320,7 +260,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 21 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -335,7 +275,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -359,16 +299,16 @@ MonoBehaviour: Data: _ChosenCities - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ChosenCities - Name: k__BackingField Entry: 9 - Data: 21 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -383,7 +323,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Maps/FloorMap.cs b/Assets/UdonSharp/Maps/FloorMap.cs index 0760ca5..e4dc5c6 100644 --- a/Assets/UdonSharp/Maps/FloorMap.cs +++ b/Assets/UdonSharp/Maps/FloorMap.cs @@ -11,14 +11,13 @@ public class FloorMap : UdonSharpBehaviour { public FloorMapCountry[] Countries; - [UdonSynced] private int _CurrentCountry = 0; [UdonSynced, FieldChangeCallback(nameof(Activate))] private bool _Activate; [UdonSynced, FieldChangeCallback(nameof(RandomisedCountriesAndCities))] private int[] _RandomisedCountriesAndCities; private string[] _ChosenCountries = new string[MAX_SELECTED_COUNTRIES]; private string[] _ChosenCities = new string[MAX_SELECTED_COUNTRIES]; - private const int MAX_SELECTED_COUNTRIES = 13; + public const int MAX_SELECTED_COUNTRIES = 13; private const float DEACTIVATE_HEIGHT = -1000.0f; @@ -88,8 +87,6 @@ public class FloorMap : UdonSharpBehaviour { DisableAllLocations(); - _CurrentCountry = 0; - for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++) { FloorMapCountry Country = Countries[NewCountrySelections[i]]; @@ -105,34 +102,14 @@ public class FloorMap : UdonSharpBehaviour _RandomisedCountriesAndCities = NewCountrySelections; } - public int NextCountry() + public string GetCountry(int CountryIndex) { - _CurrentCountry++; - if (_CurrentCountry >= MAX_SELECTED_COUNTRIES) - { - // We ran out of countries. Just end the game here. - return -1; - } - - RequestSerialization(); - - return _CurrentCountry; + return CountryIndex < _ChosenCountries.Length ? _ChosenCountries[CountryIndex] : ""; } - - public int GetCurrentCountryIndex() + public string GetCity(int CityIndex) { - return _CurrentCountry; - } - - public string GetCurrentCountry() - { - return _ChosenCountries[_CurrentCountry]; - } - - public string GetCurrentCity() - { - return _ChosenCities[_CurrentCountry]; + return CityIndex < _ChosenCities.Length ? _ChosenCities[CityIndex] : ""; } diff --git a/Assets/UdonSharp/Maps/FloorMapMarker.asset b/Assets/UdonSharp/Maps/FloorMapMarker.asset index 5740aa2..9b4aa24 100644 --- a/Assets/UdonSharp/Maps/FloorMapMarker.asset +++ b/Assets/UdonSharp/Maps/FloorMapMarker.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 16 + Data: 15 - Name: Entry: 7 Data: @@ -422,13 +422,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LocationFindingEnabled + Data: _EnableCollisionChecks - Name: $v Entry: 7 Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LocationFindingEnabled + Data: _EnableCollisionChecks - Name: k__BackingField Entry: 9 Data: 15 @@ -476,16 +476,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FailureCounter + Data: _UsedUp - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FailureCounter + Data: _UsedUp + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 9 + Data: 15 + - 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: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 33|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: _CollisionCheckCounter + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CollisionCheckCounter - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -494,115 +548,7 @@ MonoBehaviour: 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: _CheckingCollisions - - Name: $v - Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CheckingCollisions - - Name: k__BackingField - Entry: 9 - Data: 15 - - Name: k__BackingField - Entry: 9 - Data: 15 - - 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: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 37|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: _CollisionCheckCounter - - Name: $v - Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CollisionCheckCounter - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 9 - Data: 32 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -617,7 +563,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -641,16 +587,70 @@ MonoBehaviour: Data: _NoCollisionCounter - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _NoCollisionCounter - Name: k__BackingField Entry: 9 - Data: 32 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 32 + Data: 35 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _CollidingLocations + - Name: $v + Entry: 7 + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CollidingLocations + - Name: k__BackingField + Entry: 7 + Data: 40|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataList, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -686,19 +686,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CollidingLocations + Data: _RigidBodyComponent - Name: $v Entry: 7 Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CollidingLocations + Data: _RigidBodyComponent - Name: k__BackingField Entry: 7 Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataList, VRCSDK3 + Data: UnityEngine.Rigidbody, UnityEngine.PhysicsModule - Name: Entry: 8 Data: @@ -740,25 +740,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _RigidBodyComponent + Data: _ObjectSync - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _RigidBodyComponent + Data: _ObjectSync - Name: k__BackingField Entry: 7 Data: 46|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Rigidbody, UnityEngine.PhysicsModule + Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 46 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -794,25 +794,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ObjectSync + Data: _PickupComponent - Name: $v Entry: 7 Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ObjectSync + Data: _PickupComponent - Name: k__BackingField Entry: 7 Data: 49|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync + Data: VRC.SDK3.Components.VRCPickup, VRCSDK3 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 49 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -848,19 +848,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PickupComponent + Data: _MarkerMesh - Name: $v Entry: 7 Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PickupComponent + Data: _MarkerMesh - Name: k__BackingField Entry: 7 Data: 52|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Components.VRCPickup, VRCSDK3 + Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -897,60 +897,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _MarkerMesh - - Name: $v - Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _MarkerMesh - - Name: k__BackingField - Entry: 7 - Data: 55|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 55 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Maps/FloorMapMarker.cs b/Assets/UdonSharp/Maps/FloorMapMarker.cs index c410612..dddf078 100644 --- a/Assets/UdonSharp/Maps/FloorMapMarker.cs +++ b/Assets/UdonSharp/Maps/FloorMapMarker.cs @@ -20,10 +20,10 @@ public class FloorMapMarker : UdonSharpBehaviour [UdonSynced, SerializeField, FieldChangeCallback(nameof(Active))] private bool _Active = false; [UdonSynced, FieldChangeCallback(nameof(IsGrabbed))] private bool _IsGrabbed = false; [UdonSynced, FieldChangeCallback(nameof(IsLit))] private bool _IsLit = false; - [UdonSynced] private bool _LocationFindingEnabled = false; - [UdonSynced] private int _FailureCounter = 0; - [UdonSynced] private bool _CheckingCollisions = false; + [UdonSynced] private bool _EnableCollisionChecks = false; + + [UdonSynced] private bool _UsedUp = false; private int _CollisionCheckCounter = 0; private int _NoCollisionCounter = 0; private DataList _CollidingLocations = new DataList(); @@ -33,7 +33,6 @@ public class FloorMapMarker : UdonSharpBehaviour private VRCPickup _PickupComponent; private MeshRenderer _MarkerMesh; - private const int MAX_FAILURE_COUNT = 2; private const int MAX_REPEAT_COLLISION_CHECKS = 3; private const int MAX_CHECKS_WITH_NO_COLLISIONS = 8; private const float TIME_BETWEEN_REPEAT_COLLISION_CHECKS = 0.15f; @@ -47,18 +46,21 @@ public class FloorMapMarker : UdonSharpBehaviour _MarkerMesh = GetComponent(); } + + [NetworkCallable] public void Initialise() { + _RigidBodyComponent.constraints = RigidbodyConstraints.None; _ObjectSync.TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true); SetPickupable(false); Active = false; IsGrabbed = false; IsLit = false; - _LocationFindingEnabled = false; - _CheckingCollisions = false; - _FailureCounter = 0; + _EnableCollisionChecks = false; + _UsedUp = false; + _CollisionCheckCounter = 0; _NoCollisionCounter = 0; _CollidingLocations.Clear(); @@ -66,6 +68,7 @@ public class FloorMapMarker : UdonSharpBehaviour RequestSerialization(); } + [NetworkCallable] public void SetPickupable(bool Pickupable) { _PickupComponent.pickupable = Pickupable; @@ -93,20 +96,14 @@ public class FloorMapMarker : UdonSharpBehaviour public override void OnPickup() { - if (Active) - { - IsGrabbed = true; - } + IsGrabbed = true; base.OnPickup(); } public override void OnDrop() { - if (Active) - { - IsGrabbed = false; - } + IsGrabbed = false; base.OnDrop(); } @@ -124,13 +121,12 @@ public class FloorMapMarker : UdonSharpBehaviour { _RigidBodyComponent.constraints = RigidbodyConstraints.None; + _EnableCollisionChecks = true; _NoCollisionCounter = 0; _CollidingLocations.Clear(); } else { - _LocationFindingEnabled = true; - VRCPlayerApi Owner = Networking.GetOwner(gameObject); if (!Owner.IsUserInVR()) { @@ -138,62 +134,52 @@ public class FloorMapMarker : UdonSharpBehaviour } _NoCollisionCounter = 0; - if (!_CheckingCollisions) SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(CheckCollisions)); } RequestSerialization(); } - [NetworkCallable] - public void CheckCollisions() + public void CheckCollisionsLoop() { - if (!Active || !_LocationFindingEnabled || IsGrabbed) return; - - _CheckingCollisions = true; - - if (_CollidingLocations.Count > 0 && IsUpright()) + if (Active) { - _NoCollisionCounter = 0; + SendCustomEventDelayedSeconds(nameof(CheckCollisionsLoop), TIME_BETWEEN_REPEAT_COLLISION_CHECKS); + } - for (int i = 0; i < _CollidingLocations.Count; i++) + if (_EnableCollisionChecks && !IsGrabbed) + { + if (_CollidingLocations.Count > 0 && IsUpright()) { - FloorMapLocation Location = (FloorMapLocation)_CollidingLocations[i].Reference; - if (Location != null) + _NoCollisionCounter = 0; + + for (int i = 0; i < _CollidingLocations.Count; i++) { - bool FoundCorrectResponse = ConfirmChoice(Location.Country, Location.City); - if (FoundCorrectResponse) + FloorMapLocation Location = (FloorMapLocation)_CollidingLocations[i].Reference; + if (Location != null) { - SendCorrectResponse(Location.transform.position); - return; + bool FoundCorrectResponse = ConfirmChoice(Location.Country, Location.City); + if (FoundCorrectResponse) + { + SendCorrectResponse(Location.transform.position); + return; + } } } - } - // We should make sure to only reach here if we don't get a correct - // response from the previous loop. - if (_CollisionCheckCounter < MAX_REPEAT_COLLISION_CHECKS) - { - SendCustomEventDelayedSeconds(nameof(CheckCollisions), TIME_BETWEEN_REPEAT_COLLISION_CHECKS); + _CollisionCheckCounter++; + if (_CollisionCheckCounter >= MAX_REPEAT_COLLISION_CHECKS) + { + SendIncorrectResponse(); + } } else { - SendIncorrectResponse(); - } - _CollisionCheckCounter++; - } - else - { - _NoCollisionCounter++; - if (_NoCollisionCounter >= MAX_CHECKS_WITH_NO_COLLISIONS) - { - SendIncorrectResponse(); - } - else - { - // If the marker isn't sitting mostly upright and is not grabbed, - // don't check collisions until later, in case it becomes upright. - SendCustomEventDelayedSeconds(nameof(CheckCollisions), TIME_BETWEEN_REPEAT_COLLISION_CHECKS); + _NoCollisionCounter++; + if (_NoCollisionCounter >= MAX_CHECKS_WITH_NO_COLLISIONS) + { + SendIncorrectResponse(); + } } } } @@ -216,12 +202,15 @@ public class FloorMapMarker : UdonSharpBehaviour IsLit = true; Active = false; - _CheckingCollisions = false; + _EnableCollisionChecks = false; + _UsedUp = true; RequestSerialization(); - _GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "CorrectResponse"); - _GameManager.PlayCorrectSound(); + if (Networking.GetOwner(gameObject) == Networking.LocalPlayer) + { + _GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "CorrectResponse"); + } } private void SendIncorrectResponse() @@ -229,18 +218,15 @@ public class FloorMapMarker : UdonSharpBehaviour DisableMovementCompletely(); _CollisionCheckCounter = 0; - _CheckingCollisions = false; _CollidingLocations.Clear(); - _FailureCounter++; - if (_FailureCounter >= MAX_FAILURE_COUNT) + _EnableCollisionChecks = false; + + if (Networking.GetOwner(gameObject) == Networking.LocalPlayer) { - Active = false; _GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "IncorrectResponse"); } - _GameManager.PlayIncorrectSound(); - RequestSerialization(); } @@ -250,9 +236,17 @@ public class FloorMapMarker : UdonSharpBehaviour Active = SetActive; RequestSerialization(); } - private void ChangePickupable() + private void ReactToActivation() { _PickupComponent.pickupable = Active; + + SendCustomEventDelayedSeconds(nameof(CheckCollisionsLoop), TIME_BETWEEN_REPEAT_COLLISION_CHECKS); + } + + + public bool IsUsedUp() + { + return _UsedUp; } @@ -266,7 +260,6 @@ public class FloorMapMarker : UdonSharpBehaviour transform.position = CorrectLocation; } - _LocationFindingEnabled = false; RequestSerialization(); } @@ -281,7 +274,7 @@ public class FloorMapMarker : UdonSharpBehaviour set { _Active = value; - ChangePickupable(); + ReactToActivation(); } get => _Active; } diff --git a/Raw Files/Meshes/FloorMapMarker.blend b/Raw Files/Meshes/FloorMapMarker.blend index 5b4d6a0..1c23c29 100644 Binary files a/Raw Files/Meshes/FloorMapMarker.blend and b/Raw Files/Meshes/FloorMapMarker.blend differ