From cdfb83428521b0f38ab560e0dd6a7d81a5876dd6 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 23 Apr 2018 10:12:50 +1000 Subject: [PATCH] Smoothed out a few things --- Assets/Palettes/Background.prefab | 17 +- Assets/Scenes/gameplay.unity | 168 ++++++++++++++++-- Assets/Scripts/Bomb.cs | 4 +- Assets/Scripts/ExplosionSoundManager.cs | 22 +-- Assets/Scripts/Lollipop.cs | 29 +++ ...ollipopSaysHi.cs.meta => Lollipop.cs.meta} | 0 Assets/Scripts/LollipopSaysHi.cs | 29 --- Assets/Scripts/Player.cs | 19 +- Assets/Scripts/PressurePlate.cs | 12 +- Assets/Splash.meta | 10 ++ Assets/Splash/fire_candy.png | 3 + Assets/Splash/fire_candy.png.meta | 78 ++++++++ Assets/Splash/ice_candy.png | 3 + Assets/Splash/ice_candy.png.meta | 78 ++++++++ Assets/Splash/wind_candy.png | 3 + Assets/Splash/wind_candy.png.meta | 78 ++++++++ 16 files changed, 465 insertions(+), 88 deletions(-) create mode 100644 Assets/Scripts/Lollipop.cs rename Assets/Scripts/{LollipopSaysHi.cs.meta => Lollipop.cs.meta} (100%) delete mode 100644 Assets/Scripts/LollipopSaysHi.cs create mode 100644 Assets/Splash.meta create mode 100644 Assets/Splash/fire_candy.png create mode 100644 Assets/Splash/fire_candy.png.meta create mode 100644 Assets/Splash/ice_candy.png create mode 100644 Assets/Splash/ice_candy.png.meta create mode 100644 Assets/Splash/wind_candy.png create mode 100644 Assets/Splash/wind_candy.png.meta diff --git a/Assets/Palettes/Background.prefab b/Assets/Palettes/Background.prefab index 2bcf1eb..f6f51c7 100644 --- a/Assets/Palettes/Background.prefab +++ b/Assets/Palettes/Background.prefab @@ -231,18 +231,9 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 - - first: {x: 1, y: 1, z: 0} - second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 11400000, guid: ccd1189a390b74c4d9498bd35441a9a5, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 93829538c60c13b4da7dfa6981eab367, type: 2} @@ -267,7 +258,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: dd338c7a2fd4336478dd5a86fbef1eea, type: 2} m_TileSpriteArray: - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 21300000, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300002, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} @@ -292,7 +283,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 21300038, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} m_TileMatrixArray: - - m_RefCount: 11 + - m_RefCount: 10 m_Data: e00: 1 e01: 0 @@ -311,7 +302,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 11 + - m_RefCount: 10 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 0 m_Data: {r: 0.0000006854534, g: 0, b: 21.724108, a: 1e-45} diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index ab47c60..991aca9 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -854,6 +854,15 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 8, y: -53, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 9, y: -53, z: 0} second: m_TileIndex: 0 @@ -926,6 +935,15 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 8, y: -52, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 9, y: -52, z: 0} second: m_TileIndex: 0 @@ -4220,6 +4238,24 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 2, y: -17, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 3, y: -17, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 5, y: -17, z: 0} second: m_TileIndex: 0 @@ -4294,8 +4330,8 @@ Tilemap: m_ColliderType: 1 - first: {x: -3, y: -16, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -4670,6 +4706,24 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 2, y: -14, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 3, y: -14, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 8, y: -14, z: 0} second: m_TileIndex: 0 @@ -4987,8 +5041,8 @@ Tilemap: m_ColliderType: 1 - first: {x: 9, y: -11, z: 0} second: - m_TileIndex: 8 - m_TileSpriteIndex: 8 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -6760,7 +6814,7 @@ Tilemap: m_ColliderType: 1 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 674 + - m_RefCount: 680 m_Data: {fileID: 11400000, guid: ccd1189a390b74c4d9498bd35441a9a5, type: 2} - m_RefCount: 10 m_Data: {fileID: 11400000, guid: 93829538c60c13b4da7dfa6981eab367, type: 2} @@ -6779,7 +6833,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 30d0b2978e177d44e9d08a251c9f6fe4, type: 2} m_TileSpriteArray: - - m_RefCount: 674 + - m_RefCount: 680 m_Data: {fileID: 21300000, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} - m_RefCount: 10 m_Data: {fileID: 21300002, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} @@ -6798,7 +6852,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 21300034, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} m_TileMatrixArray: - - m_RefCount: 692 + - m_RefCount: 698 m_Data: e00: 1 e01: 0 @@ -6817,7 +6871,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 692 + - m_RefCount: 698 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -7907,6 +7961,7 @@ GameObject: - component: {fileID: 536953981} - component: {fileID: 536953980} - component: {fileID: 536953979} + - component: {fileID: 536953982} - component: {fileID: 536953978} m_Layer: 0 m_Name: Lollipop @@ -7995,12 +8050,27 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 536953977} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.541, y: -8.325, z: 0} + m_LocalPosition: {x: 1.44, y: -8.32, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &536953982 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 536953977} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.04} + serializedVersion: 2 + m_Radius: 0.08 --- !u!4 &549292835 stripped Transform: m_PrefabParentObject: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, @@ -9572,6 +9642,33 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 7, y: -54, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 8, y: -54, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 9, y: -54, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 10, y: -54, z: 0} second: m_TileIndex: 0 @@ -9590,6 +9687,15 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 7, y: -53, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 17, y: -53, z: 0} second: m_TileIndex: 0 @@ -9599,6 +9705,15 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 7, y: -52, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 17, y: -52, z: 0} second: m_TileIndex: 0 @@ -9608,6 +9723,33 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 7, y: -51, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 8, y: -51, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 9, y: -51, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 10, y: -51, z: 0} second: m_TileIndex: 0 @@ -11878,17 +12020,17 @@ Tilemap: m_ColliderType: 1 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 278 + - m_RefCount: 286 m_Data: {fileID: 11400000, guid: 0da8836ae05e77a46a3953aa2b346809, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} m_TileSpriteArray: - - m_RefCount: 278 + - m_RefCount: 286 m_Data: {fileID: 21300010, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 278 + - m_RefCount: 286 m_Data: e00: 1 e01: 0 @@ -11907,7 +12049,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 278 + - m_RefCount: 286 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scripts/Bomb.cs b/Assets/Scripts/Bomb.cs index 524466b..893ddfa 100644 --- a/Assets/Scripts/Bomb.cs +++ b/Assets/Scripts/Bomb.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using UnityEngine; public class Bomb : MonoBehaviour { - - Animator animator; + Animator animator; Rigidbody2D rigidBody; public float timer; @@ -16,7 +15,6 @@ public class Bomb : MonoBehaviour { public Respawner respawner; //this can be respawned float birthTime; - void Awake() { animator = GetComponent (); diff --git a/Assets/Scripts/ExplosionSoundManager.cs b/Assets/Scripts/ExplosionSoundManager.cs index 343abc1..c046188 100644 --- a/Assets/Scripts/ExplosionSoundManager.cs +++ b/Assets/Scripts/ExplosionSoundManager.cs @@ -3,21 +3,15 @@ using System.Collections.Generic; using UnityEngine; public class ExplosionSoundManager : MonoBehaviour { + AudioSource asrc; - static AudioSource asrc; - - - // Use this for initialization void Awake () { - if (asrc == null) - { - asrc = GetComponent(); - asrc.Play(); - } - } - - - void LateUpdate () { - asrc = null; + asrc = GetComponent(); + + //only play the explosion sound if the player is close enough to hear it + Vector3 playerPos = GameObject.Find ("Player").transform.position; + if (Vector3.Distance(transform.position, playerPos) <= 1) { + asrc.Play(); + } } } diff --git a/Assets/Scripts/Lollipop.cs b/Assets/Scripts/Lollipop.cs new file mode 100644 index 0000000..e04fa2f --- /dev/null +++ b/Assets/Scripts/Lollipop.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Lollipop : MonoBehaviour { + Animator animator; + + public float timeTillWave = 10; + float timeAccumulated; + + void Awake () { + animator = GetComponent(); + timeAccumulated = Random.Range(0, timeTillWave); + } + + void Update () { + timeAccumulated += Time.deltaTime; + if (timeAccumulated >= timeTillWave) { + if (Random.Range(0, 2) == 0) { + animator.SetTrigger("SayHi"); + } + timeAccumulated = 0; + } + } + + void OnTriggerEnter2D(Collider2D collider) { + //TODO: begin the end screen process + } +} diff --git a/Assets/Scripts/LollipopSaysHi.cs.meta b/Assets/Scripts/Lollipop.cs.meta similarity index 100% rename from Assets/Scripts/LollipopSaysHi.cs.meta rename to Assets/Scripts/Lollipop.cs.meta diff --git a/Assets/Scripts/LollipopSaysHi.cs b/Assets/Scripts/LollipopSaysHi.cs deleted file mode 100644 index 37e48e6..0000000 --- a/Assets/Scripts/LollipopSaysHi.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LollipopSaysHi : MonoBehaviour { - - float timeAccumulated; - public float timeTillWave = 10; - // Use this for initialization - Animator a; - - void Start () { - timeAccumulated = Random.Range(0, timeTillWave); - a = GetComponent(); - } - - // Update is called once per frame - void Update () { - timeAccumulated += Time.deltaTime; - if (timeAccumulated >= timeTillWave) - { - if (Random.Range(0, 2) == 0) - { - a.SetTrigger("SayHi"); - } - timeAccumulated = 0; - } - } -} diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index be67a2f..8468f9a 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -21,15 +21,14 @@ public class Player : MonoBehaviour { public GameObject icePelletPrefab; public GameObject windPelletPrefab; - AudioSource aSource; - public AudioClip fireClip, iceClip, windClip, switchClip; - + AudioSource aSource; + public AudioClip fireClip, iceClip, windClip, switchClip; void Awake() { animator = GetComponent (); rigidBody = GetComponent (); witchAnimateScript = GetComponent (); - aSource = GetComponent(); + aSource = GetComponent(); speed = 0.79f; } @@ -55,7 +54,7 @@ public class Player : MonoBehaviour { lastDirection = rigidBody.velocity; } - if (Input.GetButtonDown("Switch")) aSource.PlayOneShot(switchClip); + if (Input.GetButtonDown("Switch")) aSource.PlayOneShot(switchClip); } void Move() { @@ -72,16 +71,16 @@ public class Player : MonoBehaviour { switch (witchAnimateScript.el) { case witchAnimate.Element.fire: - aSource.PlayOneShot(fireClip); + aSource.PlayOneShot(fireClip); pellet = Instantiate (firePelletPrefab); break; case witchAnimate.Element.ice: - aSource.PlayOneShot(iceClip); - pellet = Instantiate (icePelletPrefab); + aSource.PlayOneShot(iceClip); + pellet = Instantiate (icePelletPrefab); break; case witchAnimate.Element.wind: - aSource.PlayOneShot(windClip); - pellet = Instantiate (windPelletPrefab); + aSource.PlayOneShot(windClip); + pellet = Instantiate (windPelletPrefab); break; } diff --git a/Assets/Scripts/PressurePlate.cs b/Assets/Scripts/PressurePlate.cs index a8421c9..ab4c32e 100644 --- a/Assets/Scripts/PressurePlate.cs +++ b/Assets/Scripts/PressurePlate.cs @@ -10,12 +10,12 @@ public class PressurePlate : MonoBehaviour { GameObject presser; - AudioSource asrc; - public AudioClip sound; + AudioSource asrc; + public AudioClip sound; void Awake() { spriteRenderer = GetComponent (); - asrc = GetComponent(); + asrc = GetComponent(); } void OnTriggerEnter2D(Collider2D collider) { @@ -26,7 +26,7 @@ public class PressurePlate : MonoBehaviour { presser = go; pressed = true; SwitchSprite (); - asrc.PlayOneShot(sound); + asrc.PlayOneShot(sound); } } } @@ -36,8 +36,8 @@ public class PressurePlate : MonoBehaviour { presser = null; pressed = false; SwitchSprite (); - asrc.PlayOneShot(sound); - } + asrc.PlayOneShot(sound); + } } void SwitchSprite() { diff --git a/Assets/Splash.meta b/Assets/Splash.meta new file mode 100644 index 0000000..cfaf218 --- /dev/null +++ b/Assets/Splash.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f8d7806adf7457246ba959941cdbaf92 +folderAsset: yes +timeCreated: 1524441716 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Splash/fire_candy.png b/Assets/Splash/fire_candy.png new file mode 100644 index 0000000..cacecee --- /dev/null +++ b/Assets/Splash/fire_candy.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97c0cda5d628a618146509e407cf82dc3c11576eb55ccca86bb53d4ba0cd8765 +size 197138 diff --git a/Assets/Splash/fire_candy.png.meta b/Assets/Splash/fire_candy.png.meta new file mode 100644 index 0000000..fd61766 --- /dev/null +++ b/Assets/Splash/fire_candy.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 2228f791ae2dcb648bae891c6fd7cffc +timeCreated: 1524441716 +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} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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/Splash/ice_candy.png b/Assets/Splash/ice_candy.png new file mode 100644 index 0000000..db6abc7 --- /dev/null +++ b/Assets/Splash/ice_candy.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d83242768ab4fb9b6e2f8f8f6fe2f77398b5361751fc6ae926c001be2374a7da +size 203055 diff --git a/Assets/Splash/ice_candy.png.meta b/Assets/Splash/ice_candy.png.meta new file mode 100644 index 0000000..8868267 --- /dev/null +++ b/Assets/Splash/ice_candy.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 31260aa2f02147941a94f59d77108f96 +timeCreated: 1524441717 +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} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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/Splash/wind_candy.png b/Assets/Splash/wind_candy.png new file mode 100644 index 0000000..b591d0f --- /dev/null +++ b/Assets/Splash/wind_candy.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69f64965e8f5454dccbea86849e0beee98d8109923a3bd21635eb7fbde0492e3 +size 200293 diff --git a/Assets/Splash/wind_candy.png.meta b/Assets/Splash/wind_candy.png.meta new file mode 100644 index 0000000..8ae6660 --- /dev/null +++ b/Assets/Splash/wind_candy.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: cced053be43565345a06a82d6aaef538 +timeCreated: 1524441717 +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} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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: