diff --git a/Assets/Models/SM_DrywallPanel10x16.fbx b/Assets/Models/SM_DrywallPanel10x16.fbx index cdb3180..df48163 100644 Binary files a/Assets/Models/SM_DrywallPanel10x16.fbx and b/Assets/Models/SM_DrywallPanel10x16.fbx differ diff --git a/Assets/Models/SM_DrywallPanel10x20.fbx b/Assets/Models/SM_DrywallPanel10x20.fbx index 9463a77..52b77f9 100644 Binary files a/Assets/Models/SM_DrywallPanel10x20.fbx and b/Assets/Models/SM_DrywallPanel10x20.fbx differ diff --git a/Assets/Prefabs/Overlays/Newspaper Overlay.prefab b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab index e3791e9..bf3a507 100644 --- a/Assets/Prefabs/Overlays/Newspaper Overlay.prefab +++ b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 7241432374676536911} - component: {fileID: 8045183386931381925} - component: {fileID: 6622382881250925265} - - component: {fileID: 2104256769495490831} m_Layer: 0 m_Name: Newspaper m_TagString: Untagged @@ -84,28 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &2104256769495490831 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2396313974114816115} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &8073544392714602498 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Overlays/Timer Overlay.prefab b/Assets/Prefabs/Overlays/Timer Overlay.prefab index ff18da7..04e3587 100644 --- a/Assets/Prefabs/Overlays/Timer Overlay.prefab +++ b/Assets/Prefabs/Overlays/Timer Overlay.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 1840311670225430452} - component: {fileID: 4449623782578530148} - component: {fileID: 1853164644565545129} - - component: {fileID: 4733969756081220924} m_Layer: 23 m_Name: Timer Shadow m_TagString: Untagged @@ -84,28 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &4733969756081220924 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2144391566429038996} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2305955422126925254 GameObject: m_ObjectHideFlags: 0 @@ -150,7 +127,6 @@ GameObject: - component: {fileID: 8867489872500998328} - component: {fileID: 5665008111509437234} - component: {fileID: 7928594755389478293} - - component: {fileID: 1483020111879288612} m_Layer: 23 m_Name: Timer m_TagString: Untagged @@ -224,28 +200,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &1483020111879288612 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2931761892402300280} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &6724496829687796463 GameObject: m_ObjectHideFlags: 0 @@ -364,7 +318,6 @@ GameObject: - component: {fileID: 5013644444883549052} - component: {fileID: 6782731755518377502} - component: {fileID: 4271253783985076640} - - component: {fileID: 7879612275263426022} m_Layer: 23 m_Name: Counter Shadow m_TagString: Untagged @@ -437,28 +390,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7879612275263426022 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760355067001534755} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &9197170563655528323 GameObject: m_ObjectHideFlags: 0 @@ -470,7 +401,6 @@ GameObject: - component: {fileID: 8304324323685507503} - component: {fileID: 931146767691669220} - component: {fileID: 5093242939629858900} - - component: {fileID: 553723145425990315} m_Layer: 23 m_Name: Counter m_TagString: Untagged @@ -544,25 +474,3 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &553723145425990315 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9197170563655528323} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 4d5ae58..c2b3725 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -5,9 +5,9 @@ OcclusionCullingSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_OcclusionBakeSettings: - smallestOccluder: 5 + smallestOccluder: 10 smallestHole: 0.25 - backfaceThreshold: 100 + backfaceThreshold: 5 m_SceneGUID: 234ac6652f2be3943b8974a3fcbaba1f m_OcclusionCullingData: {fileID: 36300000, guid: 986bfc502ead58842954d647b77718e7, type: 2} @@ -610,6 +610,141 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &20216973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 20216974} + - component: {fileID: 20216976} + - component: {fileID: 20216975} + m_Layer: 22 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &20216974 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 20216973} + 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: 1580349488} + 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!114 &20216975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 20216973} + 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: End Timer Early + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 22 + m_fontSizeBase: 22 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 32 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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!222 &20216976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 20216973} + m_CullTransparentMesh: 1 --- !u!1 &21199160 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6179746361007884526, guid: be33bc7f6c414e6409becfa348b9310d, @@ -4432,11 +4567,6 @@ PrefabInstance: propertyPath: m_Name value: Newspaper Overlay objectReference: {fileID: 0} - - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -12961,6 +13091,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 245328624} m_CullTransparentMesh: 1 +--- !u!1 &246731892 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + m_PrefabInstance: {fileID: 1392345919} + m_PrefabAsset: {fileID: 0} --- !u!1001 &247036822 PrefabInstance: m_ObjectHideFlags: 0 @@ -13967,6 +14103,141 @@ Transform: type: 3} m_PrefabInstance: {fileID: 268695741} m_PrefabAsset: {fileID: 0} +--- !u!1 &270048908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 270048909} + - component: {fileID: 270048911} + - component: {fileID: 270048910} + m_Layer: 22 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &270048909 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270048908} + 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: 1604595681} + 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!114 &270048910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270048908} + 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: Randomise Map (Easy Mode) + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 32 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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!222 &270048911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270048908} + m_CullTransparentMesh: 1 --- !u!1 &270804579 GameObject: m_ObjectHideFlags: 0 @@ -20565,12 +20836,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1315892562} + - {fileID: 1580349488} + - {fileID: 504234111} - {fileID: 692222394} m_Father: {fileID: 435937998} 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: -870} + m_AnchoredPosition: {x: 320, y: -195} m_SizeDelta: {x: 640, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &422534425 @@ -21465,7 +21739,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &446317309 MonoBehaviour: @@ -22989,6 +23263,41 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 783795838} m_PrefabAsset: {fileID: 0} +--- !u!1 &504234110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 504234111} + m_Layer: 22 + m_Name: Spacer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &504234111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504234110} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0013411043} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 422534424} + 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: -95} + m_SizeDelta: {x: 640, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &504807929 GameObject: m_ObjectHideFlags: 0 @@ -26763,11 +27072,6 @@ PrefabInstance: propertyPath: m_Name value: Newspaper Overlay objectReference: {fileID: 0} - - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -30021,6 +30325,12 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &672992012 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + m_PrefabInstance: {fileID: 1538206739} + m_PrefabAsset: {fileID: 0} --- !u!1 &673068011 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2530899762456156974, guid: be33bc7f6c414e6409becfa348b9310d, @@ -30375,11 +30685,6 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} - - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} propertyPath: serializationData.Prefab @@ -30522,7 +30827,7 @@ RectTransform: 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: -15} + m_AnchoredPosition: {x: 320, y: -125} m_SizeDelta: {x: 640, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &692222395 @@ -30767,6 +31072,90 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1001 &705210510 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1976503210} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalPosition.x + value: -5.92 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.10778439 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.11 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - target: {fileID: 919132149155446097, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_Name + value: SM_NewsStand + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f5bc5d61a5d3b344dbf2a816916c3498, type: 3} +--- !u!4 &705210511 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, + type: 3} + m_PrefabInstance: {fileID: 705210510} + m_PrefabAsset: {fileID: 0} --- !u!1 &705413779 GameObject: m_ObjectHideFlags: 0 @@ -36203,6 +36592,139 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!1 &854219848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 854219849} + - component: {fileID: 854219852} + - component: {fileID: 854219851} + - component: {fileID: 854219850} + m_Layer: 22 + m_Name: Randomise Map (Hard Mode) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &854219849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854219848} + 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: 1552525912} + m_Father: {fileID: 1315892562} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 480, y: -15} + m_SizeDelta: {x: 320, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &854219850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854219848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 854219851} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 967689114} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Round3_RandomiseMap_Hard + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &854219851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854219848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &854219852 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854219848} + m_CullTransparentMesh: 1 --- !u!1 &854385180 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6424330528749745272, guid: be33bc7f6c414e6409becfa348b9310d, @@ -40256,6 +40778,9 @@ MonoBehaviour: _Round2ButtonText: {fileID: 800293547} _Round3ButtonText: {fileID: 245328626} _CaseManager: {fileID: 841163054} + _Round1Manager: {fileID: 515404446} + _Round2Manager: {fileID: 865296978} + _Round3Manager: {fileID: 969831474} _PlayerPodiums: - {fileID: 4438766482650780795} - {fileID: 1993364535} @@ -47802,11 +48327,6 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} - - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} propertyPath: serializationData.Prefab @@ -53881,6 +54401,79 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1315892561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1315892562} + - component: {fileID: 1315892564} + - component: {fileID: 1315892563} + m_Layer: 22 + m_Name: Randomise Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1315892562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315892561} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0013411043} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1604595681} + - {fileID: 854219849} + m_Father: {fileID: 422534424} + 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: -25} + m_SizeDelta: {x: 640, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1315892563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315892561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, 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: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!222 &1315892564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315892561} + m_CullTransparentMesh: 1 --- !u!1 &1316445974 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3602087048706133721, guid: be33bc7f6c414e6409becfa348b9310d, @@ -54273,7 +54866,7 @@ RectTransform: 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: -550} + m_AnchoredPosition: {x: 320, y: -195} m_SizeDelta: {x: 640, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1325214660 @@ -56375,11 +56968,6 @@ PrefabInstance: propertyPath: m_Name value: Newspaper Overlay objectReference: {fileID: 0} - - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -57352,7 +57940,15 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 612908862} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1392345924} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1392345923} m_SourcePrefab: {fileID: 100100000, guid: 5411da33b9d095341b3b8ece387e743d, type: 3} --- !u!4 &1392345920 stripped Transform: @@ -57360,6 +57956,48 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1392345919} m_PrefabAsset: {fileID: 0} +--- !u!65 &1392345923 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246731892} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1047167, y: 0.18, z: 2.4384} + m_Center: {x: 0.55233747, y: 0.27, z: 0.00000092770136} +--- !u!65 &1392345924 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246731892} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.4049, y: 0.18, z: 2.4384} + m_Center: {x: 0.7024519, y: 0.09, z: 0.0000008940697} --- !u!1 &1392677813 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6125622359357326373, guid: be33bc7f6c414e6409becfa348b9310d, @@ -68869,7 +69507,15 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1538206744} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1538206743} m_SourcePrefab: {fileID: 100100000, guid: ce325db213ddf894e9ad90b47c50fe26, type: 3} --- !u!4 &1538206740 stripped Transform: @@ -68877,6 +69523,48 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1538206739} m_PrefabAsset: {fileID: 0} +--- !u!65 &1538206743 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672992012} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.8142978, y: 0.18, z: 1.6256001} + m_Center: {x: -0.407137, y: 0.27, z: 0.0000007574298} +--- !u!65 &1538206744 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672992012} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1143001, y: 0.18, z: 1.6256001} + m_Center: {x: -0.55714816, y: 0.09, z: 0.0000008046627} --- !u!1 &1539961713 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8729636926385515984, guid: e9914385266bca24db809c39e395f03c, @@ -69265,6 +69953,141 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &1552525911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1552525912} + - component: {fileID: 1552525914} + - component: {fileID: 1552525913} + m_Layer: 22 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1552525912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1552525911} + 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: 854219849} + 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!114 &1552525913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1552525911} + 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: Randomise Map (Hard Mode) + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 32 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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!222 &1552525914 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1552525911} + m_CullTransparentMesh: 1 --- !u!1 &1553437942 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4090900115978567236, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -71584,6 +72407,139 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1580349487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1580349488} + - component: {fileID: 1580349491} + - component: {fileID: 1580349490} + - component: {fileID: 1580349489} + m_Layer: 22 + m_Name: End Timer Early + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1580349488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580349487} + 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: 20216974} + m_Father: {fileID: 422534424} + 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: -65} + m_SizeDelta: {x: 640, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1580349489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580349487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1580349490} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 967689114} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Round3_EndTimerEarly + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1580349490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580349487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1580349491 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580349487} + m_CullTransparentMesh: 1 --- !u!1001 &1582278623 PrefabInstance: m_ObjectHideFlags: 0 @@ -72715,6 +73671,139 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1604595680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1604595681} + - component: {fileID: 1604595684} + - component: {fileID: 1604595683} + - component: {fileID: 1604595682} + m_Layer: 22 + m_Name: Randomise Map (Easy Mode) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1604595681 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604595680} + 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: 270048909} + m_Father: {fileID: 1315892562} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160, y: -15} + m_SizeDelta: {x: 320, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1604595682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604595680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1604595683} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 967689114} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Round3_RandomiseMap_Easy + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1604595683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604595680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1604595684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604595680} + m_CullTransparentMesh: 1 --- !u!1 &1605285858 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6685417416378653641, guid: be33bc7f6c414e6409becfa348b9310d, @@ -73985,11 +75074,6 @@ PrefabInstance: propertyPath: m_Name value: Newspaper Overlay objectReference: {fileID: 0} - - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -75879,8 +76963,8 @@ OcclusionArea: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1687043073} serializedVersion: 2 - m_Size: {x: 30.028893, y: 11.547906, z: 40.5639} - m_Center: {x: -6.74185, y: 2.8440664, z: 4.8177605} + m_Size: {x: 30.27513, y: 13.989773, z: 39.975765} + m_Center: {x: -6.7734175, y: 4.0650005, z: 4.879239} m_IsViewVolume: 1 --- !u!4 &1687043075 Transform: @@ -79907,11 +80991,6 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} - - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} propertyPath: serializationData.Prefab @@ -86119,7 +87198,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + insertIndex: -1 + addedObject: {fileID: 705210511} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, type: 3} @@ -107276,11 +108359,6 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} - - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} propertyPath: serializationData.Prefab diff --git a/Assets/Scenes/witwics/OcclusionCullingData.asset b/Assets/Scenes/witwics/OcclusionCullingData.asset index 60f2872..63de6c2 100644 --- a/Assets/Scenes/witwics/OcclusionCullingData.asset +++ b/Assets/Scenes/witwics/OcclusionCullingData.asset @@ -7,196 +7,198 @@ OcclusionCullingData: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: OcclusionCullingData - m_PVSData: 120000d6c32e3d6b802d00000000a04100000000000020c20000a0c10000a0c10000a0410000a0410000204220000000500100000000000001000000600100005c000000800200000000000000000000200b0000a7000000a00100007b00000000000000000000000000000000000000000000000000000000000000010000006002000000000000900100000100000001000000010000007001000080010000900c0000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3232204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f000000000000000000000000010000000000000000000000000000003aba2740000000000000000000000000000000002f000000000000000000000088b0088de2f385700889c008303113b7a00b3c110886a00897a009274108a9230b358113bb60098380108b000994600cc9e114d7510893100887200892c008a9e02ab7a0239630098030089bf009a3410821110807a1080c12098590088b000907212183100884600999b0191fe10921510887b1088410088020089670218640108911080701088340099360099210088780108c0009a1600980400899b009817011262108963008801008926009828008936009830010840000000000000000000000000000000000000000ffff0000ffffffff000000000000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fb1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b0407cb8a0c061affb32c66de83f5a54ff40a970dd3d982cd541a85d99bf000000008709e03faf29014100002041afc16e41a635a1c0e014dd3da082144112ba973d5474a340ed4c6641ca2f92c191c2753ed6a3b04074da8cc10ad7233feb517841ae1a48c0ca14dd3db9ba23414069d1be2b97ef3e1d364f411efc44c1e414dd3d8e369a41cc405bc05474a34003bca741e62368c0d314dd3dcd383841084bd8bf2d97ef3e673857414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b41437d2bc035efe83e91133a41fb0ae6bfe8de2540843148415fbd5dc0e414dd3de2eb6541405ba93d5474a34092df9a41a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c41b4c8cac180c295bfb3c2c2414c379d41ac470d41e7d6c241e4d074c000000000fc124841055d2641000020411dd2d541b2d8514086ebb1be4fb79c417240064148e19440769cc54101cea440f61203ba04c5ab41e409c1400000003ffdd3b241c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1e74213c0df14dd3d355b50c0be7bffbf383c753f001935c0224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bff84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebeec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0b96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3f79d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193ea507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c06f4eb43f4f6b963f511189c00189d23fe27a02400fb971c08b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff6288041d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f413d4de6c049a912402a5a9e41cd1de0c05989244075629f413c60d3c09b61194024299d4135bccec0ab412b40929d9e418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e41fc5798c04846f33ff00c9b41438692c034830b40f1359c4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc9904163d8ecc01c36793f80029c416a2096c07c771d40a8e89f41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f413998f1c04846f33f3f379f41b791eac034830b40efd89f41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c4198c298bf72d7aa3f1629534178d389bfd2bcbb3ffa065541409899bfa63ca43f350c53414fd56bbf6c24f73fff825741982773c0208edd3f82772941c6dd59c04a0c2640f8c92f4195a15abf72d7aa3f5297584153c33cbfd2bcbb3f36755a41ec4c5cbfa63ca43f707a5841bbf114bf6c24f73f3af15c4198c298bf358003401629534178d389bfe5f20b40fa065541409899bfce320040350c53414fd56bbfb1a62940ff825741ef4c5cbfce320040707a5841b9f114bfb0a6294024f05c4105a956bf96941a3f5ed67141b689e1be25fc0d409f317a41bdbc10c086941a3f402d89416687eebf21fc0d40e05a8d413240f3bf96941a3f050d85411e4ec0bf25fc0d40a53a894120cf15c086ce063ffc1d68410000adb8ef4c3f40e6168e41edbd03bf74711b3f8c055e4157bfcbbe343c3d3f70e35f41206905bfdc3b0e3fabe85d41bb3778beb4059a3f755f624178bfc4bf358003407aa94d4158d0b5bfe5f20b405e874f412295c5bfce3200409a8c4d4189e7a1bfb1a62940640352413c6905bfce320040aae85d412b3878beb1a62940745f6241edbd03bf358003408c055e4157bfcbbee5f20b4070e35f41bff754c0208edd3f4b013141ebad3bc04a0c2640c1533741469899bfdc3b0e3f360c53415bd56bbfb4059a3f0083574198c298bf74711b3f1629534178d389bf343c3d3ffa0655412295c5bfa63ca43f9a8c4d4189e7a1bf6c24f73f6403524178bfc4bf72d7aa3f7aa94d4158d0b5bfd2bcbb3f5e874f4195a15abf74711b3f5297584153c33cbf343c3d3f36755a41ec4c5cbfdc3b0e3f707a5841bbf114bfb4059a3f3af15c41edbd03bf72d7aa3f8c055e4157bfcbbed2bcbb3f70e35f41206905bfa63ca43fabe85d41bb3778be6c24f73f755f62410a6cf4be96941a3fde956941da8ea2bd25fc0d401ff1714178bfc4bf74711b3f7aa94d4158d0b5bf343c3d3f5e874f412295c5bfdc3b0e3f9a8c4d4189e7a1bfb4059a3f6403524115000000540000003d000000520000002f000000590000001d000000040000001f0000001c000000350000003e000000530000000800000022000000240000002e0000002d0000003900000033000000270000004d0000002b000000060000003000000005000000200000000f0000005500000050000000510000001e0000001900000043000000490000000c000000320000004c0000002a0000000e000000410000002c00000038000000370000004600000031000000340000003a000000420000004b0000005800000017000000160000001b0000001a000000230000000700000018000000020000000300000021000000120000002800000029000000360000003f000000400000004400000045000000470000003c0000003b000000480000004a0000004e0000004f00000056000000570000005b0000005a0000000d000000140000001300000001000000000000000a0000000b0000001000000011000000090000002500000026000000a00c0000000000000000000000000000000020c20000a0c10000a0c10000a0410000a04100002042a7b20000201c0000601e00001b000000f01d000001e020000000a03e2f00010050000000f0060000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000055550000aaaa0040090000000c0000004f000000030000000000000000000000ff3f000055550000aaaa008015000000070000000000000000000000000000000000000000005555ffff0000ab2a00601c0000000600000078000000040000000000000000000000ff5f5555ffff0000ab2a008022000000080000004200000003000000000000000000000000005555ffffaa2a5555007e2a000000060000005400000009000000000000000000000000005555aaaa5555008000803000000007000000370000000d000000000000000000000000005555aaaaff7faaaa0080370000000a0000002300000007000000000000000000000000000000aaaaaaaaffff0080410000000a0000003c0000000d00000000000000000000000000aaaaffff5555ffff00804b0000000f00000070000000040000000000000000000000ff7f00000040000055d500c05a000000070000006d000000050000000000000000000000ff7fff3fffff0000561500c0610000000100000070000000050000000000000000000000ff7fff3f564daa1600bc00b262000000070000004e0000000a0000000000000000000000ff7faa4e0080aa16555500b269000000070000006d000000040000000000000000000000ffb3ff3fffff5515555500c0700000000a00000000000000000000000000000000000000ffbf0000ffff00005555ffff7a0000000400000066000000050000000000000000000000ff7fff7faaaaaa16003000a07e0000000500000065000000060000000000000000000000ff81ff7faaaaaa16ab2a00b28300000009000000430000000c0000000000000000000000ff7fff7faaaaaa2a555500b28c000000060000002e0000000f0000000000000000000000ff7faaaa00ccaa16009000b2920000000300000057000000080000000000000000000000ff7f54cdffffaa16aaaa00b2950000000200000032000000090000000000000000000000ff81aaaa55b1aa32ab4e00a097000000070000006a000000060000000000000000000000ff7faa4e55555555aaaa00a09e000000040000006b000000060000000000000000000000ff8baa4e55555555559500b2a20000000500000051000000020000000000000000000000ffb3ff3f55555555aaaa00c0a70000000700000000000000000000000000000000000000ffbf000055555555aaaaffffae0000000400000051000000020000000000000000000000ff9faa4e55555495aaaa00b2b2000000040000000d000000070000000000000000000000ff7f5555005c555555950086b60000000c00000004000000220000000000000000000000ff7f555555955555aaaa00b2c20000000c00000075000000040000000000000000000000ffb3555555d55555aaaaffffce00000005000000490000000a0000000000000000000000ff7f5495aaaa5555008000a0d30000000200000035000000060000000000000000000000ff7faaa6aaaaaa56556100a0d50000000800000061000000060000000000000000000000ff9f5495aaaa5555aaaa00b2dd0000000600000000000000320000000000000000000000ff815495aaaaff7faaaa00a0e30000000700000023000000130000000000000000000000ff81aa4eaaaaaaaa00bc00b2ea0000000800000024000000050000000000000000000000ff7fff3faaaa54bd55d500a0f20000000700000072000000030000000000000000000000ff9fff3f5555aaaa55d500c0f90000000c00000024000000010000000000000000000000ffbf0000aaaaaaaaffffffff050100000e00000000000000000000000000000000000000ff7f0000ffff54d5ffff00c013010000080000005d000000020000000000000000000000ff9f55555595aaaa55d500c01b010000060000005c000000030000000000000000000000ff9f5495aaaaaaaa00c000c021010000060000005c000000030000000000000000000000ff9f5495aaaa54b955d500c0270100000500000019000000140000000000000000000000ff81aaaa00ccaa6655b500b22c010000080000002e000000020000000000000000000000ffb354d5ffff5555aaaaffff34010000090000005a000000070000000000000000000000ff7faaaaaaeaaaaa55d500c03d010000020000005a000000070000000000000000000000ff8154cdaaeaaaaa00bc00b23f0100000b0000002e000000020000000000000000000000ffb3aaaaffffaaaaffffffff4a010000090000005d000000030000000000000000000000ff7fa9eaffffaaaa55d500c00000000000000060ff3f0100aaaa0000555500000000002055550200ff3f0000aa2a00000000002055550400ff3f00005555aa2a0000002055550500ff3f0000ff7f55550000002055550600ff3f0000aaaaff7f000000a0aaaa070055550000ff3f0000ffffff930000000055550000ff3f0000ffffff1300000000ff3f0000aaaa0000ffffff5300000000aaaa00005555000000000040ff3f0000aaaa0000555500000000002055550200ff5fff3faa2a00000000002055550300ff7fff5faa2a00000000002055550400ff7dff3f5555aa2a0000002055550500ff7fff3fff7f55550000002055550600ff7fff3faaaaff7f000000a0aaaa070055550000ff7fff3f00000060ff7f0900aa2a0000ff3f000000000060ff7f0900aaaaaa2aaa3e000000000060ff7f0a00aa1200005555ff3fffffff930000000055550000ff7fff3fffffff1300000000ff7fff3faaaa0000000000a0aa2a0400ffff5555ff5f000000000060ff5f0300aa2a0000ffff55550000000055550000ff3f0000aa2a00000000000055550100ff5fff3faa2a0000ffffff9300000000ffff5555ff5f0000ffffff33ffff0000ff5f0000aa2a0000ffffff5300000000aa2a0000ffff555500000040ff5f0200aa2a0000ffff5555000000a0aa2a0400ffff5555ff7dff5f0000000055550100ff7fff5faa2a000000000060ff7f0a00aa120000ffff5555ffffff9300000000ffff5555ff7fff5fffffff33ffff0000ff7fff5faa2a000000000080aa2a0200ffff5555ff5f000000000080aa2a0300ffff5555ff7dff5f0000000055550000ff3f00005555aa2a0000000055550100ff7dff3f5555aa2a000000a055550500aaaa5555ff7d0000000000a055550800ffffaaaaff7d0000ffffff33ffff0000ff7d00005555aa2affffff53000000005555aa2affff5555000000a0ff7f0600aaaa5555ff7f00000000000055550000ff3f0000ff7f55550000000055550100ff7fff3fff7f555500000020aaaa0800ff7f0000ff7f55550000008055550400aaaa5555ff7d0000ffffff5300000000ff7f5555aaaa555500000080ff7f0500aaaa5555ff7f00000000000055550000ff3f0000aaaaff7f0000000055550100ff7fff3faaaaff7f000000a0aaaa0700aaaa5555ff7f000000000020aaaa0800ff7f0000aaaaff7f00000060ff7f1b00ffa7aaa25495aa8affffff5300000000aaaaff7faaaa555500000080aaaa000055550000ff3f000000000080aaaa010055550000ff7fff3f00000080aaaa0600aaaa5555ff7f000000000020aaaa0800ff7f0000ffffaaaa00000060ff7f090054d5aaaaff3f000000000060ff7f220054d5a9beaaaaff3f00000060ff7f2500ffff54d5aaaa0000ffffff1300000000ff7f0000ffffaaaaffffffb3ffff0000aaaa0000ff7f0000ffffff5300000000ffffaaaaaaaa000000000000aaaa0500ff7f0000ff7f555500000000aaaa0600ff7f0000aaaaff7f00000000aaaa0700ff7f0000ffffaaaa0000008055550400ffffaaaaff7d000000000060ff7f2b0054d5a9bea9eaaaaa00000060ff7f2e0054d5a9beffffa9ea00000060ff7f2500ffff54d5ffffaaaaffffffb3ffff0000ffffaaaaff7f0000ffffff33ffff0000ff7f0000ffff5555ffffff5300000000ffff5555ffffaaaa00000060ffbf0e0055550000ff3f000000000020ff3f0a00ffbfff7f5515000000000020ff3f0b00ffb1ff7fffbbaa1600000020ff3f0d00ffbfffb35555551500000060ffbf1800aaaa5555ff3f000000000020ff3f1700ffbfffb3aaaa555500000060ffbf240054d5aaaaff3f0000000000a054d52500ff3f0000ffbfff7f00000020ff3f2200ff9fff7f54d554bd00000020ff3f2300ffbfff9f54d5aaaa00000040ff7f0100aa2a0000ff3f000000000040ff7f0100aaaaaa2aaa3e000000000040ff7f070054d5aaaaff3f0000ffffff9300000000ff3f0000ffbfff7fffffff1300000000ffbfff7f54d5000000000000ff3f0900ffbfff7f5515000000000060ffbf0e0055150000ffffff3f000000a055150d00ffffff3fffbfffb900000040ff7f0100aa1200005555ff3f00000040ff7f0300aa120000ffff5555ffffff9300000000ffffff3fffbfff7fffffff33ffff0000ffbfff7f5515000000000000ff3f0900ffb1ff7fffbbaa1600000020ff7f0f00ff9fff7f552daa1600000020ff7f1000ffb1ff9faa2aaa1600000020ff7f1100ffb1ff7f5555aa2a000000a0555515005555aa4eff89ff7f000000a0555516005555aa4effb1ff8b000000a055551a00ff5b5555ff85ff7f000000a055551b00ff7f5555ffb1ff7f00000000ff3f0900ffbfffb3555555150000008055150a00ffffff3fffbfffb900000060ffbf0e0055555515ffffff3f000000a0555517005555ff3fffbfffb3000000a055551c0054d55555ffbfffb3000000a055552a00ffff54d5ffbfffb3ffffff33ffff0000ffbfffb35555551500000040ffbf090055550000ff3f000000000040ffbf0a0055150000ffffff3f00000040ffbf0d0055555515ffffff3f000000a05555180055550000ffffffbf000000a055551c0054d55555ffffffbf000000a055552a00ffff54d5ffffffbfffffff9300000000ffff0000ffffffbfffffff1300000000ffffffbf55550000ffffff33ffff0000ffffffbf55550000ffffff73ffff000055550000ffff000000000000ff7f0c00ff9fff7f552daa1600000060ff9f1000aa2aaa16aaaaff7f00000060ff9f1100ff2faa2aaaaaff7f00000020aaaa1200ff9fff7fff2faa16000000a0aa2a110054995491ff9fff81000000a0aa2a1100aaaaff7fffb1ff9f00000040ff9f0f00aa2aaa16aaaaff7f00000000ff7f0c00ffb1ff9faa2aaa1600000020aaaa1200ffb1ff9faa2aaa1600000000ff7f0c00ffb1ff7f5555aa2a00000080aa2a100054995491ff9fff8100000080aa2a1000aaaaff7fffb1ff9f00000040ff9f0f00ff2faa2aaaaaff7f00000020aaaa1400ff9fff81aa4eaa3200000020aaaa1200ffb1ff9f5555aa2a000000a055551b005495ff7fffb1ff7f000000a055551d00ffa75495ff9fff7f000000a055551f00aaaa5495ffb1ff9f00000040ff9f1400aa4eaa3254b1aaaa00000000aaaa0f00ff9fff7fff2faa1600000000aaaa1000ffb1ff9faa2aaa1600000000aaaa1100ffb1ff9f5555aa2a00000000aaaa1e00ff9fff7f5461aa5600000000aaaa1f00ffb1ff9f54615555000000a0aaaa2c00a9ea54cdffb1ff81000000a0aaaa2e00ffffa9eaffb1ff81ffffff33ffff0000ffb1ff7faaaaaa1600000060ff9f1200aa4eaa3254b1aaaa00000000aaaa1100ff9fff81aa4eaa3200000080549516005555aa4eff9fff8b00000060ff9f1900aaaa54955555aa4e0000002055551a00ff85ff7fff5f55550000002055551a00ff85ff815495ff5f0000002055551b00ff9fff81aaaa5495000000a0aaaa21005555aa4eff9fff810000008055550c005555aa4eff89ff7f000000a0549515005555aa4eff9fff8b000000a0549519005555aa4effb1ff9f0000002055551b00ffb1ff8b549555550000008055550c005555aa4effb1ff8b00000000ff3f0900ffbfffb3aaaa555500000060ffbf1800aaaa55555555ff3f0000002055551c00ffbfffb3aaaa5555000000a0aaaa23005555ff3fffbfffb30000008055550d005555ff3fffbfffb300000040ffbf0900aaaa5555ff3f000000000040ffbf1700aaaa55555555ff3f0000002055551c00ffffffbfaaaa5555000000a0aaaa240055550000ffffffbf0000008055550e0055550000ffffffbfffffff1300000000ffffffbfaaaa5555ffffff73ffff0000aaaa55555555000000000040ff9f1500aaaa54955555aa4e00000080549516005555aa4effb1ff9f0000002055551b00ffb1ff9faaaa5495000000a0aaaa21005555aa4effb1ff9f000000a054951b00ff5b5555ff85ff810000000055551500ff85ff7fff5f55550000000055551500ff85ff815495ff5f0000008055550c00ff5b5555ff85ff7f0000002054951d00ff9fff7fff7b55550000002054951f00ffb1ff9faaaa55550000008054951a00ff5b5555ff85ff810000002054952000ff9fff81ffa7ff7f0000000055551500ff9fff81aaaa54950000000055551600ffb1ff8b549555550000000055551900ffb1ff9faaaa5495000000a0aaaa2100aa825555ff9fff81000000a0aaaa210054955555ffb1ff9f0000008055550c00ff7f5555ffb1ff7f00000080555511005495ff7fffb1ff7f00000040ff7f0600ffa7aaa25495aa8a0000000055551700ffbfffb3aaaa55550000000055551800ffffffbfaaaa5555000000a0aaaa260054955555ffbfffb3000000a0aaaa2700aaaa5495ffbfffb3000000a0aaaa2400aaaa5555ffffffbf0000002054d52a00ffffffb3aaaa5555000000a0aaaa2d0054b5aaaaffbfffb3000000a0aaaa2d0054d5aaaaffffffbf000000a0aaaa2b0054d554b9ffbfffb30000008055550d0054d55555ffbfffb30000008055550e0054d55555ffffffbfffffff73ffff0000aaaa555554d555550000000054951b00ff9fff7fff7b555500000060ff9f1f00ff7f5555aaaa5495000000a0ff7f2000aaaaaa9aff9fff8100000020aaaa2900ff9fff81ff7faa660000008055551100ffa75495ff9fff7f00000060ff9f1f005461aa56aaaaaaa600000020aaaa1200ff9fff7f5461aa560000000054951b00ffb1ff9faaaa555500000040ff9f1d00ff7f5555aaaa549500000040ff9f1e005461aa56aaaaaaa600000040ff9f2000aaaaff7faaaa5495000000a0aaaa2100aaaa5495ffb1ff9f00000020aaaa1200ffb1ff9f5461555500000020aaaa2900ffb1ff9faaaaaa660000008055551100aaaa5495ffb1ff9f0000000054951b00ff9fff81ffa7ff7f00000080ff7f1d00aaaaaa9aff9fff8100000060ff9f1f00aaaaff7faaaa5495000000a0aaaa2100aaaa5495ff9fff8100000020aaaa2900ff9fff81ff8fff7f00000020aaaa2900ff9fff81aaaaff9300000080aaaa15005555aa4eff9fff8100000080aaaa19005555aa4effb1ff9f00000080aaaa1b00aa825555ff9fff8100000080aaaa1b0054955555ffb1ff9f00000080aaaa1f00aaaa5495ffb1ff9f00000080aaaa2000aaaa5495ff9fff8100000020aaaa2900ffb1ff8154b5aaaa00000000ff3f0900ff9fff7f54d554bd00000060ff9f230054d554bd5555ff3f000000a054d52500aaaaff3fff9fff7f00000060ff9f260054d554bd5495555500000060ff9f2700ffbf54bdaaa2549500000060ff9f280054d554bdaaaa549500000020aaaa2b00ff9fff7f54d554bd00000040ff7f070054d5a9beaaaaff3f00000000ff3f0900ffbfff9f54d5aaaa00000060ffbf240054d5aaaa5555ff3f00000040ff9f220054d554bd5555ff3f000000a054d525005555ff3fffbfff9f0000002055552600ffbfffb354bdaaaa0000002055552600ffbfff9f54d554bd00000080aaaa17005555ff3fffbfffb300000040ffbf090054d5aaaaff3f000000000040ffbf230054d5aaaa5555ff3f00000040ffbf2500ffff54d5aaaa000000000040ffbf260054d5aaaa5495555500000040ffbf2700ffbfaaaaaaaa549500000040ffbf280054d554b9aaaa549500000080aaaa180055550000ffffffbf00000080aaaa1c00aaaa5555ffffffbf00000020aaaa2d00ffffffbfffffaaaaffffff1300000000ffffffbfffffaaaaffffffb3ffff0000aaaa0000ffffffbfffffff73ffff0000ffffaaaaaaaa000000000060ffbf2400ffff54d5aaaa00000000008054d50900ff3f0000ffbfff7f0000008054d52200aaaaff3fff9fff7f0000008054d523005555ff3fffbfff9f0000008054d5260054955555ffbfff9f0000008054d52800aaaa5495ffbfff9f00000060ffbf2d00ffff54d5ffffaaaa0000008054d52b00a9eaaaaaffbfff7f0000008054d52e00ffffa9eaffbfff7f00000040ff7f0700ffff54d5aaaa000000000040ff7f0800ffff54d5ffffaaaaffffff1300000000ffbfff7fffff54d5ffffffb3ffff0000ffff0000ffbfff7fffffff33ffff0000ffbfff7fffff54d500000060ffbf240054d5aaaa5495555500000040ff9f220054d554bd54955555000000a054d5250054955555ffbfff9f0000002054952700ffbfff9fffbfaaaa0000002054952800ffbfff9f54d5ffbf0000000055552300ffbfffb354bdaaaa0000000055552300ffbfff9f54d554bd00000080aaaa1c0054955555ffbfffb30000000054952600ffbfff9fffbfaaaa00000060ffbf2400ffbfaaaaaaaa549500000040ff9f2200ffbf54bdaaa25495000000a0ffbf2800ff9f5495ffbfff9f00000080aaaa1c00aaaa5495ffbfffb300000020aaaa2d00ffbfffb354b5aaaa00000040ff9f220054d554bdaaaa549500000060ffbf240054d554b9aaaa54950000000054952600ffbfff9f54d5ffbf00000080ffbf2700ff9f5495ffbfff9f000000a054d52500aaaa5495ffbfff9f00000020aaaa2b00ffbfff9f54d554b900000000aaaa1d00ff9fff81ff7faa6600000000aaaa1f00ffb1ff9faaaaaa6600000000aaaa2000ff9fff81ff8fff7f00000000aaaa2000ff9fff81aaaaff9300000000aaaa2100ffb1ff8154b5aaaa0000000054d51c00ffffffb3aaaa5555000000a0aaaa2b00a9ea54d5ffbfffb3000000a0aaaa2e00ffffa9eaffbfffb3000000a0aaaa2d00ffff54d5ffffffbf0000008055550d00ffff54d5ffbfffb30000008055550e00ffff54d5ffffffbfffffff33ffff0000ffffffb3aaaa5555ffffff73ffff0000aaaa5555ffff54d500000060ffbf2d0054d5aaaaa9eaaaaa000000a054d52500a9eaaaaaffbfff7f00000020a9ea2e00ff9fff7f54d554bd00000020a9ea2e00ffbfff9f54d5aaaa00000080aaaa1c0054d554b9ffbfffb300000080aaaa2a00a9ea54d5ffbfffb300000000aaaa2200ff9fff7f54d554bd00000000aaaa2800ffbfff9f54d554b900000040ff7f080054d5a9bea9eaaaaa00000020a9ea2e00ffb1ff81ffbbaaaa00000080aaaa1300a9ea54cdffb1ff8100000040ffbf2b0054d5aaaaa9eaaaaa00000040ffbf2e0054d5aaaaffffa9ea00000040ffbf2500ffff54d5ffffaaaa00000080aaaa1c0054b5aaaaffbfffb300000080aaaa1c0054d5aaaaffffffbf00000080aaaa2a00ffff54d5ffffffbf00000000aaaa2400ffffffbfffffaaaa00000000aaaa2700ffbfffb354b5aaaaffffffb3ffff0000ffffaaaaffffffbfffffff33ffff0000ffffffbfffffaaaaffffff73ffff0000ffffaaaaffffaaaa00000000a9ea2c00ffb1ff81ffbbaaaa00000000a9ea2b00ff9fff7f54d554bd00000000a9ea2b00ffbfff9f54d5aaaa00000060ffbf2d0054d5aaaaffffa9ea000000a054d52500ffffa9eaffbfff7f00000080aaaa1300ffffa9eaffb1ff8100000080aaaa2a00ffffa9eaffbfffb300000040ff7f080054d5a9beffffa9eaffffff33ffff0000ffbfff7f54d5aaaa29407ae83773415dae7b15f8ff8308b77b3def4d4d2db0ebc9519d151c684c011c3b0d9d9d1f1cd4dd225cad8e6c556b0ff1f4cd35f7d4f91c3555f37edfd5d4e8a8d2e977294f3f73433ffc1cb5724fff1111377fb7be0efc00036b4db7e61d6d3df3cfafbf2ff7f42bfe33c3f4d150f3fe43ed8486f33ec80c74333f70d7dcd29efdf00cf33ff3c0f20f31334cf374378e12bd74ed78cd8233333baffb0fc87877f72e7faff3afabffb02f37dffd0f31f3334f2ff3e2b4f2eb77bfa403abaffe38cfc2003b3333f0c3f3ee7ffefff0b3f338fc3ddffdcf0f0fee3f33f3a23effbf7ca7cc0ef30cfb3eabaff3befe38836e2a7f7efbbcbfafffff3df3f10f3fff3c73e6befe77aaeeefbf3ff30ef3ccc2b0ef3b33f0f6ba7fffffccdcffcff93f3f7f73fff87f67ae0fcffbfefeb3fafa33eb0f33efceccffbffdccff33ffffc7f6ccfffff00ef3ccfbb0bff3ccffbfff3fff8ffcffefefffbf3ff3fffffffbf0bcf3ffff030000b0004501cf014102a40200000e19242d35404e5c67727e8b939ca70d161d28323a4550575d657077828d090f19222d374149525860666e777e0812191d242930393f48505762686c0710151c252e31363b41484e565d61060c13171a1d20212600000000000000000000000000000000000000000000a0c1000000000000a0c100000000000020c1000020c10000a0410000000000002041000000000000a0410000a0410000000000000000000020c1000000000000a0c1000000000000f0c10000000000002041000020410000a0c10000a0c100000000084080707008120e474b3000040a060c8744e2a84a898442912895260ac6243159b9160c4624329924129b8428a55a2d188b06e30169441a92894422696c369b0d88b3f9844c92d444b5622c1a0b06a3d168301a918644d29834248d4963b1d974361c0e47340a995092c944c2e1a458ac0583d15830168cc6e3016944229386a43169482692c6a4b1b82c169b4d67c3f970422189242599a4241cce8493e24c3829d68ac55a30168cc72312914c248d494342914826128be5b2b8541697cd66111299422193242599a426138924c5e14826921487c359ad58ab156bb562ad180bc6e3f1904c2412094522992c2a0bcbc2b2b0582e8b4ae6a2d9743aa1c562340a894226d3296432492429c92435994852928964929a4c38130e6bb562ad582bd66ac178401e9047e41199482812896452a9582c8bcac2b2b02c1699c546d3598416a29028345a8444a29029740a994226d3292549a524929444929a482429892425994826a9c924c562ad58ab55e4219950281209454291542c0b4ba562b164349b8ec7d35984428bd062310a8d42a153c81432992429492a2549492429492a9592a45212494a9292485213c9243549ad5a2b166bb562ad1e91474422a1502a96856591d1683c1dcf22145a84428bd168340a8942a89029743a9d509294242599485292544a9292482429494a924a4926a9c964d24ab55a2cd68a22a1482812cd46e3598416a1c528343aa142a8d029740aa14ea794242549492429492a2549a5249294642249492493c9a4d56aad5aab158b22a168361dcf22140a9d4ea8d3097542a5242989242549a52429494a2249495292542a3569ad5a2b8a64113aa14228942425494926a8942425494924a9130a0000000000000000000000000000 + m_PVSData: 120000d6304bfb27201800000000204200000000000020c2000020c2000020c200002042000020420000204220000000500100000000000001000000600100005d000000300200000000000000000000f00a0000a7000000a00100003600000000000000000000000000000000000000000000000000000000000000020000000002000000000000900100000100000001000000010000007001000080010000700c0000000000000000000000000000000000000000000000000000542034302e3020534f2031302e3020534820302e32353020424620352046203020435320302e30202d20332e332e3232204620302030204f472030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f0000000000000000000000000100000000000000000000000000000000000040000000000000000000000000000000001200000000000000000000008059099790191d010aa21fc49430099680099cf009a10008d941088690088b0009815008871011a1c00d93200a8900088640098b000982500893200a8b000994c00d8640089300088640098290088b3011000000000000000000000000000000000000000000000000000000ffff0000ffffffff0000000000000000ff80ff7d0099ffb100cd00990000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc15fbd5dc0e414dd3de2eb6541405ba93d5474a34092df9a411f85adc1503e4abf35338fc11f85adc1375c1341cfccd8414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b41fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fb4c8cac180c295bfb3c2c2414c379d41ac470d41e7d6c241c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc441b1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040a85d99bf000000008709e03faf29014100002041afc16e411efc44c1e414dd3d8e369a41cc405bc05474a34003bca741e4d074c000000000fc124841055d2641000020411dd2d541e62368c0d314dd3dcd383841084bd8bf2d97ef3e67385741437d2bc035efe83e91133a41fb0ae6bfe8de254084314841a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c41ca2f92c191c2753ed6a3b04074da8cc10ad7233feb5178417cb8a0c061affb32c66de83f5a54ff40a970dd3d982cd541a635a1c0e014dd3da082144112ba973d5474a340ed4c6641ae1a48c0ca14dd3db9ba23414069d1be2b97ef3e1d364f41d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040ec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0e74213c0df14dd3d355b50c0be7bffbf383c753f001935c0224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bf79d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193eca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0b96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3ff84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebe50c8733f10bedc3d9442ad40a5cd4440f872a34037c60241b2d8514086ebb1be4fb79c417240064148e19440769cc541ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff6288041409899bfa63ca43f350c53414fd56bbf6c24f73fff82574198c298bf72d7aa3f1629534178d389bfd2bcbb3ffa06554195a15abf74711b3f5297584153c33cbf343c3d3f36755a41ec4c5cbfdc3b0e3f707a5841bbf114bfb4059a3f3af15c4195a15abf72d7aa3f5297584153c33cbfd2bcbb3f36755a41ec4c5cbfa63ca43f707a5841bbf114bf6c24f73f3af15c412295c5bfce3200409a8c4d4189e7a1bfb1a629406403524178bfc4bf358003407aa94d4158d0b5bfe5f20b405e874f41ef4c5cbfce320040707a5841b9f114bfb0a6294024f05c413c6905bfce320040aae85d412b3878beb1a62940745f6241edbd03bf358003408c055e4157bfcbbee5f20b4070e35f410a6cf4be96941a3fde956941da8ea2bd25fc0d401ff1714105a956bf96941a3f5ed67141b689e1be25fc0d409f317a41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f413c60d3c09b61194024299d4135bccec0ab412b40929d9e41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d41bff754c0208edd3f4b013141ebad3bc04a0c2640c153374120cf15c086ce063ffc1d68410000adb8ef4c3f40e6168e4178bfc4bf74711b3f7aa94d4158d0b5bf343c3d3f5e874f412295c5bfdc3b0e3f9a8c4d4189e7a1bfb4059a3f640352412295c5bfa63ca43f9a8c4d4189e7a1bf6c24f73f6403524178bfc4bf72d7aa3f7aa94d4158d0b5bfd2bcbb3f5e874f41edbd03bf74711b3f8c055e4157bfcbbe343c3d3f70e35f41206905bfdc3b0e3fabe85d41bb3778beb4059a3f755f6241206905bfa63ca43fabe85d41bb3778be6c24f73f755f6241edbd03bf72d7aa3f8c055e4157bfcbbed2bcbb3f70e35f41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f413d4de6c049a912402a5a9e41cd1de0c05989244075629f41d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e41fc5798c04846f33ff00c9b41438692c034830b40f1359c413240f3bf96941a3f050d85411e4ec0bf25fc0d40a53a8941982773c0208edd3f82772941c6dd59c04a0c2640f8c92f41469899bfdc3b0e3f360c53415bd56bbfb4059a3f0083574198c298bf74711b3f1629534178d389bf343c3d3ffa065541409899bfce320040350c53414fd56bbfb1a62940ff82574198c298bf358003401629534178d389bfe5f20b40fa065541e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc9904163d8ecc01c36793f80029c416a2096c07c771d40a8e89f413998f1c04846f33f3f379f41b791eac034830b40efd89f4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c41bdbc10c086941a3f402d89416687eebf21fc0d40e05a8d418b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0a507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c06f4eb43f4f6b963f511189c00189d23fe27a02400fb971c001cea440f61203ba04c5ab41e409c140d1b80840fdd3b2410000000000000000100000003b00000042000000450000003a00000041000000590000005a0000004f0000001200000003000000170000001e000000260000002d000000480000004a000000400000004e0000000b00000015000000180000001f000000110000000200000005000000040000001b00000028000000360000003c00000050000000530000000000000056000000130000000c0000001c0000000700000006000000190000001a00000023000000240000000f0000000e000000160000002200000021000000140000001d0000000900000008000000250000000a00000001000000270000002a000000290000002c0000002b0000002e0000002f0000003000000043000000440000003f0000003e000000340000003500000033000000320000003d000000310000003800000037000000460000005c000000580000005700000055000000540000004c0000004b0000005b0000004d0000004700000052000000510000002000000049000000390000000d000000000000000000000000000000800c0000000000000000000000000000000020c2000020c2000020c200002042000020420000204266250000900a0000200b000007000000000b000001a00b000000a03e1200020050000000e002000000000000000000000000000000000000000000000f000000000000001300000000000000000000000000000000800000ffff00800f00000006000000000000000000000000000000000000000000ff7fffff00000040008015000000080000002c0000000400000000000000000000000000ff7fffffff3f008000801d0000000b00000000000000000000000000000000000000ff7f0000ffff00000040ffff280000000a0000002f000000040000000000000000000000ff7f00000040ff3f00c0ffff320000000200000000000000590000000000000000000000ff7fff3a0099ff5000cd009934000000070000001f000000030000000000000000000000ff7fff3f0080ff3f006000c03b0000000500000008000000010000000000000000000000ff99ff3f0080ff5f008000c0400000000700000000000000000000000000000000000000ffbfff3f0080ff3f0080ffff47000000090000002e000000040000000000000000000000ff7fff7f00c0ff3f0080ffff500000000100000008000000100000000000000000000000ff7fff7f0099ff5000ac009951000000020000001c000000080000000000000000000000ff7fff9900c0ff5000c00099530000000a0000001f000000030000000000000000000000ff7fffbfffffff3fffffffff5d00000006000000000000000000000000000000000000000000ff7fffffff7fffff00406300000007000000110000000e0000000000000000000000ff3fff7fffffff7fffff00806a0000000700000033000000040000000000000000000000ff99ff3f00c0ff7f00c0ffff710000000a00000020000000080000000000000000000000ff7f000000c0ffbfffffffff7b0000000000000025000000080000000100000000000000ff80ff7d0099ffb100cd0099000000000000000000000020ff7f0100ff7f0000ff3f000000000020ff7f0200ff7f0000ff7fff3f00000060ff7f0300ff3f0000ff7f000000000060ff7f0400ffbfff3fff2f000000000060ff7f0400ff4dff3fff3fff2f00000060ff7f0600ff4dff3fff7fff3f00000020ff7f0d00ff3f0000ffffff7f00000020ff7f0e00ff7fff3fffffff7f00000060ff7f0500ffbdffb9ff6fff6700000060ff7f1000ffffffbfff3f000000000060ff7f1000ffffffceff7fff3fffffff9300000000ff7f0000ff7f0000ffffff1300000000ff7f0000ffff0000ffffffb3ffff0000ff7f0000ff7f0000ffffff5300000000ffff0000ff7f0000000000a0ff3f0200ffffff7fff7f000000000000ff7f0000ff7f0000ff3f000000000060ff7f0300ff3f0000ffffff7fffffff9300000000ffffff7fff7f0000ffffff33ffff0000ff7f0000ff3f0000ffffff5300000000ff3f0000ffffff7f00000080ff3f0100ffffff7fff7f000000000000ff7f0000ff7f0000ff7fff3f00000060ff7f0900ff4dff3fffbfff7f00000060ff7f0c00ff7fff3fffffffbf000000a0ff7f0d00ffffff7fff3f0000000000a0ff7f0e00ffffff7fff7fff3fffffff33ffff0000ff7f0000ff7fff3fffffff5300000000ff7fff3fffffff7f000000a0ff3f0400ff3f0000ffffff7f000000a0ff3f0600ff7fff3fffbfff7f000000a0ff3f0800ff7fff3fffffffbf000000a0ff3f0900ffbfff7fffffff7f000000a0ff3f0c00ffffffbfffffff7f00000040ff7f0000ff3f0000ff7f000000000040ff7f0100ff3f0000ffffff7fffffff9300000000ffff0000ffffff7fffffff1300000000ffffff7fff3f0000ffffff33ffff0000ffffff7fff3f0000ffffff73ffff0000ff3f0000ffff000000000080ff3f0300ff3f0000ffffff7f00000020ff3f0600ffbfff7fff5fff3f00000020ff3f0700ffbfff99ff7fff5f00000020ff3f0800ffffffbfff7fff3f00000040ff7f0000ffbfff3fff2f000000000040ff7f0000ff4dff3fff3fff2f00000020ff3f0f00ffffff99ffbfff7f000000a0ffbf1000ff3f0000ffffff7fffffff1300000000ffffff7fffbfff3fffffff73ffff0000ffbfff3fff3f000000000020ff7f0a00ff98ff7fff88ff5000000040ff7f0000ffbdffb9ff6fff6700000080ff3f0300ff7fff3fffbfff7f00000000ff3f0400ffbfff7fff5fff3f000000a0ff5f0700ff7fff3fffbfff9900000060ffbf0800ff5fff3fff7fff3f00000020ff7f0900ff8fff7fff4fff3f00000020ff7f0900ffbfff8fff5fff3f00000040ff7f0000ff4dff3fff7fff3f00000080ff5f0600ff7fff3fffbfff9900000000ff3f0400ffbfff99ff7fff5f00000060ffbf0800ff7fff5fff7fff3f00000020ff7f0900ffbfff99ff7fff5f000000a0ff7f0f00ff7fff3fffbfff9900000000ff3f0400ffffffbfff7fff3f00000080ff3f0300ff7fff3fffffffbf00000040ffbf0600ff5fff3fff7fff3f00000040ffbf0700ff7fff5fff7fff3f00000020ff7f0900ffffffbfff7fff3f000000a0ff7f0f00ff7fff3fffffffbfffffff73ffff0000ff7fff3fff7fff3f00000080ff3f0300ffbfff7fffffff7f00000020ffbf0c00ffffff7fff7fff3f00000000ff7f0600ff8fff7fff4fff3f00000000ff7f0600ffbfff8fff5fff3f00000000ff7f0700ffbfff99ff7fff5f00000000ff7f0800ffffffbfff7fff3f00000040ff7f0200ff4dff3fffbfff7f000000a0ff7f0f00ffbfff7fffffff99ffffff73ffff0000ff7fff3fffbfff7f00000000ff7f0500ff98ff7fff88ff5000000020ffbf0c00ff98ff7fffbfff50000000a0ffbf1000ffbfff99ff98ff8000000080ff3f0300ffffffbfffffff7f00000000ffbf0900ffffff7fff7fff3f00000000ffbf0b00ff98ff7fffbfff5000000040ff7f0200ff7fff3fffffffbf00000000ffbf0f00ffffff99ffbfff7f00000000ffbf1000ffffff7fffffffbf00000040ff7f0e00ffffff7fffffffbfffffffb3ffff0000ffffffbfffffff7fffffff33ffff0000ffffff7fffffff3fffffff73ffff0000ffffff3fffffffbf00000060ff3f0e00ffffff7fffffff7f00000000ff7f0000ff3f0000ffffff7f00000080ff7f0200ffffff7fff3f0000ffffffb3ffff0000ffffff7fff3f0000ffffff33ffff0000ff3f0000ffffff7fffffff5300000000ffffff7fffffff7f00000040ff3f0d00ffffff7fffffff7f00000000ff7f0000ff7fff3fffffff7f00000060ff7f0c00ffffff7fffffffbf00000060ff7f1000ffffffceffbfff7f00000080ff7f0200ffffff7fff7fff3fffffffb3ffff0000ffffff7fff7fff3fffffff33ffff0000ff7fff3fffffff7f00000000ff3f0400ffffff99ffbfff7f000000a0ffbf1000ffbfff3fffffff9900000020ffbf0c00ffffff99ffbfff7f00000080ff7f0700ff7fff3fffbfff9900000080ff7f0800ff7fff3fffffffbf00000080ff7f0900ffbfff7fffffff99ffffff73ffff0000ffbfff7fffbfff3f00000080ffbf0400ff3f0000ffffff7f00000080ffbf0f00ffbfff3fffffff9900000080ffbf0b00ffbfff99ff98ff8000000020ffbf0c00ffffff7fffffffbf00000040ff7f0000ffffffbfff3f000000000040ff7f0000ffffffceff7fff3f00000040ff7f0e00ffffffceffbfff7fffffff1300000000ffffff7fffffffbfffffffb3ffff0000ffbf0000ffffff7fffffff73ffff0000ffffffbfffbf000016c0eae6ff8dc7f770ffb633f3ba33f0bafac82acfe800fb3acfb02ac89caaf382af0fb3f69eebf8bacffcafaa8eceb0ffccffeff030f3dfbc3fff8fefaf3ffcfc0f33effdffffd88fff3c00880000000d131b232f38434e58616874777e83060a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100843313490c23405c3344ef143ffff17ffffff8512154554284514154aa1148a52288512155111298552444551445151145111154aa1148a52144511155111294aa1144551284551444aa1144554448a52144aa1144a11298552284a51144551288552288552284511155111154504000000000000000000000000000000 m_Scenes: - indexRenderers: 0 - sizeRenderers: 92 + sizeRenderers: 93 indexPortals: 0 sizePortals: 0 scene: 234ac6652f2be3943b8974a3fcbaba1f m_StaticRenderers: - - targetObject: 1466060218924807064 - targetPrefab: 1329794381 - - targetObject: 2751096909771140069 - targetPrefab: 1329794381 - targetObject: -7511558181221131132 - targetPrefab: 859579629 + targetPrefab: 705210510 - targetObject: -7511558181221131132 - targetPrefab: 366681287 - - targetObject: -7511558181221131132 - targetPrefab: 732678856 - - targetObject: -7511558181221131132 - targetPrefab: 139770782 - - targetObject: 4351601775851787701 - targetPrefab: 1768602428 - - targetObject: -7511558181221131132 - targetPrefab: 580345162 - - targetObject: -7511558181221131132 - targetPrefab: 1538206739 - - targetObject: -7511558181221131132 - targetPrefab: 383052033 - - targetObject: 1466060218924807064 - targetPrefab: 1018401441 - - targetObject: 2751096909771140069 - targetPrefab: 1018401441 - - targetObject: 5395762849033877597 - targetPrefab: 1984717371 - - targetObject: 5395762849033877597 - targetPrefab: 789002245204939195 - - targetObject: 4351601775851787701 - targetPrefab: 1720149715 - - targetObject: -7511558181221131132 - targetPrefab: 1617502299 - - targetObject: 1466060218924807064 - targetPrefab: 990092987 - - targetObject: 2751096909771140069 - targetPrefab: 990092987 - - targetObject: -7511558181221131132 - targetPrefab: 1188236244 - - targetObject: 1466060218924807064 - targetPrefab: 298932333 - - targetObject: 2751096909771140069 - targetPrefab: 298932333 - - targetObject: 2708739958050211779 - targetPrefab: 934922675 - - targetObject: 1968900501911500709 - targetPrefab: 937910637 - - targetObject: 940995387610717004 - targetPrefab: 937910637 - - targetObject: -7511558181221131132 - targetPrefab: 1299739207 - - targetObject: -7511558181221131132 - targetPrefab: 124273105 - - targetObject: 1968900501911500709 - targetPrefab: 4438766482650780789 - - targetObject: 940995387610717004 - targetPrefab: 4438766482650780789 - - targetObject: -7511558181221131132 - targetPrefab: 760334290 - - targetObject: 4351601775851787701 - targetPrefab: 1294116878969307432 + targetPrefab: 651901189 - targetObject: -7511558181221131132 targetPrefab: 2128415471 - targetObject: -7511558181221131132 - targetPrefab: 1976503209 + targetPrefab: 1629735784 + - targetObject: -7511558181221131132 + targetPrefab: 2134288141 + - targetObject: -7511558181221131132 + targetPrefab: 124273105 + - targetObject: 1466060218924807064 + targetPrefab: 4480648499976004208 + - targetObject: 2751096909771140069 + targetPrefab: 4480648499976004208 + - targetObject: 1968900501911500709 + targetPrefab: 937910637 + - targetObject: 940995387610717004 + targetPrefab: 937910637 + - targetObject: -7511558181221131132 + targetPrefab: 600479467 + - targetObject: 2708739958050211779 + targetPrefab: 1582278623 + - targetObject: 4351601775851787701 + targetPrefab: 1058862682 + - targetObject: 8810932174823803713 + targetPrefab: 1669769486 + - targetObject: 1466060218924807064 + targetPrefab: 1962599170 + - targetObject: 2751096909771140069 + targetPrefab: 1962599170 + - targetObject: 2708739958050211779 + targetPrefab: 934922675 - targetObject: 4351601775851787701 targetPrefab: 633609066 - targetObject: -7511558181221131132 - targetPrefab: 651901189 - - targetObject: 5444317254943555344 - targetPrefab: 4953860686005405531 - - targetObject: -7511558181221131132 - targetPrefab: 1279360754 - - targetObject: 8810932174823803713 - targetPrefab: 6146163849592780820 - - targetObject: 1466060218924807064 - targetPrefab: 1918973202 - - targetObject: 2751096909771140069 - targetPrefab: 1918973202 - - targetObject: -7511558181221131132 - targetPrefab: 1586593148 - - targetObject: 1466060218924807064 - targetPrefab: 4480648499976004208 - - targetObject: 2751096909771140069 - targetPrefab: 4480648499976004208 + targetPrefab: 1976503209 - targetObject: 4351601775851787701 - targetPrefab: 1058862682 + targetPrefab: 1720149715 + - targetObject: -7511558181221131132 + targetPrefab: 383052033 - targetObject: 2708739958050211779 targetPrefab: 1369540354 - targetObject: -7511558181221131132 - targetPrefab: 1584083749 - - targetObject: -7511558181221131132 - targetPrefab: 1123331143 - - targetObject: -7511558181221131132 - targetPrefab: 1427476862 - - targetObject: -7511558181221131132 - targetPrefab: 267965641 - - targetObject: 4351601775851787701 - targetPrefab: 91371483 - - targetObject: -7511558181221131132 - targetPrefab: 353645666 - - targetObject: 7006853779014437907 - targetPrefab: 1049045427 + targetPrefab: 1557255132 - targetObject: -7511558181221131132 targetPrefab: 749395700 - - targetObject: -7511558181221131132 - targetPrefab: 723913190 - targetObject: 4351601775851787701 - targetPrefab: 2024292607 - - targetObject: 7006853779014437907 - targetPrefab: 515796176453664510 + targetPrefab: 1768602428 + - targetObject: 1466060218924807064 + targetPrefab: 1018401441 + - targetObject: 2751096909771140069 + targetPrefab: 1018401441 + - targetObject: -7511558181221131132 + targetPrefab: 808969077 + - targetObject: 4351601775851787701 + targetPrefab: 832323181 + - targetObject: -7511558181221131132 + targetPrefab: 25650784 + - targetObject: -7511558181221131132 + targetPrefab: 1538206739 + - targetObject: -7511558181221131132 + targetPrefab: 1617502299 + - targetObject: -7511558181221131132 + targetPrefab: 577030235 + - targetObject: 1466060218924807064 + targetPrefab: 428989207 + - targetObject: 2751096909771140069 + targetPrefab: 428989207 + - targetObject: 1466060218924807064 + targetPrefab: 414428781 + - targetObject: 2751096909771140069 + targetPrefab: 414428781 + - targetObject: -7511558181221131132 + targetPrefab: 1873800957 + - targetObject: 8810932174823803713 + targetPrefab: 6146163849592780820 + - targetObject: -7511558181221131132 + targetPrefab: 1463594309 + - targetObject: -7511558181221131132 + targetPrefab: 1470660570 - targetObject: 1968900501911500709 targetPrefab: 172614115 - targetObject: 940995387610717004 targetPrefab: 172614115 - - targetObject: 2708739958050211779 - targetPrefab: 734635744 - targetObject: -7511558181221131132 - targetPrefab: 1873800957 + targetPrefab: 859579629 - targetObject: -7511558181221131132 - targetPrefab: 1012354932 + targetPrefab: 723913190 - targetObject: -7511558181221131132 - targetPrefab: 25650784 - - targetObject: 2708739958050211779 - targetPrefab: 146729477 + targetPrefab: 1123331143 - targetObject: -7511558181221131132 - targetPrefab: 1392345919 - - targetObject: 1466060218924807064 - targetPrefab: 414428781 - - targetObject: 2751096909771140069 - targetPrefab: 414428781 - - targetObject: 4351601775851787701 - targetPrefab: 832323181 - - targetObject: -7511558181221131132 - targetPrefab: 1972023585 - - targetObject: -7511558181221131132 - targetPrefab: 2119386629 - - targetObject: 1466060218924807064 - targetPrefab: 1249864385 - - targetObject: 2751096909771140069 - targetPrefab: 1249864385 - - targetObject: -7511558181221131132 - targetPrefab: 1463594309 - - targetObject: -7511558181221131132 - targetPrefab: 1557255132 - - targetObject: -7511558181221131132 - targetPrefab: 1548013197 - - targetObject: -7511558181221131132 - targetPrefab: 1470660570 + targetPrefab: 366681287 + - targetObject: 5395762849033877597 + targetPrefab: 789002245204939195 - targetObject: -7511558181221131132 targetPrefab: 1488972618 - targetObject: -7511558181221131132 - targetPrefab: 2045833766 - - targetObject: -7511558181221131132 - targetPrefab: 577030235 - - targetObject: 8810932174823803713 - targetPrefab: 1669769486 + targetPrefab: 353645666 + - targetObject: 1466060218924807064 + targetPrefab: 990092987 + - targetObject: 2751096909771140069 + targetPrefab: 990092987 - targetObject: 1466060218924807064 targetPrefab: 1305776201 - targetObject: 2751096909771140069 targetPrefab: 1305776201 + - targetObject: 4351601775851787701 + targetPrefab: 91371483 - targetObject: -7511558181221131132 - targetPrefab: 808969077 + targetPrefab: 1972023585 + - targetObject: -7511558181221131132 + targetPrefab: 1584083749 + - targetObject: 7006853779014437907 + targetPrefab: 1049045427 + - targetObject: -7511558181221131132 + targetPrefab: 267965641 + - targetObject: -7511558181221131132 + targetPrefab: 1427476862 + - targetObject: -7511558181221131132 + targetPrefab: 139770782 + - targetObject: -7511558181221131132 + targetPrefab: 580345162 + - targetObject: 1466060218924807064 + targetPrefab: 1329794381 + - targetObject: 2751096909771140069 + targetPrefab: 1329794381 + - targetObject: -7511558181221131132 + targetPrefab: 760334290 + - targetObject: 2708739958050211779 + targetPrefab: 734635744 + - targetObject: 2708739958050211779 + targetPrefab: 146729477 + - targetObject: 1466060218924807064 + targetPrefab: 1918973202 + - targetObject: 2751096909771140069 + targetPrefab: 1918973202 + - targetObject: 5444317254943555344 + targetPrefab: 4953860686005405531 + - targetObject: -7511558181221131132 + targetPrefab: 1548013197 + - targetObject: -7511558181221131132 + targetPrefab: 2045833766 + - targetObject: 4351601775851787701 + targetPrefab: 2024292607 + - targetObject: 5395762849033877597 + targetPrefab: 1984717371 + - targetObject: -7511558181221131132 + targetPrefab: 732678856 + - targetObject: 1968900501911500709 + targetPrefab: 4438766482650780789 + - targetObject: 940995387610717004 + targetPrefab: 4438766482650780789 + - targetObject: -7511558181221131132 + targetPrefab: 1299739207 + - targetObject: -7511558181221131132 + targetPrefab: 1392345919 + - targetObject: 4351601775851787701 + targetPrefab: 1294116878969307432 + - targetObject: -7511558181221131132 + targetPrefab: 2119386629 + - targetObject: -7511558181221131132 + targetPrefab: 1012354932 + - targetObject: -7511558181221131132 + targetPrefab: 1188236244 - targetObject: 4856842162814790411 targetPrefab: 6044205050412544512 - - targetObject: 2708739958050211779 - targetPrefab: 1582278623 + - targetObject: 1466060218924807064 + targetPrefab: 1249864385 + - targetObject: 2751096909771140069 + targetPrefab: 1249864385 - targetObject: -7511558181221131132 - targetPrefab: 1629735784 + targetPrefab: 1586593148 + - targetObject: 1466060218924807064 + targetPrefab: 298932333 + - targetObject: 2751096909771140069 + targetPrefab: 298932333 - targetObject: 2708739958050211779 targetPrefab: 1584295245487527435 - - targetObject: -7511558181221131132 - targetPrefab: 2134288141 - - targetObject: 1466060218924807064 - targetPrefab: 1962599170 - - targetObject: 2751096909771140069 - targetPrefab: 1962599170 - - targetObject: -7511558181221131132 - targetPrefab: 600479467 - targetObject: -7511558181221131132 targetPrefab: 297529246 - - targetObject: 1466060218924807064 - targetPrefab: 428989207 - - targetObject: 2751096909771140069 - targetPrefab: 428989207 + - targetObject: -7511558181221131132 + targetPrefab: 1279360754 + - targetObject: 7006853779014437907 + targetPrefab: 515796176453664510 m_Portals: [] diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 8574af9..daa337d 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -100,13 +100,11 @@ public class GameManagerRound3 : GameManagerBase foreach (CameraOverlay Overlay in _TimerCameraOverlays) { Overlay.EnableOverlayElements(false); - Overlay.gameObject.SetActive(false); } foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) { Overlay.EnableOverlayElements(false); - Overlay.gameObject.SetActive(false); } SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false); @@ -236,7 +234,6 @@ public class GameManagerRound3 : GameManagerBase _Scoreboard.Enable(true); foreach (CameraOverlay Overlay in _TimerCameraOverlays) { - Overlay.gameObject.SetActive(true); Overlay.EnableOverlayElements(true); } @@ -258,7 +255,6 @@ public class GameManagerRound3 : GameManagerBase foreach (CameraOverlay Overlay in _TimerCameraOverlays) { - Overlay.gameObject.SetActive(true); Overlay.EnableOverlayElements(true); } @@ -303,6 +299,12 @@ public class GameManagerRound3 : GameManagerBase RequestSerialization(); } + public void EndTimerEarly() + { + _Timer = 0; + TickTimer(); + } + [NetworkCallable] public void CorrectResponse() { @@ -465,7 +467,6 @@ public class GameManagerRound3 : GameManagerBase foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) { Overlay.EnableOverlayElements(true); - Overlay.gameObject.SetActive(true); } } @@ -505,7 +506,6 @@ public class GameManagerRound3 : GameManagerBase foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) { Overlay.EnableOverlayElements(true); - Overlay.gameObject.SetActive(true); } } @@ -525,13 +525,11 @@ public class GameManagerRound3 : GameManagerBase foreach (CameraOverlay Overlay in _TimerCameraOverlays) { Overlay.EnableOverlayElements(false); - Overlay.gameObject.SetActive(false); } foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) { Overlay.EnableOverlayElements(false); - Overlay.gameObject.SetActive(false); } _CameraControllerRound3.DisableAllSwitchers(); @@ -647,6 +645,15 @@ public class GameManagerRound3 : GameManagerBase } } + public void RerandomiseMap(bool HardMode = false) + { + FloorMap CurrentMap = GetCurrentMap(); + if (CurrentMap) + { + GetCurrentMap().RandomiseCountries(HardMode); + } + } + private string GetRound3PlayerName() { string[] CurrentWinner = _CaseManager.GetCurrentWinningPlayers(); diff --git a/Assets/UdonSharp/Maps/FloorMap.cs b/Assets/UdonSharp/Maps/FloorMap.cs index 5a76a01..2920987 100644 --- a/Assets/UdonSharp/Maps/FloorMap.cs +++ b/Assets/UdonSharp/Maps/FloorMap.cs @@ -28,7 +28,7 @@ public class FloorMap : UdonSharpBehaviour } - public void RandomiseCountries() + public void RandomiseCountries(bool HardMode = false) { for (int i = 0; i < Countries.Length; i++) { @@ -50,7 +50,7 @@ public class FloorMap : UdonSharpBehaviour for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++) { int NewPulledIndex = NumberOfCountries; - while (CountryIsAlreadyInArray(NewRandomCountries, NewPulledIndex) || Countries[NewPulledIndex].HardModeSelection) + while (CountryIsAlreadyInArray(NewRandomCountries, NewPulledIndex) || (Countries[NewPulledIndex].HardModeSelection && !HardMode)) { NewPulledIndex = Random.Range(0, NumberOfCountries); } diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset index c52ebb3..ef8f3c3 100644 --- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset +++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 22 + Data: 25 - Name: Entry: 7 Data: @@ -1040,85 +1040,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerPodiums + Data: _Round1Manager - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerPodiums + Data: _Round1Manager - Name: k__BackingField Entry: 7 Data: 64|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: PlayerPodium[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 65|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 67|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: _CameraConsole - - Name: $v - Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraConsole - - Name: k__BackingField - Entry: 7 - Data: 69|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraSystem.CameraSystem_Console, Assembly-CSharp + Data: GameManagerRound1, Assembly-CSharp - Name: Entry: 8 Data: @@ -1139,13 +1073,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1166,19 +1100,85 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PotatoModeImage + Data: _Round2Manager - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PotatoModeImage + Data: _Round2Manager - Name: k__BackingField - Entry: 9 - Data: 25 + Entry: 7 + Data: 68|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: GameManagerRound2, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 25 + 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: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 70|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: _Round3Manager + - Name: $v + Entry: 7 + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Round3Manager + - Name: k__BackingField + Entry: 7 + Data: 72|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: GameManagerRound3, 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 @@ -1220,16 +1220,196 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: SELECTED_TAB_COLOUR + Data: _PlayerPodiums - Name: $v Entry: 7 Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: SELECTED_TAB_COLOUR + Data: _PlayerPodiums - Name: k__BackingField Entry: 7 Data: 76|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PlayerPodium[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 77|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 79|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: _CameraConsole + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraConsole + - Name: k__BackingField + Entry: 7 + Data: 81|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraSystem.CameraSystem_Console, 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: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 83|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: _PotatoModeImage + - Name: $v + Entry: 7 + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PotatoModeImage + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 86|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: SELECTED_TAB_COLOUR + - Name: $v + Entry: 7 + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: SELECTED_TAB_COLOUR + - Name: k__BackingField + Entry: 7 + Data: 88|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Color, UnityEngine.CoreModule @@ -1238,7 +1418,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 88 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1253,7 +1433,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1277,16 +1457,16 @@ MonoBehaviour: Data: POTATO_TOGGLED_ON_COLOUR - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: POTATO_TOGGLED_ON_COLOUR - Name: k__BackingField Entry: 9 - Data: 76 + Data: 88 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 88 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1301,7 +1481,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs index 6d7810c..b66fc54 100644 --- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs +++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs @@ -43,6 +43,9 @@ public class HostPanelInterface : UdonSharpBehaviour [Space] [SerializeField] private CaseManager _CaseManager; + [SerializeField] private GameManagerRound1 _Round1Manager; + [SerializeField] private GameManagerRound2 _Round2Manager; + [SerializeField] private GameManagerRound3 _Round3Manager; [SerializeField] private PlayerPodium[] _PlayerPodiums; [SerializeField] private CameraSystem_Console _CameraConsole; [SerializeField] private Image _PotatoModeImage; @@ -207,6 +210,19 @@ public class HostPanelInterface : UdonSharpBehaviour "ResetPodium"); } + public void Round3_RandomiseMap_Easy() + { + _Round3Manager.RerandomiseMap(false); + } + public void Round3_RandomiseMap_Hard() + { + _Round3Manager.RerandomiseMap(true); + } + public void Round3_EndTimerEarly() + { + _Round3Manager.EndTimerEarly(); + } + public void RestartRound1() { _CaseManager.ContinueToRound1();