diff --git a/Assets/Models/SM_Phone.fbx b/Assets/Models/SM_Phone.fbx index 08549f1..a4958cd 100644 Binary files a/Assets/Models/SM_Phone.fbx and b/Assets/Models/SM_Phone.fbx differ diff --git a/Assets/Prefabs/Phone.prefab b/Assets/Prefabs/Phone.prefab index 65da3ac..5201d42 100644 --- a/Assets/Prefabs/Phone.prefab +++ b/Assets/Prefabs/Phone.prefab @@ -32,7 +32,7 @@ Transform: - {fileID: 7664113719232022928} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &713464058611422934 +--- !u!1 &484105329001669142 GameObject: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -40,13 +40,96 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9174121024191777546} - - component: {fileID: 4170457371219803502} - - component: {fileID: 7341680935772707012} - - component: {fileID: 8944227586022021438} - - component: {fileID: 2673121253577953921} - - component: {fileID: 8605535245142898956} - - component: {fileID: 9191612834786653638} + - component: {fileID: 4204625524184394946} + - component: {fileID: 2853797908349888740} + - component: {fileID: 3457220753733603828} + m_Layer: 0 + m_Name: Phone_dataUltra + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4204625524184394946 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484105329001669142} + 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: 4984907899478633778} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2853797908349888740 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484105329001669142} + 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: 3457220753733603828} + sync: {fileID: 7664069034163716319} + lastDeserialization: 0 +--- !u!114 &3457220753733603828 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484105329001669142} + 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 &3052933437962128110 +GameObject: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2286641846634988374} + - component: {fileID: 3326875080655757843} + - component: {fileID: 2534110475339935053} + - component: {fileID: 7286685073034146493} + - component: {fileID: 6685907188324864571} + - component: {fileID: 637467565593588835} + - component: {fileID: 1134214850562754019} m_Layer: 0 m_Name: Phone_looper m_TagString: Untagged @@ -54,28 +137,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &9174121024191777546 +--- !u!4 &2286641846634988374 Transform: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713464058611422934} + m_GameObject: {fileID: 3052933437962128110} 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: 4460927841327369253} + m_Father: {fileID: 4984907899478633778} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4170457371219803502 +--- !u!114 &3326875080655757843 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713464058611422934} + m_GameObject: {fileID: 3052933437962128110} m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bea5fa186e4e67342a4be5316722cfb4, type: 3} @@ -90,16 +173,16 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 7341680935772707012} - sync: {fileID: 8055141403808345440} - data: {fileID: 2413118715084811337} ---- !u!114 &7341680935772707012 + _udonSharpBackingUdonBehaviour: {fileID: 2534110475339935053} + sync: {fileID: 7664069034163716319} + data: {fileID: 2853797908349888740} +--- !u!114 &2534110475339935053 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713464058611422934} + m_GameObject: {fileID: 3052933437962128110} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} @@ -119,13 +202,13 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!114 &8944227586022021438 +--- !u!114 &7286685073034146493 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713464058611422934} + m_GameObject: {fileID: 3052933437962128110} m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 033ca15a573c15f4abfff7cd4357218c, type: 3} @@ -140,16 +223,16 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 2673121253577953921} - sync: {fileID: 8055141403808345440} - data: {fileID: 2413118715084811337} ---- !u!114 &2673121253577953921 + _udonSharpBackingUdonBehaviour: {fileID: 6685907188324864571} + sync: {fileID: 7664069034163716319} + data: {fileID: 2853797908349888740} +--- !u!114 &6685907188324864571 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713464058611422934} + m_GameObject: {fileID: 3052933437962128110} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} @@ -169,13 +252,13 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!114 &8605535245142898956 +--- !u!114 &637467565593588835 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713464058611422934} + m_GameObject: {fileID: 3052933437962128110} m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a082bb6c340547f4e9849389bcdc72c1, type: 3} @@ -190,16 +273,16 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 9191612834786653638} - sync: {fileID: 8055141403808345440} - data: {fileID: 2413118715084811337} ---- !u!114 &9191612834786653638 + _udonSharpBackingUdonBehaviour: {fileID: 1134214850562754019} + sync: {fileID: 7664069034163716319} + data: {fileID: 2853797908349888740} +--- !u!114 &1134214850562754019 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713464058611422934} + m_GameObject: {fileID: 3052933437962128110} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} @@ -219,89 +302,6 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &5639091097157784956 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5512647439174734834} - - component: {fileID: 2413118715084811337} - - component: {fileID: 8029256806212001050} - m_Layer: 0 - m_Name: Phone_dataUltra - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5512647439174734834 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5639091097157784956} - 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: 4460927841327369253} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2413118715084811337 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5639091097157784956} - 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: 8029256806212001050} - sync: {fileID: 8055141403808345440} - lastDeserialization: 0 ---- !u!114 &8029256806212001050 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5639091097157784956} - 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!1001 &7914759338797346427 PrefabInstance: m_ObjectHideFlags: 0 @@ -325,15 +325,25 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 21599afa6ab27574182496d3ebe3232c, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - target: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} propertyPath: m_Layer value: 13 objectReference: {fileID: 0} + - target: {fileID: 565668218006355825, guid: 21599afa6ab27574182496d3ebe3232c, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - target: {fileID: 919132149155446097, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} propertyPath: m_Name - value: SM_Phone + value: Hook objectReference: {fileID: 0} - target: {fileID: 1499522596184884956, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} @@ -355,6 +365,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} + - target: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, + type: 3} + propertyPath: m_Layer + value: 13 + objectReference: {fileID: 0} - target: {fileID: 5782263015307960926, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} propertyPath: m_LocalRotation.w @@ -388,63 +403,57 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5782263015307960926, guid: 21599afa6ab27574182496d3ebe3232c, + - targetCorrespondingSourceObject: {fileID: 2953003450068026185, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 5512647439174734834} - - targetCorrespondingSourceObject: {fileID: 5782263015307960926, guid: 21599afa6ab27574182496d3ebe3232c, + addedObject: {fileID: 4204625524184394946} + - targetCorrespondingSourceObject: {fileID: 2953003450068026185, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 9174121024191777546} + addedObject: {fileID: 2286641846634988374} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + - targetCorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 5012533667203240305} - - targetCorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + addedObject: {fileID: 3170208713870679749} + - targetCorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 152018148904388130} - - targetCorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + addedObject: {fileID: 5741219692586799498} + - targetCorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 3587124737734248416} - - targetCorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + addedObject: {fileID: 4575308875957934130} + - targetCorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 8055141403808345440} - - targetCorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + addedObject: {fileID: 3019992558134816461} + - targetCorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 3749181468246261833} - - targetCorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + addedObject: {fileID: 7664069034163716319} + - targetCorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 4318626733857526955} - - targetCorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + addedObject: {fileID: 6572445634383977814} + - targetCorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} insertIndex: -1 - addedObject: {fileID: 2504569077717723477} + addedObject: {fileID: 7251063502356948773} m_SourcePrefab: {fileID: 100100000, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} ---- !u!4 &4460927841327369253 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5782263015307960926, guid: 21599afa6ab27574182496d3ebe3232c, - type: 3} - m_PrefabInstance: {fileID: 7914759338797346427} - m_PrefabAsset: {fileID: 0} ---- !u!1 &6563698020819114673 stripped +--- !u!1 &2840523410495348057 stripped GameObject: - m_CorrespondingSourceObject: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, + m_CorrespondingSourceObject: {fileID: 5385547946458166050, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} m_PrefabInstance: {fileID: 7914759338797346427} m_PrefabAsset: {fileID: 0} ---- !u!65 &5012533667203240305 +--- !u!65 &3170208713870679749 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563698020819114673} + m_GameObject: {fileID: 2840523410495348057} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -457,15 +466,41 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.08121846, y: 0.07184999, z: 0.29521772} - m_Center: {x: -0.000000029802322, y: 0.018040232, z: 3.845513e-16} ---- !u!54 &152018148904388130 + m_Size: {x: 0.081218496, y: 0.071850024, z: 0.29521772} + m_Center: {x: -0.00000017935157, y: 0.018039765, z: 1.4100191e-15} +--- !u!114 &5741219692586799498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2840523410495348057} + 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: 3 + serializedProgramAsset: {fileID: 11400000, guid: e814410455f813c4faf2dedf89c4a1fc, + type: 2} + programSource: {fileID: 11400000, guid: 5ad0760850c6bb04ca6ebb9fd45ec7e4, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!54 &4575308875957934130 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563698020819114673} + m_GameObject: {fileID: 2840523410495348057} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -486,20 +521,20 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &3587124737734248416 +--- !u!114 &3019992558134816461 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563698020819114673} + m_GameObject: {fileID: 2840523410495348057} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: MomentumTransferMethod: 0 - DisallowTheft: 1 + DisallowTheft: 0 ExactGun: {fileID: 0} ExactGrip: {fileID: 0} allowManipulationWhenEquipped: 0 @@ -518,13 +553,13 @@ MonoBehaviour: currentlyHeldBy: {fileID: 0} pickupable: 1 proximity: 0.5 ---- !u!114 &8055141403808345440 +--- !u!114 &7664069034163716319 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563698020819114673} + m_GameObject: {fileID: 2840523410495348057} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 73412ff0ee736d748bcef5ca61afd71d, type: 3} @@ -539,21 +574,21 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 3749181468246261833} + _udonSharpBackingUdonBehaviour: {fileID: 7251063502356948773} networkDataOptimization: 0 - data: {fileID: 2413118715084811337} - looper: {fileID: 4170457371219803502} - fixedLooper: {fileID: 8944227586022021438} - lateLooper: {fileID: 8605535245142898956} - rigid: {fileID: 152018148904388130} - pickup: {fileID: 3587124737734248416} + data: {fileID: 2853797908349888740} + looper: {fileID: 3326875080655757843} + fixedLooper: {fileID: 7286685073034146493} + lateLooper: {fileID: 637467565593588835} + rigid: {fileID: 4575308875957934130} + pickup: {fileID: 3019992558134816461} respawnHeight: -10 smoothingTime: -0.25 allowTheftFromSelf: 1 allowTheftWhenAttachedToPlayer: 1 kinematicWhileHeld: 1 syncIsKinematic: 1 - syncPickupable: 0 + syncPickupable: 1 sleepOnSpawn: 1 runEveryFrameOnOwner: 0 eventListeners: [] @@ -573,28 +608,51 @@ MonoBehaviour: positionDesyncThreshold: 0.015 rotationDesyncThreshold: 0.995 minimumSleepFrames: 4 - spawnPos: {x: 0.0035235458, y: -0.061988916, z: 0.0989347} - spawnRot: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + spawnPos: {x: -0, y: 0, z: 0} + spawnRot: {x: 0, y: -0, z: -0, w: 1} _state: -1 localTransformFlag: 1 leftHandFlag: 0 - kinematicFlag: 0 + kinematicFlag: 1 pickupableFlag: 1 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 - lastKinematic: 0 + lastKinematic: 1 lastPickupable: 1 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 ---- !u!114 &3749181468246261833 +--- !u!114 &6572445634383977814 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563698020819114673} + m_GameObject: {fileID: 2840523410495348057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3cd0752a7ba5b6b4c9b66d7d2668058b, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 5741219692586799498} + _GameManager: {fileID: 0} +--- !u!114 &7251063502356948773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2840523410495348057} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} @@ -614,55 +672,12 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!114 &4318626733857526955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!4 &4984907899478633778 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2953003450068026185, guid: 21599afa6ab27574182496d3ebe3232c, + type: 3} + m_PrefabInstance: {fileID: 7914759338797346427} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563698020819114673} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3cd0752a7ba5b6b4c9b66d7d2668058b, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 2504569077717723477} - _GameManager: {fileID: 0} ---- !u!114 &2504569077717723477 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563698020819114673} - 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: 3 - serializedProgramAsset: {fileID: 11400000, guid: e814410455f813c4faf2dedf89c4a1fc, - type: 2} - programSource: {fileID: 11400000, guid: 5ad0760850c6bb04ca6ebb9fd45ec7e4, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 --- !u!4 &7664113719232022928 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 21599afa6ab27574182496d3ebe3232c, diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 1542d7f..9adf465 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -29025,7 +29025,7 @@ MonoBehaviour: _ArrivalDisplay: {fileID: 2013644315} _LocationBoard: {fileID: 1748199014} _JailChain: {fileID: 1619479724} - _JailPhone: {fileID: 1365241825} + _JailPhone: {fileID: 2029437306} _JailPlayer: {fileID: 115578771} --- !u!1 &867564311 stripped GameObject: @@ -40830,6 +40830,12 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1213298847 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3052933437962128110, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + m_PrefabInstance: {fileID: 1468229609714695594} + m_PrefabAsset: {fileID: 0} --- !u!1 &1216979707 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6454227042615460435, guid: be33bc7f6c414e6409becfa348b9310d, @@ -42253,6 +42259,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1317816905 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 484105329001669142, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + m_PrefabInstance: {fileID: 1468229609714695594} + m_PrefabAsset: {fileID: 0} --- !u!1 &1320820502 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6494273791062881839, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -44050,30 +44062,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 91371483} m_PrefabAsset: {fileID: 0} ---- !u!1 &1364932346 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5639091097157784956, guid: 60bb1d81845055844877bdeecb84a129, - type: 3} - m_PrefabInstance: {fileID: 1468229609714695594} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1365241815 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6563698020819114673, guid: 60bb1d81845055844877bdeecb84a129, - type: 3} - m_PrefabInstance: {fileID: 1468229609714695594} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1365241825 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4318626733857526955, guid: 60bb1d81845055844877bdeecb84a129, - type: 3} - m_PrefabInstance: {fileID: 1468229609714695594} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1365241815} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3cd0752a7ba5b6b4c9b66d7d2668058b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1369540354 PrefabInstance: m_ObjectHideFlags: 0 @@ -46923,12 +46911,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1466541185} m_CullTransparentMesh: 1 ---- !u!1 &1468074621 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 713464058611422934, guid: 60bb1d81845055844877bdeecb84a129, - type: 3} - m_PrefabInstance: {fileID: 1468229609714695594} - m_PrefabAsset: {fileID: 0} --- !u!1 &1470552272 GameObject: m_ObjectHideFlags: 0 @@ -67993,6 +67975,24 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!1 &2029437300 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2840523410495348057, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + m_PrefabInstance: {fileID: 1468229609714695594} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2029437306 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6572445634383977814, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + m_PrefabInstance: {fileID: 1468229609714695594} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029437300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3cd0752a7ba5b6b4c9b66d7d2668058b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2029469917 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3384679029783043879, guid: e9914385266bca24db809c39e395f03c, @@ -71684,10 +71684,36 @@ PrefabInstance: propertyPath: m_Name value: Jail Phone objectReference: {fileID: 0} + - target: {fileID: 637467565593588835, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 1134214850562754019, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1134214850562754019, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2413118715084811337, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: serializationData.Prefab value: + objectReference: {fileID: 2413118715084811337, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + - target: {fileID: 2534110475339935053, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2534110475339935053, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: _syncMethod + value: 1 objectReference: {fileID: 0} - target: {fileID: 2673121253577953921, guid: 60bb1d81845055844877bdeecb84a129, type: 3} @@ -71699,11 +71725,27 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} - - target: {fileID: 4170457371219803502, guid: 60bb1d81845055844877bdeecb84a129, + - target: {fileID: 2853797908349888740, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 3326875080655757843, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} + - target: {fileID: 3457220753733603828, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4170457371219803502, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4170457371219803502, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} - target: {fileID: 4318626733857526955, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: _GameManager @@ -71715,11 +71757,37 @@ PrefabInstance: value: objectReference: {fileID: 4318626733857526955, guid: 60bb1d81845055844877bdeecb84a129, type: 3} + - target: {fileID: 6572445634383977814, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: _GameManager + value: + objectReference: {fileID: 865296978} + - target: {fileID: 6572445634383977814, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6572445634383977814, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + - target: {fileID: 6685907188324864571, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6685907188324864571, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6744166533480653034, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 7286685073034146493, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 7341680935772707012, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: m_Enabled @@ -71746,6 +71814,11 @@ PrefabInstance: value: objectReference: {fileID: 7348467109636049180, guid: 60bb1d81845055844877bdeecb84a129, type: 3} + - target: {fileID: 7664069034163716319, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 0} - target: {fileID: 7717850005594243860, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: m_LocalPosition.x @@ -71830,12 +71903,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8605535245142898956, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} - target: {fileID: 8944227586022021438, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8944227586022021438, guid: 60bb1d81845055844877bdeecb84a129, + type: 3} - target: {fileID: 9191612834786653638, guid: 60bb1d81845055844877bdeecb84a129, type: 3} propertyPath: m_Enabled @@ -77098,36 +77173,36 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -81658,22 +81733,22 @@ MonoBehaviour: SerializedTypeNames: - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1364932346} + - gameObject: {fileID: 2029437300} + ID: 1094 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1317816905} ID: 1095 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1468074621} + - gameObject: {fileID: 1213298847} ID: 1096 SerializedTypeNames: - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1365241815} - ID: 1094 - SerializedTypeNames: - - VRC.SDK3.Components.VRCPickup - - 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/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 5c94943..326e7c7 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -320,6 +320,21 @@ public class CaseManager : UdonSharpBehaviour return "[[ERROR]]"; } + public string ContinentToString(ContinentMap Continent) + { + switch (Continent) + { + case ContinentMap.Africa: return "Africa"; + case ContinentMap.Asia: return "Asia"; + case ContinentMap.Europe: return "Europe"; + case ContinentMap.NorthAmerica: return "North America"; + case ContinentMap.Oceania: return "Oceania"; + case ContinentMap.SouthAmerica: return "South America"; + } + + return "[[ERROR]]"; + } + public string GetAccusedCrook() { return CrookToString(_AccusedCrook); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 76047f6..61a313b 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -265,9 +265,14 @@ public class GameManagerRound2 : GameManagerBase private void RoundWinner() { - HostCardRecoverTheLootEndInterface EndRecoverTheLootInterface = - (HostCardRecoverTheLootEndInterface)GetHostCardInterface(RoundSegmentType.EndRecoverTheLoot); - EndRecoverTheLootInterface.HeaderUI.text = "END"; + HostCardBetweenRoundsInterface BetweenRoundsInterface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + BetweenRoundsInterface.HeaderUI.text = "Winner: " + _CaseManager.GetCurrentWinningPlayers()[0]; + BetweenRoundsInterface.CommentUI.text = + "- You recovered " + _CaseManager.GetLoot() + "\n" + + "- You captured " + _CaseManager.GetCrookName() + "\n" + + "- Now all you have to do is pull on that chain and put " + _CaseManager.GetCrookName() + " in jail\n\n" + + "- We should be receiving a phone call from " + _CaseManager.GetCrookName() + " shortly..."; _JailChain.Show = true; @@ -277,6 +282,11 @@ public class GameManagerRound2 : GameManagerBase private void PhoneCall() { + HostCardBetweenRoundsInterface BetweenRoundsInterface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + BetweenRoundsInterface.HeaderUI.text = "Phone Call: " + _CaseManager.GetCrookName(); + BetweenRoundsInterface.CommentUI.text = "- You and I are going to " + _CaseManager.ContinentToString(_CaseManager.GetFinalRoundContinent()); + _JailPhone.Activate = true; EnableInteraction("Go To The Map"); diff --git a/Assets/UdonSharp/JailPhone.cs b/Assets/UdonSharp/JailPhone.cs index 022c266..d6a73e5 100644 --- a/Assets/UdonSharp/JailPhone.cs +++ b/Assets/UdonSharp/JailPhone.cs @@ -17,6 +17,10 @@ public class JailPhone : UdonSharpBehaviour public void Initialise() { + _CurrentOwner = _GameManager.GetHostOwner(); + + transform.localPosition = Vector3.zero; + transform.localRotation = Quaternion.identity; } public override void OnPickupUseDown() @@ -42,6 +46,7 @@ public class JailPhone : UdonSharpBehaviour private void PlayJailCall() { _GameManager.SendCustomEventDelayedSeconds("PlayJailCall", 0.75f); + Activate = false; } diff --git a/Raw Files/Phone.blend b/Raw Files/Phone.blend index 7284ae1..1e02db4 100644 Binary files a/Raw Files/Phone.blend and b/Raw Files/Phone.blend differ