diff --git a/Assets/Art/Cinematics/Quarry/MinigameOutroPlayable.playable b/Assets/Art/Cinematics/Quarry/MinigameOutroPlayable.playable index f772c235..994ae37e 100644 --- a/Assets/Art/Cinematics/Quarry/MinigameOutroPlayable.playable +++ b/Assets/Art/Cinematics/Quarry/MinigameOutroPlayable.playable @@ -1,28 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7135559558907686699 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} - m_Name: AnimationPlayableAsset - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AnimationPlayableAsset - m_Clip: {fileID: 7400000, guid: f4a26eaf05b96ab469b1c04300da37a6, type: 2} - m_Position: {x: 0, y: 0, z: 0} - m_EulerAngles: {x: 0, y: 0, z: 0} - m_UseTrackMatchFields: 1 - m_MatchTargetFields: 63 - m_RemoveStartOffset: 1 - m_ApplyFootIK: 1 - m_Loop: 0 - m_Version: 1 - m_Rotation: {x: 0, y: 0, z: 0, w: 1} ---- !u!114 &-4231233231006537291 +--- !u!114 &-446339716597930989 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -42,76 +20,7 @@ MonoBehaviour: m_Curves: {fileID: 0} m_Parent: {fileID: 11400000} m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 0 - m_ClipIn: 0 - m_Asset: {fileID: -7135559558907686699} - m_Duration: 3.6 - m_TimeScale: 1 - m_ParentTrack: {fileID: -4231233231006537291} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: -1 - m_BlendOutDuration: -1 - m_MixInCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 1 - m_PreExtrapolationMode: 1 - m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 0 - m_DisplayName: CINE_MiniGameOutro + m_Clips: [] m_Markers: m_Objects: [] m_InfiniteClipPreExtrapolation: 0 @@ -146,8 +55,8 @@ MonoBehaviour: m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.TimelineAsset m_Version: 0 m_Tracks: - - {fileID: -4231233231006537291} - {fileID: 8785081636201331406} + - {fileID: -446339716597930989} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 30 diff --git a/Assets/Art/Color_Palette.png b/Assets/Art/Color_Palette.png new file mode 100644 index 00000000..74c46986 Binary files /dev/null and b/Assets/Art/Color_Palette.png differ diff --git a/Assets/Art/Color_Palette.png.meta b/Assets/Art/Color_Palette.png.meta new file mode 100644 index 00000000..461357f1 --- /dev/null +++ b/Assets/Art/Color_Palette.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: 0b2c4e14476ddd14593d068828917d82 +TextureImporter: + internalIDToNameTable: + - first: + 213: 3955105511676812543 + second: Color_Palette_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Color_Palette_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1810 + height: 1127 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ffc9fa0028b53e630800000000000000 + internalID: 3955105511676812543 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Color_Palette_0: 3955105511676812543 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Playables/OutroCinematic.playable b/Assets/Playables/OutroCinematic.playable new file mode 100644 index 00000000..15b4371c --- /dev/null +++ b/Assets/Playables/OutroCinematic.playable @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: OutroCinematic + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.TimelineAsset + m_Version: 0 + m_Tracks: [] + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} diff --git a/Assets/Playables/OutroCinematic.playable.meta b/Assets/Playables/OutroCinematic.playable.meta new file mode 100644 index 00000000..4f7478ce --- /dev/null +++ b/Assets/Playables/OutroCinematic.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30bd567b56059a64c8812ace9005e180 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Playables/SurfacingCinematic.playable b/Assets/Playables/SurfacingCinematic.playable index ef60c31f..ab1e4b57 100644 --- a/Assets/Playables/SurfacingCinematic.playable +++ b/Assets/Playables/SurfacingCinematic.playable @@ -1,5 +1,161 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5410086080836277403 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b22792c3b570444eb18cb78c2af3a74, type: 3} + m_Name: Audio Track + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0.5221250000000014 + m_ClipIn: 1 + m_Asset: {fileID: 5920796395479930207} + m_Duration: 1.7578749999999985 + m_TimeScale: 1 + m_ParentTrack: {fileID: -5410086080836277403} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: outrocine_audio + m_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 +--- !u!114 &-427775867803860694 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b22792c3b570444eb18cb78c2af3a74, type: 3} + m_Name: Audio Track (1) + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 1.48 + m_ClipIn: 2.7178749999999985 + m_Asset: {fileID: 8946805280993890623} + m_Duration: 1.3600000000000003 + m_TimeScale: 1 + m_ParentTrack: {fileID: -427775867803860694} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: outrocine_audio + m_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15,6 +171,8 @@ MonoBehaviour: m_Version: 0 m_Tracks: - {fileID: 8636189198204744120} + - {fileID: -5410086080836277403} + - {fileID: -427775867803860694} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 25 @@ -43,6 +201,23 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &5920796395479930207 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset(Clone) + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset + m_Clip: {fileID: 8300000, guid: bdd229b890d8ccd49b1eac1d4582f544, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 --- !u!114 &8636189198204744120 MonoBehaviour: m_ObjectHideFlags: 1 @@ -153,3 +328,20 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &8946805280993890623 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset + m_Clip: {fileID: 8300000, guid: bdd229b890d8ccd49b1eac1d4582f544, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 diff --git a/Assets/Prefabs/Managers/CinematicsManager.prefab b/Assets/Prefabs/Managers/CinematicsManager.prefab index 25977402..f9726e71 100644 --- a/Assets/Prefabs/Managers/CinematicsManager.prefab +++ b/Assets/Prefabs/Managers/CinematicsManager.prefab @@ -293,9 +293,9 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4978134902377398530} - {fileID: 5494371867874695937} - {fileID: 5708275729410901669} - - {fileID: 4978134902377398530} m_Father: {fileID: 5006436358316225511} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -412,6 +412,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3cd69fd77a22640aa40e691d8d6c26, type: 3} m_Name: m_EditorClassIdentifier: AppleHillsScripts::CinematicsManager + cinematicSpritesGameObject: {fileID: 9166576207668444836} cinematicBackground: {fileID: 3837694223035649714} divingGameOverScreen: {fileID: 1555823719300990817} playableDirector: {fileID: 291412605997816487} @@ -424,7 +425,7 @@ PlayableDirector: m_GameObject: {fileID: 2755712733105741372} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 400e13ef8f17b5841acd92120f67a092, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 2 @@ -440,10 +441,16 @@ PlayableDirector: value: {fileID: 0} - key: {fileID: 8636189198204744120, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2} value: {fileID: 2900690403017929526} - - key: {fileID: -4231233231006537291, guid: 400e13ef8f17b5841acd92120f67a092, type: 2} - value: {fileID: 2900690403017929526} - key: {fileID: 139419469794405637, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2} value: {fileID: 0} + - key: {fileID: 8785081636201331406, guid: 400e13ef8f17b5841acd92120f67a092, type: 2} + value: {fileID: 0} + - key: {fileID: -446339716597930989, guid: 400e13ef8f17b5841acd92120f67a092, type: 2} + value: {fileID: 2900690403017929526} + - key: {fileID: -5410086080836277403, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2} + value: {fileID: 0} + - key: {fileID: -427775867803860694, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2} + value: {fileID: 0} m_ExposedReferences: m_References: [] --- !u!1 &3025814654250773583 @@ -682,17 +689,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3837694223035649714} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: + - {fileID: 9195361253609918804} m_Father: {fileID: 592992386388815559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0025024, y: -1294.4525} - m_SizeDelta: {x: 1920, y: 1571.115} + m_AnchoredPosition: {x: -0.0025634766, y: -1380.1166} + m_SizeDelta: {x: 1920, y: 1399.7874} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2314847656825276738 CanvasRenderer: @@ -732,81 +740,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3845310352016848710 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3349283207651595910} - - component: {fileID: 6595637117259372467} - - component: {fileID: 2880016163873359919} - m_Layer: 5 - m_Name: CinematicBackground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3349283207651595910 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3845310352016848710} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.99475205, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5494371867874695937} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -3.279419, y: -1267} - m_SizeDelta: {x: 1920, y: 1000} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6595637117259372467 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3845310352016848710} - m_CullTransparentMesh: 1 ---- !u!114 &2880016163873359919 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3845310352016848710} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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: 0} - m_Type: 0 - 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!1 &3907121777593230662 GameObject: m_ObjectHideFlags: 0 @@ -1469,6 +1402,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8938058918530086601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9195361253609918804} + - component: {fileID: 6918160369029793220} + - component: {fileID: 276527935528622190} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9195361253609918804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8938058918530086601} + 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: 4978134902377398530} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 1733.7644} + m_SizeDelta: {x: 1920, y: 2057.6729} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6918160369029793220 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8938058918530086601} + m_CullTransparentMesh: 1 +--- !u!114 &276527935528622190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8938058918530086601} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0.79215693, g: 0.9294118, 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: 0} + m_Type: 0 + 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!1 &9166576207668444836 GameObject: m_ObjectHideFlags: 0 @@ -1488,7 +1496,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5494371867874695937 RectTransform: m_ObjectHideFlags: 0 @@ -1502,7 +1510,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 538506048417711235} - - {fileID: 3349283207651595910} m_Father: {fileID: 592992386388815559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1538,7 +1545,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 521b8943618ee4941a59b55cba521053, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 7a0eb0fc..75979824 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -452498,6 +452498,63 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1374202465 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalPosition.x + value: -11.798269 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalPosition.y + value: -1.3806252 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2873907538289469479, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6199677512542707633, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} + propertyPath: m_Name + value: QuarryAudio + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ead4e790fa3a1924ebd1586c93cd5479, type: 3} --- !u!1001 &1377694880 PrefabInstance: m_ObjectHideFlags: 0 @@ -470113,3 +470170,4 @@ SceneRoots: - {fileID: 1070397503} - {fileID: 841182293} - {fileID: 477911181} + - {fileID: 1374202465} diff --git a/Assets/Scenes/MiniGames/DivingForPictures.unity b/Assets/Scenes/MiniGames/DivingForPictures.unity index d8d5ae94..aba522db 100644 --- a/Assets/Scenes/MiniGames/DivingForPictures.unity +++ b/Assets/Scenes/MiniGames/DivingForPictures.unity @@ -342,13 +342,13 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -0.15602553, y: 4.074945, z: 0} - - {x: -0.1566351, y: 3.9736383, z: 0} + - {x: -0.15602553, y: 4.0749445, z: 0} + - {x: -0.1566351, y: 3.9736378, z: 0} - {x: -0.1572447, y: 3.8729858, z: 0} - {x: -0.15785426, y: 3.7729874, z: 0} - - {x: -0.15846384, y: 3.6736436, z: 0} + - {x: -0.15846384, y: 3.6736438, z: 0} - {x: -0.15907341, y: 3.5749543, z: 0} - - {x: -0.15968299, y: 3.4769192, z: 0} + - {x: -0.15968299, y: 3.4769194, z: 0} - {x: -0.16029257, y: 3.3795385, z: 0} - {x: -0.16090216, y: 3.2828126, z: 0} - {x: -0.16151173, y: 3.1867406, z: 0} @@ -915,7 +915,7 @@ Transform: m_GameObject: {fileID: 747976396} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 3.197517, z: 0} + m_LocalPosition: {x: 0, y: 3.1975174, z: 0} m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574} m_ConstrainProportionsScale: 0 m_Children: @@ -1369,13 +1369,13 @@ LineRenderer: m_Positions: - {x: -0.15602553, y: 4.074945, z: 0} - {x: -0.11662118, y: 3.8796225, z: 0} - - {x: -0.07721684, y: 3.7057447, z: 0} - - {x: -0.03781248, y: 3.5533109, z: 0} + - {x: -0.07721684, y: 3.7057445, z: 0} + - {x: -0.03781248, y: 3.5533106, z: 0} - {x: 0.0015918687, y: 3.4223216, z: 0} - {x: 0.040996216, y: 3.3127766, z: 0} - - {x: 0.08040057, y: 3.224676, z: 0} + - {x: 0.08040057, y: 3.2246757, z: 0} - {x: 0.11980491, y: 3.1580195, z: 0} - - {x: 0.15920927, y: 3.112808, z: 0} + - {x: 0.15920927, y: 3.1128078, z: 0} - {x: 0.1986136, y: 3.0890403, z: 0} - {x: 0.23801796, y: 3.0867171, z: 0} m_Parameters: @@ -1912,13 +1912,13 @@ LineRenderer: m_Positions: - {x: -0.15602553, y: 4.074945, z: 0} - {x: -0.18956745, y: 3.8764977, z: 0} - - {x: -0.22310936, y: 3.7000234, z: 0} + - {x: -0.22310936, y: 3.7000232, z: 0} - {x: -0.25665125, y: 3.5455205, z: 0} - - {x: -0.29019317, y: 3.412991, z: 0} + - {x: -0.29019317, y: 3.4129908, z: 0} - {x: -0.32373506, y: 3.3024333, z: 0} - - {x: -0.35727698, y: 3.2138486, z: 0} - - {x: -0.39081886, y: 3.1472359, z: 0} - - {x: -0.4243608, y: 3.1025958, z: 0} + - {x: -0.35727698, y: 3.213848, z: 0} + - {x: -0.39081886, y: 3.1472356, z: 0} + - {x: -0.4243608, y: 3.1025953, z: 0} - {x: -0.45790267, y: 3.0799277, z: 0} - {x: -0.4914446, y: 3.0792325, z: 0} m_Parameters: diff --git a/Assets/Scripts/Cinematics/CinematicsManager.cs b/Assets/Scripts/Cinematics/CinematicsManager.cs index d82e6dff..4d672a9c 100644 --- a/Assets/Scripts/Cinematics/CinematicsManager.cs +++ b/Assets/Scripts/Cinematics/CinematicsManager.cs @@ -21,6 +21,7 @@ namespace Cinematics private static CinematicsManager _instance; private static bool _isQuitting; private Image _cinematicSprites; + public GameObject cinematicSpritesGameObject; private bool _isCinematicPlaying = false; public bool IsCinematicPlaying => _isCinematicPlaying; public GameObject cinematicBackground; @@ -116,6 +117,7 @@ namespace Cinematics if (_cinematicSprites != null) { _cinematicSprites.enabled = true; + cinematicSpritesGameObject.SetActive(true); } playableDirector.stopped += OnPlayableDirectorStopped; @@ -129,6 +131,7 @@ namespace Cinematics void OnPlayableDirectorStopped(PlayableDirector director) { _cinematicSprites.enabled = false; + cinematicSpritesGameObject.SetActive(false); Logging.Debug("Cinematic stopped!"); _isCinematicPlaying = false; OnCinematicStopped?.Invoke();