diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 1ab26f5..5d6c207 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index d786c8b..028be50 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scenes/New Scene.unity b/MoCha/Assets/Scenes/New Scene.unity new file mode 100644 index 0000000..22ddb26 Binary files /dev/null and b/MoCha/Assets/Scenes/New Scene.unity differ diff --git a/MoCha/Assets/Scenes/New Scene.unity.meta b/MoCha/Assets/Scenes/New Scene.unity.meta new file mode 100644 index 0000000..cb3e89d --- /dev/null +++ b/MoCha/Assets/Scenes/New Scene.unity.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 123274a88ffc0d94ea0d90991bc8d7d1 +timeCreated: 1523385233 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Social.unity b/MoCha/Assets/Scenes/Social.unity index 2f46c75..dfa6750 100644 Binary files a/MoCha/Assets/Scenes/Social.unity and b/MoCha/Assets/Scenes/Social.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index b48c51e..040d036 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity.meta b/MoCha/Assets/Scenes/Stats.unity.meta index ca51cf7..64b07b5 100644 --- a/MoCha/Assets/Scenes/Stats.unity.meta +++ b/MoCha/Assets/Scenes/Stats.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 8a46c34b682dbc24f80d46599b400915 -timeCreated: 1523381714 +guid: 72c1f16ac3c711345afe7dab20c53012 +timeCreated: 1523384135 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/Scenes/StepCounter.unity b/MoCha/Assets/Scenes/StepCounter.unity index c7b0310..833dbb9 100644 Binary files a/MoCha/Assets/Scenes/StepCounter.unity and b/MoCha/Assets/Scenes/StepCounter.unity differ diff --git a/MoCha/Assets/Scripts/DragAndDrop.cs b/MoCha/Assets/Scripts/DragAndDrop.cs new file mode 100644 index 0000000..e9ad180 --- /dev/null +++ b/MoCha/Assets/Scripts/DragAndDrop.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using UnityEngine.EventSystems; + +public class DragAndDrop : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler +{ + public static GameObject DraggedInstance; + + Vector3 _startPosition; + Vector3 _offsetToMouse; + float _zDistanceToCamera; + + #region Interface Implementations + + public void OnBeginDrag (PointerEventData eventData) + { + DraggedInstance = gameObject; + _startPosition = transform.position; + _zDistanceToCamera = Mathf.Abs (_startPosition.z - Camera.main.transform.position.z); + + _offsetToMouse = _startPosition - Camera.main.ScreenToWorldPoint ( + new Vector3 (Input.mousePosition.x, Input.mousePosition.y, _zDistanceToCamera) + ); + } + + public void OnDrag (PointerEventData eventData) + { + if(Input.touchCount > 1) + return; + + transform.position = Camera.main.ScreenToWorldPoint ( + new Vector3 (Input.mousePosition.x, Input.mousePosition.y, _zDistanceToCamera) + ) + _offsetToMouse; + } + + public void OnEndDrag (PointerEventData eventData) + { + DraggedInstance = null; + _offsetToMouse = Vector3.zero; + } + + #endregion +} \ No newline at end of file diff --git a/MoCha/Assets/Scripts/DragAndDrop.cs.meta b/MoCha/Assets/Scripts/DragAndDrop.cs.meta new file mode 100644 index 0000000..fa1963b --- /dev/null +++ b/MoCha/Assets/Scripts/DragAndDrop.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 3b46c0c318bc668469859d87d2627204 +timeCreated: 1523384825 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/Monster Parts/angry_eyes.png.meta b/MoCha/Assets/Sprites/Monster Parts/angry_eyes.png.meta index be848c9..12f0eba 100644 --- a/MoCha/Assets/Sprites/Monster Parts/angry_eyes.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/angry_eyes.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/bear_body.png.meta b/MoCha/Assets/Sprites/Monster Parts/bear_body.png.meta index dd164eb..74c559e 100644 --- a/MoCha/Assets/Sprites/Monster Parts/bear_body.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/bear_body.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/big_mouth.png.meta b/MoCha/Assets/Sprites/Monster Parts/big_mouth.png.meta index 5bb14df..b484c52 100644 --- a/MoCha/Assets/Sprites/Monster Parts/big_mouth.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/big_mouth.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/big_nose.png.meta b/MoCha/Assets/Sprites/Monster Parts/big_nose.png.meta index b7d8af2..351fd80 100644 --- a/MoCha/Assets/Sprites/Monster Parts/big_nose.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/big_nose.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta b/MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta index 07e1034..2d5653e 100644 --- a/MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta b/MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta index 1eed387..6a42a7b 100644 --- a/MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/cool_glasses.png.meta b/MoCha/Assets/Sprites/Monster Parts/cool_glasses.png.meta index 3114169..c3de0f0 100644 --- a/MoCha/Assets/Sprites/Monster Parts/cool_glasses.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/cool_glasses.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta b/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta index c94ac5c..9f9b006 100644 --- a/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/crown.png.meta b/MoCha/Assets/Sprites/Monster Parts/crown.png.meta index 8cc7b6a..d37b3ed 100644 --- a/MoCha/Assets/Sprites/Monster Parts/crown.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/crown.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta b/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta index fa8c4ce..bac1984 100644 --- a/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/horns.png.meta b/MoCha/Assets/Sprites/Monster Parts/horns.png.meta index 5b79b3c..acaa5ea 100644 --- a/MoCha/Assets/Sprites/Monster Parts/horns.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/horns.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/long_hair.png.meta b/MoCha/Assets/Sprites/Monster Parts/long_hair.png.meta index e1cdfce..7c28767 100644 --- a/MoCha/Assets/Sprites/Monster Parts/long_hair.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/long_hair.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/muscle_body.png.meta b/MoCha/Assets/Sprites/Monster Parts/muscle_body.png.meta index 362bb5a..fc41da0 100644 --- a/MoCha/Assets/Sprites/Monster Parts/muscle_body.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/muscle_body.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta b/MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta index d232131..145daee 100644 --- a/MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/pink_mustache.png.meta b/MoCha/Assets/Sprites/Monster Parts/pink_mustache.png.meta index 7c3c698..6e5f173 100644 --- a/MoCha/Assets/Sprites/Monster Parts/pink_mustache.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/pink_mustache.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/purple_mullet.png.meta b/MoCha/Assets/Sprites/Monster Parts/purple_mullet.png.meta index 66e4c81..76b467d 100644 --- a/MoCha/Assets/Sprites/Monster Parts/purple_mullet.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/purple_mullet.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/red_lips.png.meta b/MoCha/Assets/Sprites/Monster Parts/red_lips.png.meta index 2cfb0e8..232969b 100644 --- a/MoCha/Assets/Sprites/Monster Parts/red_lips.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/red_lips.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/robot.png.meta b/MoCha/Assets/Sprites/Monster Parts/robot.png.meta index f64fb2a..6add3e0 100644 --- a/MoCha/Assets/Sprites/Monster Parts/robot.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/robot.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/silly_eyes.png.meta b/MoCha/Assets/Sprites/Monster Parts/silly_eyes.png.meta index 4aa1524..9381b8b 100644 --- a/MoCha/Assets/Sprites/Monster Parts/silly_eyes.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/silly_eyes.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/smily_face.png.meta b/MoCha/Assets/Sprites/Monster Parts/smily_face.png.meta index 02449d7..c5372b4 100644 --- a/MoCha/Assets/Sprites/Monster Parts/smily_face.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/smily_face.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/spiky_hair.png.meta b/MoCha/Assets/Sprites/Monster Parts/spiky_hair.png.meta index fbfc24f..f9af257 100644 --- a/MoCha/Assets/Sprites/Monster Parts/spiky_hair.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/spiky_hair.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/square_glasses.png.meta b/MoCha/Assets/Sprites/Monster Parts/square_glasses.png.meta index 9836bdd..cf16711 100644 --- a/MoCha/Assets/Sprites/Monster Parts/square_glasses.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/square_glasses.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/square_head.png.meta b/MoCha/Assets/Sprites/Monster Parts/square_head.png.meta index 31f5f39..b907d48 100644 --- a/MoCha/Assets/Sprites/Monster Parts/square_head.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/square_head.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/squiggly_mouth.png.meta b/MoCha/Assets/Sprites/Monster Parts/squiggly_mouth.png.meta index 4997237..7ce0383 100644 --- a/MoCha/Assets/Sprites/Monster Parts/squiggly_mouth.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/squiggly_mouth.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/tophat.png.meta b/MoCha/Assets/Sprites/Monster Parts/tophat.png.meta index 8eeab9b..c2f1fc5 100644 --- a/MoCha/Assets/Sprites/Monster Parts/tophat.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/tophat.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/Assets/Sprites/Monster Parts/trap_head.png.meta b/MoCha/Assets/Sprites/Monster Parts/trap_head.png.meta index 8570a03..c0cbcba 100644 --- a/MoCha/Assets/Sprites/Monster Parts/trap_head.png.meta +++ b/MoCha/Assets/Sprites/Monster Parts/trap_head.png.meta @@ -8,7 +8,7 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -1 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,7 +50,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 diff --git a/MoCha/ProjectSettings/EditorBuildSettings.asset b/MoCha/ProjectSettings/EditorBuildSettings.asset index a08be6f..d6f58bb 100644 Binary files a/MoCha/ProjectSettings/EditorBuildSettings.asset and b/MoCha/ProjectSettings/EditorBuildSettings.asset differ