diff --git a/Assets/Art/jeremy.png b/Assets/Art/jeremy.png new file mode 100644 index 0000000..4dee7c5 Binary files /dev/null and b/Assets/Art/jeremy.png differ diff --git a/Assets/Art/jeremy.png.meta b/Assets/Art/jeremy.png.meta new file mode 100644 index 0000000..2a11930 --- /dev/null +++ b/Assets/Art/jeremy.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: 4b8ba594a90707738a0921f6b3a0ae4e +TextureImporter: + internalIDToNameTable: + - first: + 213: 4450288418137281965 + second: jeremy_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: 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: WebGL + 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: jeremy_0 + rect: + serializedVersion: 2 + x: 1045 + y: 41 + width: 1562 + height: 481 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: da59b17dcb992cd30800000000000000 + internalID: 4450288418137281965 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/SFX_Heartbeat.wav b/Assets/Audio/SFX/SFX_Heartbeat.wav new file mode 100644 index 0000000..9885513 Binary files /dev/null and b/Assets/Audio/SFX/SFX_Heartbeat.wav differ diff --git a/Assets/Audio/SFX/SFX_Heartbeat.wav.meta b/Assets/Audio/SFX/SFX_Heartbeat.wav.meta new file mode 100644 index 0000000..86bcc05 --- /dev/null +++ b/Assets/Audio/SFX/SFX_Heartbeat.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e53adbb21aa7419189c4272a8f15290a +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SecondTry.unity b/Assets/Scenes/SecondTry.unity index c30feb4..52496d4 100644 --- a/Assets/Scenes/SecondTry.unity +++ b/Assets/Scenes/SecondTry.unity @@ -424,7 +424,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &45907780 Transform: m_ObjectHideFlags: 0 @@ -13253,14 +13253,13 @@ GameObject: m_Component: - component: {fileID: 606198580} - component: {fileID: 606198581} - - component: {fileID: 606198582} m_Layer: 0 - m_Name: cables + m_Name: ears m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &606198580 Transform: m_ObjectHideFlags: 0 @@ -13270,11 +13269,11 @@ Transform: m_GameObject: {fileID: 606198579} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.97, y: -2.91, z: -2.44} + m_LocalPosition: {x: -18.23, y: 5.74, z: -3.22} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 615879237} + m_Father: {fileID: 886228925} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &606198581 SpriteRenderer: @@ -13320,7 +13319,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 5145563790700824758, guid: bc42bffd52302fb4cb8a9e7505852c38, type: 3} + m_Sprite: {fileID: -8167802774436909577, guid: 68f9bfd4d4ac178c59633a992f0738ca, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -13331,24 +13330,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &606198582 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606198579} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0e545d598a5d16f4e8b9a70fedc8b7a3, type: 3} - m_Name: - m_EditorClassIdentifier: - _onClick: - m_PersistentCalls: - m_Calls: [] - _clickSound: {fileID: 416576483} - _outlineFx: {fileID: 0} - isActive: 1 --- !u!4 &606327773 stripped Transform: m_CorrespondingSourceObject: {fileID: 8536589994776351090, guid: f06f3948cf95feed3ab91ee26e3dd803, type: 3} @@ -13616,7 +13597,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &615879237 Transform: m_ObjectHideFlags: 0 @@ -13631,8 +13612,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 886228925} - - {fileID: 955796938} - - {fileID: 606198580} - {fileID: 1012237399} - {fileID: 1303917522} - {fileID: 606327773} @@ -14845,7 +14824,7 @@ GameObject: - component: {fileID: 886228925} - component: {fileID: 886228926} m_Layer: 0 - m_Name: Layer 8 + m_Name: doggie dead m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -14860,10 +14839,12 @@ Transform: m_GameObject: {fileID: 886228924} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.78} + m_LocalPosition: {x: 2.61, y: -1.13, z: 0.78} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 955796938} + - {fileID: 606198580} m_Father: {fileID: 615879237} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &886228926 @@ -14910,7 +14891,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 9208885014789710951, guid: bc42bffd52302fb4cb8a9e7505852c38, type: 3} + m_Sprite: {fileID: 3366475684531282610, guid: 82fbff2824eea9efb81580e01cb95bc7, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -20270,12 +20251,12 @@ GameObject: - component: {fileID: 955796938} - component: {fileID: 955796939} m_Layer: 0 - m_Name: Layer 8 Copy + m_Name: leg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &955796938 Transform: m_ObjectHideFlags: 0 @@ -20285,11 +20266,11 @@ Transform: m_GameObject: {fileID: 955796937} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.48, y: -7.98, z: 0.91} + m_LocalPosition: {x: -16.66, y: -4.7699995, z: 0.13} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 615879237} + m_Father: {fileID: 886228925} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &955796939 SpriteRenderer: @@ -20335,7 +20316,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -1860456807168046492, guid: bc42bffd52302fb4cb8a9e7505852c38, type: 3} + m_Sprite: {fileID: 2093160474673058430, guid: 68f9bfd4d4ac178c59633a992f0738ca, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -20596,6 +20577,7 @@ GameObject: - component: {fileID: 1012237401} - component: {fileID: 1012237403} - component: {fileID: 1012237404} + - component: {fileID: 1012237405} m_Layer: 0 m_Name: heart m_TagString: Untagged @@ -20688,9 +20670,33 @@ MonoBehaviour: _onClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 185030481} - m_TargetAssemblyTypeName: SceneSwitcher, Assembly-CSharp - m_MethodName: SwitchToNext + - m_Target: {fileID: 886228924} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1103625983} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1012237405} + m_TargetAssemblyTypeName: DelayEvent, Assembly-CSharp + m_MethodName: InvokeDelayed m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -20774,6 +20780,34 @@ PolygonCollider2D: - {x: 2.55, y: 0.049999997} - {x: 2.55, y: 3.1699998} m_UseDelaunayMesh: 0 +--- !u!114 &1012237405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1012237398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1428aa8d322816b65abbe1103c4dda45, type: 3} + m_Name: + m_EditorClassIdentifier: + _delayInSeconds: 2 + _event: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 185030481} + m_TargetAssemblyTypeName: SceneSwitcher, Assembly-CSharp + m_MethodName: SwitchToNext + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1028593302 GameObject: m_ObjectHideFlags: 0 @@ -21026,6 +21060,11 @@ PlayableDirector: value: {fileID: 1751700032} m_ExposedReferences: m_References: [] +--- !u!1 &1103625983 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5256141804506438041, guid: f06f3948cf95feed3ab91ee26e3dd803, type: 3} + m_PrefabInstance: {fileID: 8110853811779583335} + m_PrefabAsset: {fileID: 0} --- !u!1 &1128709701 GameObject: m_ObjectHideFlags: 0 @@ -36479,6 +36518,10 @@ PrefabInstance: propertyPath: m_Name value: doggo_surgery objectReference: {fileID: 0} + - target: {fileID: 5256141804506438041, guid: f06f3948cf95feed3ab91ee26e3dd803, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8536589994776351090, guid: f06f3948cf95feed3ab91ee26e3dd803, type: 3} propertyPath: m_LocalPosition.x value: -2.7416353 diff --git a/Assets/Scripts/DelayEvent.cs b/Assets/Scripts/DelayEvent.cs new file mode 100644 index 0000000..4a8aa69 --- /dev/null +++ b/Assets/Scripts/DelayEvent.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using UnityEngine.Events; + +public class DelayEvent : MonoBehaviour +{ + [SerializeField] private float _delayInSeconds; + [SerializeField] private UnityEvent _event; + + public void InvokeDelayed() + { + Invoke(nameof(InvokeEvent), _delayInSeconds); + } + + private void InvokeEvent() + { + _event?.Invoke(); + } + +} \ No newline at end of file diff --git a/Assets/Scripts/DelayEvent.cs.meta b/Assets/Scripts/DelayEvent.cs.meta new file mode 100644 index 0000000..92538dc --- /dev/null +++ b/Assets/Scripts/DelayEvent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1428aa8d322816b65abbe1103c4dda45 \ No newline at end of file diff --git a/Assets/Timelines/22-DoggyOPDetailTimeline.playable b/Assets/Timelines/22-DoggyOPDetailTimeline.playable index 2146c11..a865618 100644 --- a/Assets/Timelines/22-DoggyOPDetailTimeline.playable +++ b/Assets/Timelines/22-DoggyOPDetailTimeline.playable @@ -1,5 +1,101 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6457153877705332294 +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: + 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.16666666666666666 + m_ClipIn: 0.16666666666666666 + m_Asset: {fileID: -1742676870882262005} + m_Duration: 4.833333333333333 + m_TimeScale: 1 + m_ParentTrack: {fileID: -6457153877705332294} + 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: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: SFX_Heartbeat + m_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 --- !u!114 &-5138987144734360568 MonoBehaviour: m_ObjectHideFlags: 1 @@ -206,6 +302,23 @@ MonoBehaviour: m_bufferingTime: 0.1 m_ClipProperties: volume: 1 +--- !u!114 &-1742676870882262005 +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: + m_Clip: {fileID: 8300000, guid: e53adbb21aa7419189c4272a8f15290a, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 --- !u!114 &-1692676815626557794 MonoBehaviour: m_ObjectHideFlags: 1 @@ -239,6 +352,7 @@ MonoBehaviour: - {fileID: 6245622514681690319} - {fileID: 3788056184702097699} - {fileID: 1619188942213112811} + - {fileID: -6457153877705332294} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60