diff --git a/.gitignore b/.gitignore index 5aafcbb..ab1f014 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ sysinfo.txt # Builds *.apk *.unitypackage +*.meta +Assets/Sprites/Obstacle Pillar/Bricks02.png.meta +Assets/Sprites/Obstacle Pillar/Bricks02.png.meta diff --git a/Assets/RandomSoundPlayer.cs b/Assets/RandomSoundPlayer.cs new file mode 100644 index 0000000..2c5c44e --- /dev/null +++ b/Assets/RandomSoundPlayer.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RandomSoundPlayer : MonoBehaviour +{ + public AudioClip[] sounds; + + public float minTime = 1f; + public float maxTime = 10f; + + float timer = 3f; + AudioSource audio; + + + void Start() + { + audio = gameObject.GetComponent(); + } + + void Update () + { + if(timer > 0) + { + timer -= Time.deltaTime; + } + else + { + audio.clip = sounds[Random.Range(0, sounds.Length)]; + audio.Play(); + timer = Random.Range(minTime, maxTime); + + //Debug.Log("win"); + } + + } +} diff --git a/Assets/RandomSoundPlayer.cs.meta b/Assets/RandomSoundPlayer.cs.meta new file mode 100644 index 0000000..4c3a215 --- /dev/null +++ b/Assets/RandomSoundPlayer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8b710dbf41dbd9a4db0cca454b3a519e +timeCreated: 1485083579 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 76a3a7b..e715b07 100644 Binary files a/Assets/Scenes/MainMenu.unity and b/Assets/Scenes/MainMenu.unity differ diff --git a/Assets/Scenes/TheLevel - Tobias.unity b/Assets/Scenes/TheLevel - Tobias.unity new file mode 100644 index 0000000..a5693b8 Binary files /dev/null and b/Assets/Scenes/TheLevel - Tobias.unity differ diff --git a/Assets/Scenes/TheLevel - Tobias.unity.meta b/Assets/Scenes/TheLevel - Tobias.unity.meta new file mode 100644 index 0000000..f7b7b4a --- /dev/null +++ b/Assets/Scenes/TheLevel - Tobias.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd62fed4e3ca37d43a5a026988c93380 +timeCreated: 1485086075 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Obstacle Pillar.meta b/Assets/Sounds.meta similarity index 67% rename from Assets/Sprites/Obstacle Pillar.meta rename to Assets/Sounds.meta index 351eb40..5b8dba6 100644 --- a/Assets/Sprites/Obstacle Pillar.meta +++ b/Assets/Sounds.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 37a939753c322d44c9ab4d6f495b127f +guid: 150d1ea7cf6eddb46bdb7411af0889e3 folderAsset: yes -timeCreated: 1485043984 +timeCreated: 1485083521 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Sounds/endlessOOHHHRHHR.wav b/Assets/Sounds/endlessOOHHHRHHR.wav new file mode 100644 index 0000000..5f4e5f2 Binary files /dev/null and b/Assets/Sounds/endlessOOHHHRHHR.wav differ diff --git a/Assets/Sounds/endlessOOHHHRHHR.wav.meta b/Assets/Sounds/endlessOOHHHRHHR.wav.meta new file mode 100644 index 0000000..a45ff32 --- /dev/null +++ b/Assets/Sounds/endlessOOHHHRHHR.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a84cd6054507b91468a0d0ed3431e754 +timeCreated: 1485083530 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/oh1.wav b/Assets/Sounds/oh1.wav new file mode 100644 index 0000000..a9dd39e Binary files /dev/null and b/Assets/Sounds/oh1.wav differ diff --git a/Assets/Sounds/oh1.wav.meta b/Assets/Sounds/oh1.wav.meta new file mode 100644 index 0000000..f3b87b1 --- /dev/null +++ b/Assets/Sounds/oh1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d612a1ccae19c4f4a9a56c27a9102283 +timeCreated: 1485083531 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/oh2.wav b/Assets/Sounds/oh2.wav new file mode 100644 index 0000000..0a81afc Binary files /dev/null and b/Assets/Sounds/oh2.wav differ diff --git a/Assets/Sounds/oh2.wav.meta b/Assets/Sounds/oh2.wav.meta new file mode 100644 index 0000000..7e7baed --- /dev/null +++ b/Assets/Sounds/oh2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e07aa05cf9a63ac44b2cc7f1fb5f9679 +timeCreated: 1485083531 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/oh3.wav b/Assets/Sounds/oh3.wav new file mode 100644 index 0000000..b9f7b8a Binary files /dev/null and b/Assets/Sounds/oh3.wav differ diff --git a/Assets/Sounds/oh3.wav.meta b/Assets/Sounds/oh3.wav.meta new file mode 100644 index 0000000..47b78aa --- /dev/null +++ b/Assets/Sounds/oh3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1b2e5f4ff444d5b4babff224bd76741f +timeCreated: 1485084498 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/oh4.wav b/Assets/Sounds/oh4.wav new file mode 100644 index 0000000..749a06a Binary files /dev/null and b/Assets/Sounds/oh4.wav differ diff --git a/Assets/Sounds/oh4.wav.meta b/Assets/Sounds/oh4.wav.meta new file mode 100644 index 0000000..a238839 --- /dev/null +++ b/Assets/Sounds/oh4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b3d3a05bfa9067f45832e239f9a59406 +timeCreated: 1485084498 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/oh5.wav b/Assets/Sounds/oh5.wav new file mode 100644 index 0000000..a46948a Binary files /dev/null and b/Assets/Sounds/oh5.wav differ diff --git a/Assets/Sounds/oh5.wav.meta b/Assets/Sounds/oh5.wav.meta new file mode 100644 index 0000000..95ef447 --- /dev/null +++ b/Assets/Sounds/oh5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e888b04b46d8b664086203eb86a8b123 +timeCreated: 1485084499 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/shit.wav b/Assets/Sounds/shit.wav new file mode 100644 index 0000000..849322d Binary files /dev/null and b/Assets/Sounds/shit.wav differ diff --git a/Assets/Sounds/shit.wav.meta b/Assets/Sounds/shit.wav.meta new file mode 100644 index 0000000..3bd01dc --- /dev/null +++ b/Assets/Sounds/shit.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0dbcc211bd30a4649bcec1f87ad5f505 +timeCreated: 1485084497 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Level/Temple.png.meta b/Assets/Sprites/Level/Temple.png.meta index 48c26f3..821b006 100644 --- a/Assets/Sprites/Level/Temple.png.meta +++ b/Assets/Sprites/Level/Temple.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 6ef22a758f930a945bc2330850e11346 +timeCreated: 1485081913 +======= guid: c708ce64d35cbd54ea474a0e9961b995 timeCreated: 1485083350 +>>>>>>> origin/master licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/Sprites/Obstacle Pillar/Bricks01.png.meta b/Assets/Sprites/Obstacle Pillar/Bricks01.png.meta deleted file mode 100644 index 8d37f6c..0000000 --- a/Assets/Sprites/Obstacle Pillar/Bricks01.png.meta +++ /dev/null @@ -1,68 +0,0 @@ -fileFormatVersion: 2 -guid: 9a4ce71b62af8f34d96fd6f7405eefb9 -timeCreated: 1485083349 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - 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: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 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 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/Obstacle Pillar/Bricks02.png b/Assets/Sprites/Obstacle Pillar/Bricks02.png new file mode 100644 index 0000000..f309523 Binary files /dev/null and b/Assets/Sprites/Obstacle Pillar/Bricks02.png differ diff --git a/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Body.png b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Body.png new file mode 100644 index 0000000..c015d7b Binary files /dev/null and b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Body.png differ diff --git a/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long.png b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long.png new file mode 100644 index 0000000..b4d6fe7 Binary files /dev/null and b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long.png differ diff --git a/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long_Ver_2.png b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long_Ver_2.png new file mode 100644 index 0000000..7e36aa1 Binary files /dev/null and b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long_Ver_2.png differ diff --git a/Assets/Sprites/Obstacle Pillar/Ground_Pillar.png.meta b/Assets/Sprites/Obstacle Pillar/Ground_Pillar.png.meta deleted file mode 100644 index 01ae01d..0000000 --- a/Assets/Sprites/Obstacle Pillar/Ground_Pillar.png.meta +++ /dev/null @@ -1,68 +0,0 @@ -fileFormatVersion: 2 -guid: 8501350e49d5fd94a98779150e90165b -timeCreated: 1485043984 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - 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: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 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 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/Obstacle Pillar/Ground_half_Pillar.png b/Assets/Sprites/Obstacle Pillar/Ground_half_Pillar.png new file mode 100644 index 0000000..926e4d2 Binary files /dev/null and b/Assets/Sprites/Obstacle Pillar/Ground_half_Pillar.png differ diff --git a/Assets/Sprites/Obstacle Pillar/Rotating_Pillar.png.meta b/Assets/Sprites/Obstacle Pillar/Rotating_Pillar.png.meta deleted file mode 100644 index 8a9cba3..0000000 --- a/Assets/Sprites/Obstacle Pillar/Rotating_Pillar.png.meta +++ /dev/null @@ -1,76 +0,0 @@ -fileFormatVersion: 2 -guid: e4836780548e1be4baacfaf31c7e4e8a -timeCreated: 1485046218 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - 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: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 9 - spritePivot: {x: 0.43585768, y: 0.537244} - 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 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: