diff --git a/Gameton-06/Assets/Gameton/Art/Material/Sprite-Outline.shader b/Gameton-06/Assets/Gameton/Art/Material/Sprite-Outline.shader deleted file mode 100644 index f37d9555..00000000 --- a/Gameton-06/Assets/Gameton/Art/Material/Sprite-Outline.shader +++ /dev/null @@ -1,81 +0,0 @@ -Shader "Sprites/Outline" -{ - Properties - { - [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - [MaterialToggle] PixelSnap ("Pixel snap", Float) = 0 - [HideInInspector] _RendererColor ("RendererColor", Color) = (1,1,1,1) - [HideInInspector] _Flip ("Flip", Vector) = (1,1,1,1) - [PerRendererData] _AlphaTex ("External Alpha", 2D) = "white" {} - [PerRendererData] _EnableExternalAlpha ("Enable External Alpha", Float) = 0 - - // Add values to determine if outlining is enabled and outline color. - [PerRendererData] _Outline("Outline", Float) = 0 - [PerRendererData] _OutlineColor("Outline Color", Color) = (1,1,1,1) - [PerRendererData] _OutlineSize("Outline Size", int) = 1 - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Cull Off - Lighting Off - ZWrite Off - Blend One OneMinusSrcAlpha - - Pass - { - CGPROGRAM - #pragma vertex SpriteVert - #pragma fragment frag - #pragma target 2.0 - #pragma multi_compile_instancing - #pragma multi_compile _ PIXELSNAP_ON - #pragma multi_compile _ ETC1_EXTERNAL_ALPHA - #include "UnitySprites.cginc" - - float _Outline; - fixed4 _OutlineColor; - int _OutlineSize; - float4 _MainTex_TexelSize; - - fixed4 frag(v2f IN) : SV_Target - { - fixed4 c = SampleSpriteTexture(IN.texcoord) * IN.color; - - // If outline is enabled and there is a pixel, try to draw an outline. - if (_Outline > 0 && c.a != 0) { - float totalAlpha = 1.0; - - [unroll(16)] - for (int i = 1; i < _OutlineSize + 1; i++) { - fixed4 pixelUp = tex2D(_MainTex, IN.texcoord + fixed2(0, i * _MainTex_TexelSize.y)); - fixed4 pixelDown = tex2D(_MainTex, IN.texcoord - fixed2(0,i * _MainTex_TexelSize.y)); - fixed4 pixelRight = tex2D(_MainTex, IN.texcoord + fixed2(i * _MainTex_TexelSize.x, 0)); - fixed4 pixelLeft = tex2D(_MainTex, IN.texcoord - fixed2(i * _MainTex_TexelSize.x, 0)); - - totalAlpha = totalAlpha * pixelUp.a * pixelDown.a * pixelRight.a * pixelLeft.a; - } - - if (totalAlpha == 0) { - c.rgba = fixed4(1, 1, 1, 1) * _OutlineColor; - } - } - - c.rgb *= c.a; - - return c; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Gameton-06/Assets/Gameton/Art/Material/Sprite-Outline.shader.meta b/Gameton-06/Assets/Gameton/Art/Material/Sprite-Outline.shader.meta deleted file mode 100644 index b164572a..00000000 --- a/Gameton-06/Assets/Gameton/Art/Material/Sprite-Outline.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f22e64e2b31da2d4a994900ca8134d29 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.cs b/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.cs deleted file mode 100644 index c29716be..00000000 --- a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Unity.VisualScripting; -using UnityEngine; - -namespace TON -{ - [ExecuteInEditMode] - public class SpriteOutline : MonoBehaviour - { - public Color color = Color.white; - - [Range(0, 16)] - public int outlineSize = 1; - - private SpriteRenderer spriteRenderer; - - void OnEnable() - { - spriteRenderer = GetComponent(); - - // UpdateOutline(true); - } - - // void OnDisable() - // { - // UpdateOutline(false); - // } - - // void Update() - // { - // UpdateOutline(true); - // } - - void OnTriggerEnter2D(Collider2D other) - { - if (other.CompareTag("Player")) // 플레이어가 접근하면 - { - UpdateOutline(true); - } - } - - void OnTriggerExit2D(Collider2D other) - { - if (other.CompareTag("Player")) // 플레이어가 나가면 - { - UpdateOutline(false); - } - } - - void UpdateOutline(bool outline) - { - MaterialPropertyBlock mpb = new MaterialPropertyBlock(); - spriteRenderer.GetPropertyBlock(mpb); - mpb.SetFloat("_Outline", outline ? 1f : 0); - mpb.SetColor("_OutlineColor", color); - mpb.SetFloat("_OutlineSize", outlineSize); - spriteRenderer.SetPropertyBlock(mpb); - } - } -} diff --git a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.cs.meta b/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.cs.meta deleted file mode 100644 index bb2ade19..00000000 --- a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5a4f80448bcd1dc408e6351abed25238 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.mat b/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.mat deleted file mode 100644 index f85b8858..00000000 --- a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.mat +++ /dev/null @@ -1,95 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SpriteOutline - m_Shader: {fileID: 4800000, guid: f22e64e2b31da2d4a994900ca8134d29, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - PIXELSNAP_ON - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - PixelSnap: 1 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EnableExternalAlpha: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Outline: 0 - - _OutlineSize: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.mat.meta b/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.mat.meta deleted file mode 100644 index 9c162a93..00000000 --- a/Gameton-06/Assets/Gameton/Art/Material/SpriteOutline.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e0e8dfd090d9b9242a44b05790ed39cd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/Material.meta b/Gameton-06/Assets/Gameton/Art/Sound.meta similarity index 77% rename from Gameton-06/Assets/Gameton/Art/Material.meta rename to Gameton-06/Assets/Gameton/Art/Sound.meta index 53873f5f..82e05c59 100644 --- a/Gameton-06/Assets/Gameton/Art/Material.meta +++ b/Gameton-06/Assets/Gameton/Art/Sound.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f58676c80e0a5340b2f8593db0ebc38 +guid: 7af518fa4eb1925439c0cd172a42f25b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Gameton-06/Assets/Gameton/Art/Title Button.png b/Gameton-06/Assets/Gameton/Art/UI Image/Title Button.png similarity index 100% rename from Gameton-06/Assets/Gameton/Art/Title Button.png rename to Gameton-06/Assets/Gameton/Art/UI Image/Title Button.png diff --git a/Gameton-06/Assets/Gameton/Art/Title Button.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/Title Button.png.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Art/Title Button.png.meta rename to Gameton-06/Assets/Gameton/Art/UI Image/Title Button.png.meta diff --git a/Gameton-06/Assets/Gameton/Art/Title Image.png b/Gameton-06/Assets/Gameton/Art/UI Image/Title Image.png similarity index 100% rename from Gameton-06/Assets/Gameton/Art/Title Image.png rename to Gameton-06/Assets/Gameton/Art/UI Image/Title Image.png diff --git a/Gameton-06/Assets/Gameton/Art/Title Image.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/Title Image.png.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Art/Title Image.png.meta rename to Gameton-06/Assets/Gameton/Art/UI Image/Title Image.png.meta diff --git a/Gameton-06/Assets/Gameton/Art/character_background.png b/Gameton-06/Assets/Gameton/Art/UI Image/character_background.png similarity index 100% rename from Gameton-06/Assets/Gameton/Art/character_background.png rename to Gameton-06/Assets/Gameton/Art/UI Image/character_background.png diff --git a/Gameton-06/Assets/Gameton/Art/character_background.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/character_background.png.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Art/character_background.png.meta rename to Gameton-06/Assets/Gameton/Art/UI Image/character_background.png.meta diff --git a/Gameton-06/Assets/Gameton/Art/lock.png b/Gameton-06/Assets/Gameton/Art/UI Image/lock.png similarity index 100% rename from Gameton-06/Assets/Gameton/Art/lock.png rename to Gameton-06/Assets/Gameton/Art/UI Image/lock.png diff --git a/Gameton-06/Assets/Gameton/Art/lock.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/lock.png.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Art/lock.png.meta rename to Gameton-06/Assets/Gameton/Art/UI Image/lock.png.meta diff --git a/Gameton-06/Assets/Gameton/Art/info.png b/Gameton-06/Assets/Gameton/Art/info.png deleted file mode 100644 index f0001d0f..00000000 --- a/Gameton-06/Assets/Gameton/Art/info.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6b4e611b7c149b68e6c86c0ac62429e3b226e4e6f27c23e46b27bf046cf9c8f -size 21337 diff --git a/Gameton-06/Assets/Gameton/Art/info.png.meta b/Gameton-06/Assets/Gameton/Art/info.png.meta deleted file mode 100644 index cc23ef7f..00000000 --- a/Gameton-06/Assets/Gameton/Art/info.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 65b1d186d72869c4f8a74b2b279c03f8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - 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 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/info_inside.png b/Gameton-06/Assets/Gameton/Art/info_inside.png deleted file mode 100644 index 6223cf8c..00000000 --- a/Gameton-06/Assets/Gameton/Art/info_inside.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57b79753a73ea85275fadcd1f80e2b79f75219d8f69b377743e9355cfea8606b -size 1264 diff --git a/Gameton-06/Assets/Gameton/Art/info_inside.png.meta b/Gameton-06/Assets/Gameton/Art/info_inside.png.meta deleted file mode 100644 index cc29b774..00000000 --- a/Gameton-06/Assets/Gameton/Art/info_inside.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 24e416a6bcaf5064697f013a21cadded -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - 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 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: