diff --git a/Assets/JYY/Materials/AOEIndicatorChariot.mat b/Assets/JYY/Materials/AOEIndicatorChariot.mat new file mode 100644 index 00000000..87af6121 --- /dev/null +++ b/Assets/JYY/Materials/AOEIndicatorChariot.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dcb40fe8d27c00734f958ccb5cfca1102b76edfdb5f122571145eb55c6ca962 +size 976 diff --git a/Assets/JYY/Materials/Unlit_AOE_ShaderGraph.mat.meta b/Assets/JYY/Materials/AOEIndicatorChariot.mat.meta similarity index 100% rename from Assets/JYY/Materials/Unlit_AOE_ShaderGraph.mat.meta rename to Assets/JYY/Materials/AOEIndicatorChariot.mat.meta diff --git a/Assets/JYY/Materials/AOEIndicatorDynamo.mat b/Assets/JYY/Materials/AOEIndicatorDynamo.mat new file mode 100644 index 00000000..5c351085 --- /dev/null +++ b/Assets/JYY/Materials/AOEIndicatorDynamo.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c016406941b34fe25f48b1c6d681af3ad164b571e9d25855751a73699731e450 +size 3838 diff --git a/Assets/JYY/Materials/AOEIndicatorDynamo.mat.meta b/Assets/JYY/Materials/AOEIndicatorDynamo.mat.meta new file mode 100644 index 00000000..00b74f70 --- /dev/null +++ b/Assets/JYY/Materials/AOEIndicatorDynamo.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10d4d2e86cc374845a5268c025ab7c9b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Materials/AOEIndicatorHorizontal.mat b/Assets/JYY/Materials/AOEIndicatorHorizontal.mat new file mode 100644 index 00000000..f20d3ee7 --- /dev/null +++ b/Assets/JYY/Materials/AOEIndicatorHorizontal.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b5b009f809af4f2cc38f5c3f937ce5fa3393070675cc69b3b9391053bc569f2 +size 3843 diff --git a/Assets/JYY/Materials/AOEIndicatorHorizontal.mat.meta b/Assets/JYY/Materials/AOEIndicatorHorizontal.mat.meta new file mode 100644 index 00000000..36f13afe --- /dev/null +++ b/Assets/JYY/Materials/AOEIndicatorHorizontal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fdb8e6efac281d245a59752551f80076 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Materials/AOEIndicatorVertical.mat b/Assets/JYY/Materials/AOEIndicatorVertical.mat new file mode 100644 index 00000000..0a57ab49 --- /dev/null +++ b/Assets/JYY/Materials/AOEIndicatorVertical.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:248172e15cdcbc49048f40b6a0da65f4f71647db962013be53608d3c3b78cbb3 +size 3842 diff --git a/Assets/JYY/Materials/AOEIndicatorVertical.mat.meta b/Assets/JYY/Materials/AOEIndicatorVertical.mat.meta new file mode 100644 index 00000000..c0f87d2d --- /dev/null +++ b/Assets/JYY/Materials/AOEIndicatorVertical.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d7ccfbc83f505c4abd39cdc31630463 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab b/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab new file mode 100644 index 00000000..5b73b6cb --- /dev/null +++ b/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db1f3ad7db0d99b20fdfe95c0ba7248476edee0875596606eb05ac19c33e84f2 +size 4283 diff --git a/Assets/JYY/Prefabs/AOEIndicator.prefab.meta b/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab.meta similarity index 100% rename from Assets/JYY/Prefabs/AOEIndicator.prefab.meta rename to Assets/JYY/Prefabs/AOEIndicatorChariot.prefab.meta diff --git a/Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab b/Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab new file mode 100644 index 00000000..72d92b28 --- /dev/null +++ b/Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf0fd0659c187d35c8492ff925145c94fc5cac08dead6b13188f3f4cbb2f3052 +size 3988 diff --git a/Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab.meta b/Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab.meta new file mode 100644 index 00000000..cae3d210 --- /dev/null +++ b/Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 12018c889dca23d46a0d3807213c6a79 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab b/Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab new file mode 100644 index 00000000..d6ba9554 --- /dev/null +++ b/Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5dfaa59aeffa4e948edd40e96f05e2c708e491bb80c2a3446d9d1335b05adf0 +size 3995 diff --git a/Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab.meta b/Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab.meta new file mode 100644 index 00000000..586188cb --- /dev/null +++ b/Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 44d67bf59c049fb46876a549120a16d7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Prefabs/AOEIndicatorVertical.prefab b/Assets/JYY/Prefabs/AOEIndicatorVertical.prefab new file mode 100644 index 00000000..28217b13 --- /dev/null +++ b/Assets/JYY/Prefabs/AOEIndicatorVertical.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02ada0ed142206f604609397dd5b6a2349df7db879e9ab1cb7bdfc1fca8e6f75 +size 3985 diff --git a/Assets/JYY/Prefabs/AOEIndicatorVertical.prefab.meta b/Assets/JYY/Prefabs/AOEIndicatorVertical.prefab.meta new file mode 100644 index 00000000..2202360a --- /dev/null +++ b/Assets/JYY/Prefabs/AOEIndicatorVertical.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9adff7c5e2e43974fa9f2d241ef2e433 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Prefabs/[Enemy] PldDog.prefab b/Assets/JYY/Prefabs/[Enemy] PldDog.prefab new file mode 100644 index 00000000..f383c5f8 --- /dev/null +++ b/Assets/JYY/Prefabs/[Enemy] PldDog.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7b23e4a2f6475f6cfe0641a03fd4415fe2b732fe649a14f93b72ea104f250f3 +size 80026 diff --git a/Assets/JYY/Prefabs/[Enemy] PldDog.prefab.meta b/Assets/JYY/Prefabs/[Enemy] PldDog.prefab.meta new file mode 100644 index 00000000..750c82a6 --- /dev/null +++ b/Assets/JYY/Prefabs/[Enemy] PldDog.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 84456bef5d2de2149ade477b93bc9ea0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Scenes/MonsterTest.unity b/Assets/JYY/Scenes/MonsterTest.unity index 464228ac..a2f28549 100644 --- a/Assets/JYY/Scenes/MonsterTest.unity +++ b/Assets/JYY/Scenes/MonsterTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:802822f2af6dbca1cd9bc0c4561d270cd3ce198842594476be72b8216d0f51cf -size 99718 +oid sha256:ec97ec66df4283ed273c243f4aa1642c492661d1163184ce650d833e5a36bd87 +size 19269 diff --git a/Assets/JYY/Sprites/AOEIndicatorDynamo.png b/Assets/JYY/Sprites/AOEIndicatorDynamo.png new file mode 100644 index 00000000..3da5d78e --- /dev/null +++ b/Assets/JYY/Sprites/AOEIndicatorDynamo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbf944faa29482d49f4a69568586cc0024e88c2472441bc54c50efef905eb4b3 +size 105769 diff --git a/Assets/JYY/Sprites/AOEIndicatorDynamo.png.meta b/Assets/JYY/Sprites/AOEIndicatorDynamo.png.meta new file mode 100644 index 00000000..595ecc7e --- /dev/null +++ b/Assets/JYY/Sprites/AOEIndicatorDynamo.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e5e22a589905e4d45b9b2cdec3f43271 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + 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: 2 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Sprites/AOEIndicatorHorizontal.png b/Assets/JYY/Sprites/AOEIndicatorHorizontal.png new file mode 100644 index 00000000..1ea67cdd --- /dev/null +++ b/Assets/JYY/Sprites/AOEIndicatorHorizontal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec4e45bce72c4761b1e80f703474a828a3b01515f29082bfa9e56426bbfd2e3d +size 15976 diff --git a/Assets/JYY/Sprites/AOEIndicatorHorizontal.png.meta b/Assets/JYY/Sprites/AOEIndicatorHorizontal.png.meta new file mode 100644 index 00000000..2c8c358b --- /dev/null +++ b/Assets/JYY/Sprites/AOEIndicatorHorizontal.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 63954103bdc17f042bbabad6acdbbc65 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + 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: 2 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JYY/Sprites/AOEIndicatorVertical.png b/Assets/JYY/Sprites/AOEIndicatorVertical.png new file mode 100644 index 00000000..182688cc --- /dev/null +++ b/Assets/JYY/Sprites/AOEIndicatorVertical.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a96978124cc8ab6b24e17488f07395df5178735eefaec68328526940ebddba57 +size 26036 diff --git a/Assets/JYY/Sprites/AOEIndicatorVertical.png.meta b/Assets/JYY/Sprites/AOEIndicatorVertical.png.meta new file mode 100644 index 00000000..6b08f861 --- /dev/null +++ b/Assets/JYY/Sprites/AOEIndicatorVertical.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: cf8a73df42451cb408f68dca120806e1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + 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: 2 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Character/Enemy/EnemyAttackController.cs b/Assets/Scripts/Character/Enemy/EnemyAttackController.cs index c76dfdea..0eedf0a0 100644 --- a/Assets/Scripts/Character/Enemy/EnemyAttackController.cs +++ b/Assets/Scripts/Character/Enemy/EnemyAttackController.cs @@ -15,7 +15,6 @@ public class EnemyAttackController : MonoBehaviour private void Awake() { - // Awake 시점에 리스트로 묶어두면 이후 유지보수 편리 warningAreas = new List() { verticalWarningArea,