diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 62c9482..9ee116c 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -64,6 +64,7 @@ + @@ -98,6 +99,7 @@ + diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index f10db05..1e59ce1 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1988,6 +1988,141 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &136444697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 136444698} + - component: {fileID: 136444700} + - component: {fileID: 136444699} + m_Layer: 22 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &136444698 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136444697} + 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: 723351288} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -26.22} + m_SizeDelta: {x: 640, y: 52.44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &136444699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136444697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Carmen went to... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.010192516, y: 0.15875247, z: -0.33999637, w: 0.05278692} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &136444700 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136444697} + m_CullTransparentMesh: 1 --- !u!1 &139576159 stripped GameObject: m_CorrespondingSourceObject: {fileID: 744764791484571813, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -3968,12 +4103,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -3996,7 +4131,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -4034,7 +4169,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!64 &222678233 MeshCollider: @@ -4049,7 +4184,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -4106,9 +4241,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 222678234} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!1 &224730389 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3378133619498976289, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -4347,6 +4481,43 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1556964902} m_PrefabAsset: {fileID: 0} +--- !u!1 &270804579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 270804580} + m_Layer: 22 + m_Name: Round 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &270804580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270804579} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1347311700} + - {fileID: 723351288} + m_Father: {fileID: 334599374} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &272680940 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6494273791062881839, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -4855,6 +5026,7 @@ RectTransform: - {fileID: 665314707} - {fileID: 73047839} - {fileID: 801369498} + - {fileID: 270804580} m_Father: {fileID: 379391076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.1, y: 0.1} @@ -5869,6 +6041,8 @@ MonoBehaviour: _FinalRoundInterface: {fileID: 251407510} _RecoverTheLootExplainerInterface: {fileID: 1331620965} _RecoverTheLootInterface: {fileID: 197393996} + _CaptureCarmenExplainerInterface: {fileID: 1347311702} + _CaptureCarmenInterface: {fileID: 723351290} _AdminPanelInterface: {fileID: 967689115} --- !u!1 &382947818 stripped GameObject: @@ -11405,12 +11579,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -11444,7 +11618,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &683256951 Rigidbody: @@ -11465,7 +11639,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -11547,9 +11721,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 683256953} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &683256955 MeshCollider: m_ObjectHideFlags: 0 @@ -11563,7 +11736,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -11945,6 +12118,125 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} +--- !u!1 &723351287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 723351288} + - component: {fileID: 723351291} + - component: {fileID: 723351290} + - component: {fileID: 723351289} + m_Layer: 22 + m_Name: Capture Carmen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &723351288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723351287} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00034335244} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 136444698} + - {fileID: 2144391370} + m_Father: {fileID: 270804580} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: 0.00010681152} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &723351289 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723351287} + 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: 2028b90022a313f47aadfe0e33d479b9, + type: 2} + programSource: {fileID: 11400000, guid: 113b264ea70531642a44e1567d572fc4, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgYAAAAAAAAAAi8CAAAAAVsAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVABNAFAAcgBvAC4AVABlAHgAdABNAGUAcwBoAFAAcgBvAFUARwBVAEkALAAgAFUAbgBpAHQAeQAuAFQAZQB4AHQATQBlAHMAaABQAHIAbwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQgAAABIAGUAYQBkAGUAcgBVAEkAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4ATwBiAGoAZQBjAHQALAAgAG0AcwBjAG8AcgBsAGkAYgAtAQUAAABWAGEAbAB1AGUABwUCLwMAAAABXQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBUAE0AUAByAG8ALgBUAGUAeAB0AE0AZQBzAGgAUAByAG8AVQBHAFUASQBbAF0ALAAgAFUAbgBpAHQAeQAuAFQAZQB4AHQATQBlAHMAaABQAHIAbwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQgAAABDAGgAbwBpAGMAZQBVAEkAJwEEAAAAdAB5AHAAZQABKgAAAFQATQBQAHIAbwAuAFQAZQB4AHQATQBlAHMAaABQAHIAbwBVAEcAVQBJAFsAXQAsACAAVQBuAGkAdAB5AC4AVABlAHgAdABNAGUAcwBoAFAAcgBvAAEBBQAAAFYAYQBsAHUAZQAvBAAAAAEqAAAAVABNAFAAcgBvAC4AVABlAHgAdABNAGUAcwBoAFAAcgBvAFUARwBVAEkAWwBdACwAIABVAG4AaQB0AHkALgBUAGUAeAB0AE0AZQBzAGgAUAByAG8ABAAAAAYAAAAAAAAAAAcFBwUCLwUAAAABWQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBVAEkALgBJAG0AYQBnAGUAWwBdACwAIABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBVAEkAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAFAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAESAAAAQwBoAG8AaQBjAGUAQgB1AHQAdABvAG4ASQBtAGEAZwBlAHMAJwEEAAAAdAB5AHAAZQABJgAAAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEkAbQBhAGcAZQBbAF0ALAAgAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQABAQUAAABWAGEAbAB1AGUALwYAAAABJgAAAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEkAbQBhAGcAZQBbAF0ALAAgAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAGAAAABgAAAAAAAAAABwUHBQIvBwAAAAFaAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEIAdQB0AHQAbwBuAFsAXQAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AVQBJAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABwAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABDQAAAEMAaABvAGkAYwBlAEIAdQB0AHQAbwBuAHMAJwEEAAAAdAB5AHAAZQABJwAAAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEIAdQB0AHQAbwBuAFsAXQAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AVQBJAAEBBQAAAFYAYQBsAHUAZQAvCAAAAAEnAAAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AVQBJAC4AQgB1AHQAdABvAG4AWwBdACwAIABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBVAEkACAAAAAYAAAAAAAAAAAcFBwUCMAIAAAAJAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEKAAAAXwBDAG8AbQBtAGUAbgB0AFUASQAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBPAGIAagBlAGMAdAAsACAAbQBzAGMAbwByAGwAaQBiAC0BBQAAAFYAYQBsAHUAZQAHBQIvCQAAAAFJAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAKAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEfAAAAXwBfAF8AVQBkAG8AbgBTAGgAYQByAHAAQgBlAGgAYQB2AGkAbwB1AHIAVgBlAHIAcwBpAG8AbgBfAF8AXwAnAQQAAAB0AHkAcABlAAEWAAAAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgAXAQUAAABWAGEAbAB1AGUAAgAAAAcFBwUHBQ== + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &723351290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723351287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1d6d4ed37a1d9c4a9936daabff2c45c, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 723351289} + HeaderUI: {fileID: 136444699} + ChoiceUI: [] + ChoiceButtonImages: [] + ChoiceButtons: [] + CommentUI: {fileID: 2144391371} +--- !u!114 &723351291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723351287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &729248013 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1024952735094859039, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -12674,6 +12966,168 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &782193421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 782193422} + - component: {fileID: 782193425} + - component: {fileID: 782193424} + - component: {fileID: 782193423} + m_Layer: 22 + m_Name: Comment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &782193422 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782193421} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00034335244} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1347311700} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -193} + m_SizeDelta: {x: 640, y: 261.12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &782193423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782193421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u2022 What you have to do now is track Carmen Sandiego through eight + different countries, identifying each country with a marker.\n\u2022 If you're + right, you will hear this sound: [[CORRECT SOUND BUTTON HERE]]\n\u2022 If you're + wrong, you'll hear this sound: [[INCORRECT SOUND BUTTON HERE]]\n\u2022 If you're + wrong two times, leave the marker where it is, come back, and we'll move on to + the next country.\n\u2022 If you're right eight times in 45 seconds, you will + win that promotion." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &782193424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782193421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &782193425 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782193421} + m_CullTransparentMesh: 1 --- !u!1 &785548300 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4376628796629608410, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -13853,12 +14307,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -13892,7 +14346,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &827257400 Rigidbody: @@ -13913,7 +14367,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -13995,9 +14449,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 827257402} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &827257404 MeshCollider: m_ObjectHideFlags: 0 @@ -14011,7 +14464,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -15199,12 +15652,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -15238,7 +15691,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &889644686 Rigidbody: @@ -15259,7 +15712,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -15341,9 +15794,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 889644688} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &889644690 MeshCollider: m_ObjectHideFlags: 0 @@ -15357,7 +15809,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -15666,12 +16118,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -15705,7 +16157,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &925359994 Rigidbody: @@ -15726,7 +16178,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -15808,9 +16260,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 925359996} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &925359998 MeshCollider: m_ObjectHideFlags: 0 @@ -15824,7 +16275,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -17100,6 +17551,20 @@ MonoBehaviour: - {fileID: 1556964903} - {fileID: 1556964903} - {fileID: 1556964903} + _Markers: + - {fileID: 222678235} + - {fileID: 1662234762} + - {fileID: 1801476824} + - {fileID: 1647705500} + - {fileID: 827257403} + - {fileID: 2023627962} + - {fileID: 925359997} + - {fileID: 1507936583} + - {fileID: 1012840706} + - {fileID: 1055793928} + - {fileID: 2067971419} + - {fileID: 683256954} + - {fileID: 889644689} _AudioManager: {fileID: 1947493795} --- !u!1 &971064007 stripped GameObject: @@ -17992,12 +18457,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -18031,7 +18496,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &1012840703 Rigidbody: @@ -18052,7 +18517,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -18134,9 +18599,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1012840705} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &1012840707 MeshCollider: m_ObjectHideFlags: 0 @@ -18150,7 +18614,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -19077,12 +19541,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -19116,7 +19580,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &1055793925 Rigidbody: @@ -19137,7 +19601,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -19219,9 +19683,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1055793927} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &1055793929 MeshCollider: m_ObjectHideFlags: 0 @@ -19235,7 +19698,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -23114,6 +23577,125 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345492638} m_CullTransparentMesh: 1 +--- !u!1 &1347311699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1347311700} + - component: {fileID: 1347311703} + - component: {fileID: 1347311702} + - component: {fileID: 1347311701} + m_Layer: 22 + m_Name: Explainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1347311700 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1347311699} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00034335244} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1471187088} + - {fileID: 782193422} + m_Father: {fileID: 270804580} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: 0.00010681152} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1347311701 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1347311699} + 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: db7f88044144f344896f6efd8573e920, + type: 2} + programSource: {fileID: 11400000, guid: d220e045f8ca5f3459647f6c92a5b5d8, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgYAAAAAAAAAAi8CAAAAAVsAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVABNAFAAcgBvAC4AVABlAHgAdABNAGUAcwBoAFAAcgBvAFUARwBVAEkALAAgAFUAbgBpAHQAeQAuAFQAZQB4AHQATQBlAHMAaABQAHIAbwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBt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 + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1347311702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1347311699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0de66959f04d71b4bac0d53aafa8962e, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1347311701} + HeaderUI: {fileID: 1471187089} + ChoiceUI: [] + ChoiceButtonImages: [] + ChoiceButtons: [] + _ExplainerUI: {fileID: 782193423} +--- !u!114 &1347311703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1347311699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1349422384 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8792864024508666928, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -25170,6 +25752,141 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1556964902} m_PrefabAsset: {fileID: 0} +--- !u!1 &1471187087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1471187088} + - component: {fileID: 1471187090} + - component: {fileID: 1471187089} + m_Layer: 22 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1471187088 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471187087} + 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: 1347311700} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -26.22} + m_SizeDelta: {x: 640, y: 52.44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1471187089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471187087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Briefing + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.010192516, y: 0.15875247, z: -0.33999637, w: 0.05278692} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1471187090 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471187087} + m_CullTransparentMesh: 1 --- !u!1 &1479105418 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3361620518939337076, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -25876,12 +26593,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -25915,7 +26632,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &1507936580 Rigidbody: @@ -25936,7 +26653,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -26018,9 +26735,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1507936582} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &1507936584 MeshCollider: m_ObjectHideFlags: 0 @@ -26034,7 +26750,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -27995,6 +28711,11 @@ PrefabInstance: propertyPath: m_Name value: Placeholder objectReference: {fileID: 0} + - target: {fileID: 6458581458612866833, guid: 899ce13087fd5974f88dcbccaea2df85, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6511243431600090744, guid: 899ce13087fd5974f88dcbccaea2df85, type: 3} propertyPath: serializationData.Prefab @@ -30737,12 +31458,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -30776,7 +31497,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &1647705497 Rigidbody: @@ -30797,7 +31518,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -30879,9 +31600,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1647705499} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &1647705501 MeshCollider: m_ObjectHideFlags: 0 @@ -30895,7 +31615,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -31363,12 +32083,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -31402,7 +32122,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &1662234759 Rigidbody: @@ -31423,7 +32143,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -31505,9 +32225,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1662234761} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &1662234763 MeshCollider: m_ObjectHideFlags: 0 @@ -31521,7 +32240,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -32752,12 +33471,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -32791,7 +33510,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &1801476821 Rigidbody: @@ -32812,7 +33531,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -32894,9 +33613,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1801476823} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &1801476825 MeshCollider: m_ObjectHideFlags: 0 @@ -32910,7 +33628,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -36732,12 +37450,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -36771,7 +37489,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &2023627959 Rigidbody: @@ -36792,7 +37510,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -36874,9 +37592,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2023627961} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &2023627963 MeshCollider: m_ObjectHideFlags: 0 @@ -36890,7 +37607,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -38366,12 +39083,12 @@ MonoBehaviour: localTransformFlag: 1 leftHandFlag: 0 kinematicFlag: 0 - pickupableFlag: 1 + pickupableFlag: 0 bounceFlag: 0 sleepFlag: 0 autoSmoothingTime: 0 lastKinematic: 0 - lastPickupable: 1 + lastPickupable: 0 _showInternalObjects: 0 showInternalObjects: 0 unparentInternalDataObject: 0 @@ -38405,7 +39122,7 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 2 --- !u!54 &2067971416 Rigidbody: @@ -38426,7 +39143,7 @@ Rigidbody: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 @@ -38508,9 +39225,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2067971418} - _Enabled: 1 + _LocationFindingEnabled: 0 _GameManager: {fileID: 969831474} - _AudioManager: {fileID: 1947493795} --- !u!64 &2067971420 MeshCollider: m_ObjectHideFlags: 0 @@ -38524,7 +39240,7 @@ MeshCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 1536 + m_Bits: 33555968 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 @@ -39715,6 +40431,162 @@ Transform: m_Children: [] m_Father: {fileID: 683256947} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2144391369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2144391370} + - component: {fileID: 2144391373} + - component: {fileID: 2144391372} + - component: {fileID: 2144391371} + m_Layer: 22 + m_Name: Comment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2144391370 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144391369} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00034335244} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 723351288} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -78.759995} + m_SizeDelta: {x: 640, y: 32.64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2144391371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144391369} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: City, Country + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &2144391372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144391369} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &2144391373 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144391369} + m_CullTransparentMesh: 1 --- !u!1 &294386634495315091 GameObject: m_ObjectHideFlags: 0 @@ -41574,6 +42446,11 @@ PrefabInstance: propertyPath: m_Name value: Africa objectReference: {fileID: 0} + - target: {fileID: 6458581458612866833, guid: 899ce13087fd5974f88dcbccaea2df85, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6511243431600090744, guid: 899ce13087fd5974f88dcbccaea2df85, type: 3} propertyPath: serializationData.Prefab @@ -45775,6 +46652,14 @@ MonoBehaviour: - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 723351287} + ID: 492 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1347311699} + ID: 493 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 2a0afda..ace01e1 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -15,7 +15,7 @@ public enum RoundType None, LocateTheCrook, RecoverTheLoot, - ChaseCarmen + CaptureCarmen } public enum RoundSegmentType @@ -30,7 +30,10 @@ public enum RoundSegmentType Tiebreaker, RecoverTheLootExplainer, - RecoverTheLoot + RecoverTheLoot, + + CaptureCarmenExplainer, + CaptureCarmen } @@ -86,7 +89,7 @@ public class GameManagerBase : UdonSharpBehaviour { case (int)RoundType.LocateTheCrook: return "Locate The Crook"; case (int)RoundType.RecoverTheLoot: return "Recover The Loot"; - case (int)RoundType.ChaseCarmen: return "Chase Carmen"; + case (int)RoundType.CaptureCarmen: return "Capture Carmen"; default: return "[[ERROR]]"; } } @@ -106,6 +109,9 @@ public class GameManagerBase : UdonSharpBehaviour case RoundSegmentType.RecoverTheLootExplainer: return "Recover The Loot - Briefing"; case RoundSegmentType.RecoverTheLoot: return "Recover The Loot"; + case RoundSegmentType.CaptureCarmenExplainer: return "Capture Carmen - Briefing"; + case RoundSegmentType.CaptureCarmen: return "Capture Carmen"; + default: return "[[ERROR]]"; } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index c0f1a74..9751346 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: 8 + Data: 11 - Name: Entry: 7 Data: @@ -296,25 +296,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudioManager + Data: _Markers - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudioManager + Data: _Markers - Name: k__BackingField Entry: 7 Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: AudioManager, Assembly-CSharp + Data: FloorMapMarker[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -356,16 +356,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ActiveMap + Data: _AudioManager - Name: $v Entry: 7 Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ActiveMap + Data: _AudioManager - Name: k__BackingField Entry: 7 Data: 24|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: AudioManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ActiveMap + - Name: $v + Entry: 7 + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ActiveMap + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -374,7 +434,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 25|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -395,7 +455,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -419,13 +479,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -434,7 +494,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 28 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -449,7 +509,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -473,16 +533,16 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 9 - Data: 25 + Data: 29 - Name: k__BackingField Entry: 9 - Data: 25 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -497,7 +557,103 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|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: _SuccessCounter + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SuccessCounter + - 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: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 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: _FailureCounter + - Name: $v + Entry: 7 + Data: 38|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: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index c280372..85b3e0e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -2,6 +2,7 @@ using UdonSharp; using UnityEngine; using VRC.SDK3.Data; +using VRC.SDK3.UdonNetworkCalling; public enum ContinentMap @@ -19,7 +20,9 @@ public enum ContinentMap public class GameManagerRound3 : GameManagerBase { [SerializeField] private CaseManager _CaseManager; + [SerializeField] private FloorMap[] _Maps; + [SerializeField] private FloorMapMarker[] _Markers; [SerializeField] private AudioManager _AudioManager; @@ -27,11 +30,15 @@ public class GameManagerRound3 : GameManagerBase private DataDictionary _ContinentData; private int _StageIndex = 0; + private int _SuccessCounter = 0; + private int _FailureCounter = 0; + private const int MAX_FAILURE_COUNT = 2; + private const int MAX_SUCCESS_COUNT = 8; + public override void InitialiseGameMode() { - base.InitialiseGameMode(); } @@ -45,12 +52,14 @@ public class GameManagerRound3 : GameManagerBase _ActiveMap = (ContinentMap)(int)_ContinentData["Continent"].Number; for (int i = 0; i < _Maps.Length; i++) { - FloorMap Map = _Maps[(int)_ActiveMap]; + FloorMap Map = _Maps[i]; if (Map != null) { Map.gameObject.SetActive(i == (int)_ActiveMap); } } + + GetCurrentMap().RandomiseCountries(); } else { @@ -62,37 +71,99 @@ public class GameManagerRound3 : GameManagerBase private void DisplayBriefing() { - HostCardRecoverTheLootExplainerInterface RecoverTheLootInterface = - (HostCardRecoverTheLootExplainerInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLootExplainer); + HostCardCaptureCarmenExplainerInterface CaptureCarmenExplainerInterface = + (HostCardCaptureCarmenExplainerInterface)GetHostCardInterface(RoundSegmentType.CaptureCarmenExplainer); - RecoverTheLootInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.RecoverTheLootExplainer); + CaptureCarmenExplainerInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.CaptureCarmenExplainer); } + public void BeginRound() + { + UpdateInterface(); + + GetCurrentMarker().EnablePickup(true); + } + + public void CorrectResponse() + { + _AudioManager.PlaySFX(SFXEventType.MapCorrect); + + GetCurrentMarker().EnablePickup(false); + + _SuccessCounter++; + if (_SuccessCounter >= MAX_SUCCESS_COUNT) + { + Debug.LogError("No error. We won."); + } + else + { + int NextCountry = GetCurrentMap().NextCountry(); + _Markers[NextCountry].EnablePickup(true); + UpdateInterface(); + } + } + + public void IncorrectResponse() + { + _FailureCounter++; + if (_FailureCounter >= MAX_FAILURE_COUNT) + { + _FailureCounter = 0; + GetCurrentMarker().EnablePickup(false); + int NextCountry = GetCurrentMap().NextCountry(); + _Markers[NextCountry].EnablePickup(true); + + UpdateInterface(); + } + + _AudioManager.PlaySFX(SFXEventType.MapIncorrect); + } + + + public FloorMap GetCurrentMap() + { + return _Maps[(int)_ActiveMap]; + } + + public FloorMapMarker GetCurrentMarker() + { + return _Markers[GetCurrentMap().GetCurrentCountryIndex()]; + } + public string GetCurrentCountry() { - return _Maps[(int)_ActiveMap].GetCurrentCountry(); + return GetCurrentMap().GetCurrentCountry(); } public string GetCurrentCity() { - return _Maps[(int)_ActiveMap].GetCurrentCity(); + return GetCurrentMap().GetCurrentCity(); + } + + private void UpdateInterface() + { + HostCardCaptureCarmenInterface CaptureCarmenInterface = + (HostCardCaptureCarmenInterface)GetHostCardInterface(RoundSegmentType.CaptureCarmen); + + CaptureCarmenInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.CaptureCarmen); + CaptureCarmenInterface.CommentUI.text = GetCurrentCity() + ", " + GetCurrentCountry(); } protected override HostCardInterfaceBase GetHostCardInterface(RoundSegmentType Question) { - return _HostCard.EnableHostCardDisplay(RoundType.RecoverTheLoot, Question); + return _HostCard.EnableHostCardDisplay(RoundType.CaptureCarmen, Question); } protected override void _HostCardUseButtonDown_Internal() { - //_StageIndex++; - //switch (_StageIndex) - //{ - // case 1: DisplayBriefing(); break; - // case 2: BeginRound(); break; - //} + _StageIndex++; + switch (_StageIndex) + { + case 1: DisplayBriefing(); break; + case 2: BeginRound(); break; + } } } diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.asset new file mode 100644 index 0000000..8a34bbd --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.asset @@ -0,0 +1,323 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: HostCardCaptureCarmenExplainerInterface + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: db7f88044144f344896f6efd8573e920, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 0de66959f04d71b4bac0d53aafa8962e, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 5361748669480058985 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 5 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: HeaderUI + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HeaderUI + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|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: ChoiceUI + - Name: $v + Entry: 7 + Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceUI + - Name: k__BackingField + Entry: 7 + Data: 6|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI[], Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 6 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 7|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: ChoiceButtonImages + - Name: $v + Entry: 7 + Data: 8|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceButtonImages + - Name: k__BackingField + Entry: 7 + Data: 9|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Image[], UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 9 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 10|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: ChoiceButtons + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceButtons + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Button[], UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 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: _ExplainerUI + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ExplainerUI + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.asset.meta b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.asset.meta new file mode 100644 index 0000000..2a14e5b --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d220e045f8ca5f3459647f6c92a5b5d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.cs new file mode 100644 index 0000000..7892662 --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.cs @@ -0,0 +1,14 @@ + +using TMPro; +using UnityEngine.UI; +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class HostCardCaptureCarmenExplainerInterface : HostCardInterfaceBase +{ + [SerializeField] private TextMeshProUGUI _ExplainerUI; +} diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.cs.meta b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.cs.meta new file mode 100644 index 0000000..8f7a638 --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenExplainerInterface.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0de66959f04d71b4bac0d53aafa8962e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.asset new file mode 100644 index 0000000..fb3308c --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.asset @@ -0,0 +1,323 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: HostCardCaptureCarmenInterface + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 2028b90022a313f47aadfe0e33d479b9, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: e1d6d4ed37a1d9c4a9936daabff2c45c, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: -5727270519116531268 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 5 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: HeaderUI + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HeaderUI + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|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: ChoiceUI + - Name: $v + Entry: 7 + Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceUI + - Name: k__BackingField + Entry: 7 + Data: 6|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI[], Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 6 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 7|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: ChoiceButtonImages + - Name: $v + Entry: 7 + Data: 8|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceButtonImages + - Name: k__BackingField + Entry: 7 + Data: 9|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Image[], UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 9 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 10|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: ChoiceButtons + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceButtons + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Button[], UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 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: CommentUI + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: CommentUI + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.asset.meta b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.asset.meta new file mode 100644 index 0000000..65b64f2 --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 113b264ea70531642a44e1567d572fc4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.cs new file mode 100644 index 0000000..cd3fbc1 --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.cs @@ -0,0 +1,14 @@ + +using TMPro; +using UnityEngine.UI; +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class HostCardCaptureCarmenInterface : HostCardInterfaceBase +{ + [SerializeField] public TextMeshProUGUI CommentUI; +} diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.cs.meta b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.cs.meta new file mode 100644 index 0000000..c4c9317 --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardCaptureCarmenInterface.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e1d6d4ed37a1d9c4a9936daabff2c45c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset index 7e2488e..663e7f5 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 11 + Data: 13 - Name: Entry: 7 Data: @@ -653,19 +653,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AdminPanelInterface + Data: _CaptureCarmenExplainerInterface - Name: $v Entry: 7 Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AdminPanelInterface + Data: _CaptureCarmenExplainerInterface - Name: k__BackingField Entry: 7 Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostPanelInterface, Assembly-CSharp + Data: HostCardCaptureCarmenExplainerInterface, Assembly-CSharp - Name: Entry: 8 Data: @@ -708,6 +708,126 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CaptureCarmenInterface + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaptureCarmenInterface + - Name: k__BackingField + Entry: 7 + Data: 47|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: HostCardCaptureCarmenInterface, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _AdminPanelInterface + - Name: $v + Entry: 7 + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AdminPanelInterface + - Name: k__BackingField + Entry: 7 + Data: 51|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: HostPanelInterface, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs index a7439ca..8c81fb2 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs @@ -28,6 +28,9 @@ public class HostCardManager : UdonSharpBehaviour [SerializeField] private HostCardRecoverTheLootExplainerInterface _RecoverTheLootExplainerInterface; [SerializeField] private HostCardRecoverTheLootInterface _RecoverTheLootInterface; + [SerializeField] private HostCardCaptureCarmenExplainerInterface _CaptureCarmenExplainerInterface; + [SerializeField] private HostCardCaptureCarmenInterface _CaptureCarmenInterface; + [SerializeField] private HostPanelInterface _AdminPanelInterface; public override void OnPickup() @@ -114,6 +117,9 @@ public class HostCardManager : UdonSharpBehaviour _RecoverTheLootExplainerInterface.gameObject.SetActive(false); _RecoverTheLootInterface.gameObject.SetActive(false); + _CaptureCarmenExplainerInterface.gameObject.SetActive(false); + _CaptureCarmenInterface.gameObject.SetActive(false); + switch (Game) { case RoundType.LocateTheCrook: @@ -150,9 +156,17 @@ public class HostCardManager : UdonSharpBehaviour return _RecoverTheLootInterface; } } break; - case RoundType.ChaseCarmen: + case RoundType.CaptureCarmen: { - + switch (Question) + { + case RoundSegmentType.CaptureCarmenExplainer: + _CaptureCarmenExplainerInterface.gameObject.SetActive(true); + return _CaptureCarmenExplainerInterface; + case RoundSegmentType.CaptureCarmen: + _CaptureCarmenInterface.gameObject.SetActive(true); + return _CaptureCarmenInterface; + } } break; default: _BetweenRoundsInterface.gameObject.SetActive(true); diff --git a/Assets/UdonSharp/Maps/FloorMap.cs b/Assets/UdonSharp/Maps/FloorMap.cs index 06bafa2..c455886 100644 --- a/Assets/UdonSharp/Maps/FloorMap.cs +++ b/Assets/UdonSharp/Maps/FloorMap.cs @@ -20,7 +20,7 @@ public class FloorMap : UdonSharpBehaviour private const int MAX_SELECTED_COUNTRIES = 13; - void Start() + public void RandomiseCountries() { _CurrentCountry = 0; @@ -46,8 +46,22 @@ public class FloorMap : UdonSharpBehaviour _ChosenCountries[i] = Location.Country; _ChosenCities[i] = Location.City; } + + Debug.LogError("Current location: " + _ChosenCities[_CurrentCountry] + ", " + _ChosenCountries[_CurrentCountry]); } + public int NextCountry() + { + _CurrentCountry++; + Debug.LogError("Current location: " + _ChosenCities[_CurrentCountry] + ", " + _ChosenCountries[_CurrentCountry]); + return _CurrentCountry; + } + + + public int GetCurrentCountryIndex() + { + return _CurrentCountry; + } public string GetCurrentCountry() { diff --git a/Assets/UdonSharp/Maps/FloorMapMarker.asset b/Assets/UdonSharp/Maps/FloorMapMarker.asset index e1daf2c..df06a5f 100644 --- a/Assets/UdonSharp/Maps/FloorMapMarker.asset +++ b/Assets/UdonSharp/Maps/FloorMapMarker.asset @@ -44,19 +44,19 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 5 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _Enabled + Data: _LocationFindingEnabled - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Enabled + Data: _LocationFindingEnabled - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib @@ -248,76 +248,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudioManager + Data: _CollidingLocations - Name: $v Entry: 7 Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudioManager + Data: _CollidingLocations - Name: k__BackingField Entry: 7 Data: 18|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: AudioManager, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 14 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 20|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _CollidingLocations - - Name: $v - Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CollidingLocations - - Name: k__BackingField - Entry: 7 - Data: 22|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataList, VRCSDK3 @@ -326,7 +266,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 22 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -341,7 +281,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -365,13 +305,13 @@ MonoBehaviour: Data: _CollisionCheckCounter - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CollisionCheckCounter - Name: k__BackingField Entry: 7 - Data: 25|System.RuntimeType, mscorlib + Data: 21|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -380,7 +320,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 25 + Data: 21 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -395,55 +335,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 26|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: _FailureCounter - - Name: $v - Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _FailureCounter - - Name: k__BackingField - Entry: 9 - Data: 25 - - Name: k__BackingField - Entry: 9 - Data: 25 - - 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: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Maps/FloorMapMarker.cs b/Assets/UdonSharp/Maps/FloorMapMarker.cs index 9747ca6..2c2de83 100644 --- a/Assets/UdonSharp/Maps/FloorMapMarker.cs +++ b/Assets/UdonSharp/Maps/FloorMapMarker.cs @@ -9,19 +9,16 @@ using static UnityEditor.FilePathAttribute; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class FloorMapMarker : UdonSharpBehaviour { - [UdonSynced, SerializeField, FieldChangeCallback(nameof(Enabled))] private bool _Enabled = false; + [UdonSynced, SerializeField, FieldChangeCallback(nameof(LocationFindingEnabled))] public bool _LocationFindingEnabled = false; [UdonSynced, FieldChangeCallback(nameof(IsGrabbed))] private bool _IsGrabbed = false; [SerializeField] private GameManagerRound3 _GameManager; - [SerializeField] private AudioManager _AudioManager; private DataList _CollidingLocations = new DataList(); private int _CollisionCheckCounter = 0; - private int _FailureCounter = 0; private const int MAX_REPEAT_COLLISION_CHECKS = 3; private const float TIME_BETWEEN_REPEAT_COLLISION_CHECKS = 0.15f; - private const int MAX_FAILURE_COUNT = 2; public void OnTriggerEnter(Collider OtherCollider) @@ -53,7 +50,7 @@ public class FloorMapMarker : UdonSharpBehaviour Body.constraints = RigidbodyConstraints.None; } - Enabled = true; + LocationFindingEnabled = true; IsGrabbed = true; _CollidingLocations.Clear(); @@ -71,7 +68,7 @@ public class FloorMapMarker : UdonSharpBehaviour public void CheckCollisions() { - if (!Enabled) return; + if (!LocationFindingEnabled) return; if (_CollidingLocations.Count > 0 && IsUpright() && !IsGrabbed) { @@ -83,19 +80,8 @@ public class FloorMapMarker : UdonSharpBehaviour bool FoundCorrectResponse = ConfirmChoice(Location.Country, Location.City); if (FoundCorrectResponse) { - _AudioManager.PlaySFX(SFXEventType.MapCorrect); - - Rigidbody Body; - if (Body = GetComponent()) - { - Body.constraints = RigidbodyConstraints.FreezeAll; - } - transform.position = Location.transform.position; - StandUpright(); - - Enabled = false; - EnablePickup(false); - + DisableMovementCompletely(Location); + _GameManager.CorrectResponse(); return; } } @@ -109,26 +95,12 @@ public class FloorMapMarker : UdonSharpBehaviour } else { - _AudioManager.PlaySFX(SFXEventType.MapIncorrect); + DisableMovementCompletely(); - Rigidbody Body; - if (Body = GetComponent()) - { - Body.constraints = RigidbodyConstraints.FreezeAll; - } - StandUpright(); + _GameManager.IncorrectResponse(); _CollisionCheckCounter = 0; _CollidingLocations.Clear(); - - // Stop checking for new collisions here, and if this results - // in too many fails, don't allow new pickups. - Enabled = false; - _FailureCounter++; - if (_FailureCounter >= MAX_FAILURE_COUNT) - { - EnablePickup(false); - } } _CollisionCheckCounter++; } @@ -152,7 +124,7 @@ public class FloorMapMarker : UdonSharpBehaviour return false; } - private void EnablePickup(bool Enable) + public void EnablePickup(bool Enable) { VRCPickup Pickup; if (Pickup = GetComponent()) @@ -162,9 +134,21 @@ public class FloorMapMarker : UdonSharpBehaviour } - private void StandUpright() + public void DisableMovementCompletely(FloorMapLocation CorrectLocation = null) { + Rigidbody Body; + if (Body = GetComponent()) + { + Body.constraints = RigidbodyConstraints.FreezeAll; + } transform.eulerAngles = new Vector3(0.0f, transform.eulerAngles.y, 0.0f); + + LocationFindingEnabled = false; + + if (CorrectLocation != null) + { + transform.position = CorrectLocation.transform.position; + } } private bool IsUpright() @@ -173,13 +157,13 @@ public class FloorMapMarker : UdonSharpBehaviour } - public bool Enabled + public bool LocationFindingEnabled { set { - _Enabled = value; + _LocationFindingEnabled = value; } - get => _Enabled; + get => _LocationFindingEnabled; } public bool IsGrabbed