From b2743d59b50a28920d7cafeba211f00fbce2312a Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Thu, 12 Apr 2018 17:14:52 +1000 Subject: [PATCH] stuff --- Assets/Animations.meta | 10 ++ Assets/Animations/Background.controller | 91 +++++++++++++++++ Assets/Animations/Background.controller.meta | 10 ++ Assets/Animations/ending_opening.anim | 98 +++++++++++++++++++ Assets/Animations/ending_opening.anim.meta | 10 ++ Assets/Backgrounds/Ending_Opening.meta | 10 ++ Assets/Backgrounds/Ending_Opening/1.png | 3 + Assets/Backgrounds/Ending_Opening/1.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/10.png | 3 + Assets/Backgrounds/Ending_Opening/10.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/2.png | 3 + Assets/Backgrounds/Ending_Opening/2.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/3.png | 3 + Assets/Backgrounds/Ending_Opening/3.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/4.png | 3 + Assets/Backgrounds/Ending_Opening/4.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/5.png | 3 + Assets/Backgrounds/Ending_Opening/5.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/6.png | 3 + Assets/Backgrounds/Ending_Opening/6.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/7.png | 3 + Assets/Backgrounds/Ending_Opening/7.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/8.png | 3 + Assets/Backgrounds/Ending_Opening/8.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Ending_Opening/9.png | 3 + Assets/Backgrounds/Ending_Opening/9.png.meta | 77 +++++++++++++++ Assets/Backgrounds/Endscreen_Opening.gif | 3 + Assets/Backgrounds/Endscreen_Opening.gif.meta | 77 +++++++++++++++ Assets/Scenes/gameover.unity | 26 ++++- Assets/Scenes/gameplay.unity | 18 ++++ Assets/Scripts/GameOverController.cs | 27 +++-- Assets/Scripts/MonsterSpawner.cs | 32 ++++++ 32 files changed, 1202 insertions(+), 10 deletions(-) create mode 100644 Assets/Animations.meta create mode 100644 Assets/Animations/Background.controller create mode 100644 Assets/Animations/Background.controller.meta create mode 100644 Assets/Animations/ending_opening.anim create mode 100644 Assets/Animations/ending_opening.anim.meta create mode 100644 Assets/Backgrounds/Ending_Opening.meta create mode 100644 Assets/Backgrounds/Ending_Opening/1.png create mode 100644 Assets/Backgrounds/Ending_Opening/1.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/10.png create mode 100644 Assets/Backgrounds/Ending_Opening/10.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/2.png create mode 100644 Assets/Backgrounds/Ending_Opening/2.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/3.png create mode 100644 Assets/Backgrounds/Ending_Opening/3.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/4.png create mode 100644 Assets/Backgrounds/Ending_Opening/4.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/5.png create mode 100644 Assets/Backgrounds/Ending_Opening/5.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/6.png create mode 100644 Assets/Backgrounds/Ending_Opening/6.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/7.png create mode 100644 Assets/Backgrounds/Ending_Opening/7.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/8.png create mode 100644 Assets/Backgrounds/Ending_Opening/8.png.meta create mode 100644 Assets/Backgrounds/Ending_Opening/9.png create mode 100644 Assets/Backgrounds/Ending_Opening/9.png.meta create mode 100644 Assets/Backgrounds/Endscreen_Opening.gif create mode 100644 Assets/Backgrounds/Endscreen_Opening.gif.meta diff --git a/Assets/Animations.meta b/Assets/Animations.meta new file mode 100644 index 0000000..c4d9089 --- /dev/null +++ b/Assets/Animations.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 975bd54f660cefb4fac65383534a3d5e +folderAsset: yes +timeCreated: 1523513351 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Background.controller b/Assets/Animations/Background.controller new file mode 100644 index 0000000..acc3618 --- /dev/null +++ b/Assets/Animations/Background.controller @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Background + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107867206531055572} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101649859734649068 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102966341655159302 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ending_opening + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101649859734649068} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e72e91ee5cc0c2a469a49d223b2aa776, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107867206531055572 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102966341655159302} + m_Position: {x: 156, y: 192, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 300, y: 264, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102966341655159302} diff --git a/Assets/Animations/Background.controller.meta b/Assets/Animations/Background.controller.meta new file mode 100644 index 0000000..d17a892 --- /dev/null +++ b/Assets/Animations/Background.controller.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c66017897dafdce478a58bbfe0f8a4cb +timeCreated: 1523513352 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/ending_opening.anim b/Assets/Animations/ending_opening.anim new file mode 100644 index 0000000..76442a5 --- /dev/null +++ b/Assets/Animations/ending_opening.anim @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ending_opening + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 4ab02e0638df4374981e15d1f4c68846, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 729af66f2a730e54a9b03f2b3b22c20c, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 394745d70b0bc96468f566fa928923b8, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: fdedd6c0753932b48a3e886159ee12c2, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 4fa190588b5031846837508833b70a11, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 676074c38b7659542abf670594d936f0, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3} + - {fileID: 21300000, guid: 4ab02e0638df4374981e15d1f4c68846, type: 3} + - {fileID: 21300000, guid: 729af66f2a730e54a9b03f2b3b22c20c, type: 3} + - {fileID: 21300000, guid: 394745d70b0bc96468f566fa928923b8, type: 3} + - {fileID: 21300000, guid: fdedd6c0753932b48a3e886159ee12c2, type: 3} + - {fileID: 21300000, guid: 4fa190588b5031846837508833b70a11, type: 3} + - {fileID: 21300000, guid: 676074c38b7659542abf670594d936f0, type: 3} + - {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3} + - {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3} + - {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3} + - {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.9166666 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/ending_opening.anim.meta b/Assets/Animations/ending_opening.anim.meta new file mode 100644 index 0000000..21246fa --- /dev/null +++ b/Assets/Animations/ending_opening.anim.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e72e91ee5cc0c2a469a49d223b2aa776 +timeCreated: 1523513351 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening.meta b/Assets/Backgrounds/Ending_Opening.meta new file mode 100644 index 0000000..ab725c5 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ce7f9a2be540c2b4fb064eb7c90717bc +folderAsset: yes +timeCreated: 1523513297 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/1.png b/Assets/Backgrounds/Ending_Opening/1.png new file mode 100644 index 0000000..d40c8e8 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9817804871c54525538227038ad5b02e20070b37e1a63f7f44709e8c5816175c +size 273423 diff --git a/Assets/Backgrounds/Ending_Opening/1.png.meta b/Assets/Backgrounds/Ending_Opening/1.png.meta new file mode 100644 index 0000000..a867cb6 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/1.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781 +timeCreated: 1523513297 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/10.png b/Assets/Backgrounds/Ending_Opening/10.png new file mode 100644 index 0000000..b4ffd59 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/10.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e146081d721bf39ec5f46a299503d050232629235b0f59bcc49c4968656b8b07 +size 149882 diff --git a/Assets/Backgrounds/Ending_Opening/10.png.meta b/Assets/Backgrounds/Ending_Opening/10.png.meta new file mode 100644 index 0000000..ee2d68b --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/10.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: cee3c03fa520b2b459d8b445edc7fb12 +timeCreated: 1523513303 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/2.png b/Assets/Backgrounds/Ending_Opening/2.png new file mode 100644 index 0000000..862c993 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b02d844901376f02b89d5090ecd83caf34b2cb5a8dd6ed33eac5aa7e44a2f99 +size 264171 diff --git a/Assets/Backgrounds/Ending_Opening/2.png.meta b/Assets/Backgrounds/Ending_Opening/2.png.meta new file mode 100644 index 0000000..1bb48ee --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/2.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 4ab02e0638df4374981e15d1f4c68846 +timeCreated: 1523513300 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/3.png b/Assets/Backgrounds/Ending_Opening/3.png new file mode 100644 index 0000000..64aa807 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ac6bf989474f4ca17190eff7a4aabadea305416acfaa8b9ff77179e8654f74b +size 244530 diff --git a/Assets/Backgrounds/Ending_Opening/3.png.meta b/Assets/Backgrounds/Ending_Opening/3.png.meta new file mode 100644 index 0000000..4a781f6 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/3.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 729af66f2a730e54a9b03f2b3b22c20c +timeCreated: 1523513302 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/4.png b/Assets/Backgrounds/Ending_Opening/4.png new file mode 100644 index 0000000..bfa40fa --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:591170e193a4d8dc24d99dceea1010603e968b0cff96dc445ba26402a2e8e1e5 +size 237533 diff --git a/Assets/Backgrounds/Ending_Opening/4.png.meta b/Assets/Backgrounds/Ending_Opening/4.png.meta new file mode 100644 index 0000000..a164b2c --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/4.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 394745d70b0bc96468f566fa928923b8 +timeCreated: 1523513299 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/5.png b/Assets/Backgrounds/Ending_Opening/5.png new file mode 100644 index 0000000..8fbb36b --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b6995b0eab09fd3ad24f47f6129473b2611299c2625cab19559a5578e791169 +size 220988 diff --git a/Assets/Backgrounds/Ending_Opening/5.png.meta b/Assets/Backgrounds/Ending_Opening/5.png.meta new file mode 100644 index 0000000..8b52837 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/5.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: fdedd6c0753932b48a3e886159ee12c2 +timeCreated: 1523513304 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/6.png b/Assets/Backgrounds/Ending_Opening/6.png new file mode 100644 index 0000000..d8e9125 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/6.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e162512211fd82f120bb74458fcbf75236b78ef7a13bcffb4480fdb81daf7f9a +size 220698 diff --git a/Assets/Backgrounds/Ending_Opening/6.png.meta b/Assets/Backgrounds/Ending_Opening/6.png.meta new file mode 100644 index 0000000..7bd788e --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/6.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 4fa190588b5031846837508833b70a11 +timeCreated: 1523513300 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/7.png b/Assets/Backgrounds/Ending_Opening/7.png new file mode 100644 index 0000000..01ef8ca --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/7.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13c564819b675c8f5fc8b7e6dd6b63e9d8f5be95bceb09d0a137216cd3e994a4 +size 244139 diff --git a/Assets/Backgrounds/Ending_Opening/7.png.meta b/Assets/Backgrounds/Ending_Opening/7.png.meta new file mode 100644 index 0000000..5b5e1cb --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/7.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 676074c38b7659542abf670594d936f0 +timeCreated: 1523513301 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/8.png b/Assets/Backgrounds/Ending_Opening/8.png new file mode 100644 index 0000000..6ad9901 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/8.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afa0d502239f6b7cb9ab50f344cf18c5c33616ca25d02086541cca6d204e7141 +size 198148 diff --git a/Assets/Backgrounds/Ending_Opening/8.png.meta b/Assets/Backgrounds/Ending_Opening/8.png.meta new file mode 100644 index 0000000..32b6e95 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/8.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 2e3f61f293c102a4d83e41a69dc804ed +timeCreated: 1523513298 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Ending_Opening/9.png b/Assets/Backgrounds/Ending_Opening/9.png new file mode 100644 index 0000000..a69206c --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/9.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e41ffea3917571d78821705954614688184ac3cc588c9d3c0e2e21f8e0d45343 +size 166461 diff --git a/Assets/Backgrounds/Ending_Opening/9.png.meta b/Assets/Backgrounds/Ending_Opening/9.png.meta new file mode 100644 index 0000000..db6c8c5 --- /dev/null +++ b/Assets/Backgrounds/Ending_Opening/9.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: a1765fe94d706134cb414e119f60e486 +timeCreated: 1523513302 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Backgrounds/Endscreen_Opening.gif b/Assets/Backgrounds/Endscreen_Opening.gif new file mode 100644 index 0000000..43bd49e --- /dev/null +++ b/Assets/Backgrounds/Endscreen_Opening.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06a8587e2c035ff9046b205acf12ac897b97ed8f8a4290938201984e6337ea21 +size 1398068 diff --git a/Assets/Backgrounds/Endscreen_Opening.gif.meta b/Assets/Backgrounds/Endscreen_Opening.gif.meta new file mode 100644 index 0000000..26383c1 --- /dev/null +++ b/Assets/Backgrounds/Endscreen_Opening.gif.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 0d512406e78811a459a67531a0097cba +timeCreated: 1523511540 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/gameover.unity b/Assets/Scenes/gameover.unity index 7a53b1a..f99ec21 100644 --- a/Assets/Scenes/gameover.unity +++ b/Assets/Scenes/gameover.unity @@ -145,7 +145,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 80, y: 90} + m_AnchoredPosition: {x: 90, y: 90} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &44346591 @@ -542,7 +542,7 @@ RectTransform: 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: -70, y: -180} + m_AnchoredPosition: {x: -100, y: -180} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1726320369 @@ -614,7 +614,7 @@ MonoBehaviour: scoreText: {fileID: 182822589} creditText: {fileID: 44346591} clickText: {fileID: 1726320369} - background: {fileID: 0} + background: {fileID: 2135767184} --- !u!4 &1850700147 Transform: m_ObjectHideFlags: 0 @@ -637,6 +637,7 @@ GameObject: m_Component: - component: {fileID: 2135767186} - component: {fileID: 2135767185} + - component: {fileID: 2135767187} m_Layer: 0 m_Name: Background m_TagString: Untagged @@ -696,8 +697,25 @@ Transform: m_GameObject: {fileID: 2135767184} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2135767187 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2135767184} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c66017897dafdce478a58bbfe0f8a4cb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 063257d..9311b77 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -1415,6 +1415,24 @@ Prefab: value: objectReference: {fileID: 1503669499646732, guid: 88b248131befdce4fab5316917b64b6a, type: 2} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: monsterPrefab2 + value: + objectReference: {fileID: 1876593924556066, guid: a3a482c56d8487d4182da0e0cb895726, + type: 2} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: monsterPrefab3 + value: + objectReference: {fileID: 1503669499646732, guid: 88b248131befdce4fab5316917b64b6a, + type: 2} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: monsterPrefab4 + value: + objectReference: {fileID: 1876593924556066, guid: a3a482c56d8487d4182da0e0cb895726, + type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scripts/GameOverController.cs b/Assets/Scripts/GameOverController.cs index 1d1d4e8..16aefc5 100644 --- a/Assets/Scripts/GameOverController.cs +++ b/Assets/Scripts/GameOverController.cs @@ -26,19 +26,22 @@ public class GameOverController : MonoBehaviour { PersistentData.monsterNames = hs; //load each image - float posX = 15f; + float posX = 12.1f; foreach(string str in PersistentData.monsterNames) { Sprite spr = Resources.Load ("photos/" + str, typeof(Sprite)) as Sprite; GameObject obj = new GameObject (); obj.AddComponent (); obj.GetComponent ().sprite = spr; - obj.transform.localScale = new Vector3 (0.5f, 0.5f, 1f); + obj.transform.localScale = new Vector3 (0.3f, 0.3f, 1f); obj.transform.position = new Vector3 (posX, 0, 0); objectSet.Add (str, obj); //increment - posX += 10f; //NOTE: code duplication + posX += 8.05f; //NOTE: code duplication } + + //pause the background animation + background.GetComponent().speed = 0; } void Update() { @@ -59,6 +62,11 @@ public class GameOverController : MonoBehaviour { if (open == false) { open = true; //TODO: animate the background + background.GetComponent().speed = 1; + + + StartCoroutine (OpeningCoroutine ()); + return; } JumpLeft (); page++; @@ -69,7 +77,7 @@ public class GameOverController : MonoBehaviour { if (open == false) { scoreText.text = "Player's Score: " + PersistentData.score + "\n"; scoreText.text += "Camera Clicks: " + PersistentData.clicks + "\n"; - scoreText.text += "Monsters Captured: " + PersistentData.monsterNames.Count + "/10"; + scoreText.text += "Monsters Captured: " + PersistentData.monsterNames.Count + "/4"; } else { scoreText.enabled = false; creditText.enabled = false; @@ -77,15 +85,22 @@ public class GameOverController : MonoBehaviour { } } + IEnumerator OpeningCoroutine() { + yield return new WaitForSeconds (0.75f); + background.GetComponent ().speed = 0; + JumpLeft (); + page++; + } + void JumpLeft() { foreach(KeyValuePair pair in objectSet) { - pair.Value.transform.position = new Vector3 (pair.Value.transform.position.x - 20f, 0, 0); + pair.Value.transform.position = new Vector3 (pair.Value.transform.position.x - 16.1f, 0.5f, 0); } } void JumpRight() { foreach(KeyValuePair pair in objectSet) { - pair.Value.transform.position = new Vector3 (pair.Value.transform.position.x + 20f, 0, 0); + pair.Value.transform.position = new Vector3 (pair.Value.transform.position.x + 16.1f, 0.5f, 0); } } } diff --git a/Assets/Scripts/MonsterSpawner.cs b/Assets/Scripts/MonsterSpawner.cs index 3141462..5e9d06a 100644 --- a/Assets/Scripts/MonsterSpawner.cs +++ b/Assets/Scripts/MonsterSpawner.cs @@ -4,6 +4,9 @@ using UnityEngine; public class MonsterSpawner : MonoBehaviour { public GameObject monsterPrefab; + public GameObject monsterPrefab2; + public GameObject monsterPrefab3; + public GameObject monsterPrefab4; public Vector2 motion; public float delay; @@ -12,6 +15,16 @@ public class MonsterSpawner : MonoBehaviour { void Awake() { audioSource = GetComponent (); + if (monsterPrefab2 == null) { + monsterPrefab2 = monsterPrefab; + } + if (monsterPrefab3 == null) { + monsterPrefab3 = monsterPrefab; + } + if (monsterPrefab4 == null) { + monsterPrefab4 = monsterPrefab; + } + StartCoroutine (SpawnMonster ()); } @@ -22,6 +35,25 @@ public class MonsterSpawner : MonoBehaviour { monster.transform.position = transform.position; monster.GetComponent ().velocity = motion; audioSource.Play (); + + //ugly duplication + yield return new WaitForSeconds (delay); + monster = Instantiate (monsterPrefab2); + monster.transform.position = transform.position; + monster.GetComponent ().velocity = motion; + audioSource.Play (); + + yield return new WaitForSeconds (delay); + monster = Instantiate (monsterPrefab3); + monster.transform.position = transform.position; + monster.GetComponent ().velocity = motion; + audioSource.Play (); + + yield return new WaitForSeconds (delay); + monster = Instantiate (monsterPrefab4); + monster.transform.position = transform.position; + monster.GetComponent ().velocity = motion; + audioSource.Play (); } } }