diff --git a/Assets/LYM/Ani.meta b/Assets/LYM/Ani.meta new file mode 100644 index 00000000..f609d49d --- /dev/null +++ b/Assets/LYM/Ani.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af0f344c05e45c34ba51690e81ebce3c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LYM/Ani/DoingAniController.controller b/Assets/LYM/Ani/DoingAniController.controller new file mode 100644 index 00000000..6a40dc2f --- /dev/null +++ b/Assets/LYM/Ani/DoingAniController.controller @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bec50c4378c2ea66084d466b15c9e4001e935bec15ffce19d55466cd5197d1f3 +size 5949 diff --git a/Assets/LYM/Sprites/LanudryMachine/LaundryMachine.controller.meta b/Assets/LYM/Ani/DoingAniController.controller.meta similarity index 100% rename from Assets/LYM/Sprites/LanudryMachine/LaundryMachine.controller.meta rename to Assets/LYM/Ani/DoingAniController.controller.meta diff --git a/Assets/LYM/Ani/Dungeon.anim b/Assets/LYM/Ani/Dungeon.anim new file mode 100644 index 00000000..4326e60b --- /dev/null +++ b/Assets/LYM/Ani/Dungeon.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11137cf31ea73e8b5e8de7b67996d6572a8a36408191fa6ccc0014af2d227644 +size 11442 diff --git a/Assets/LYM/Sprites/Salad/refrigeratorAni.anim.meta b/Assets/LYM/Ani/Dungeon.anim.meta similarity index 100% rename from Assets/LYM/Sprites/Salad/refrigeratorAni.anim.meta rename to Assets/LYM/Ani/Dungeon.anim.meta diff --git a/Assets/LYM/Ani/Go2Work.anim b/Assets/LYM/Ani/Go2Work.anim new file mode 100644 index 00000000..0bfd5ab5 --- /dev/null +++ b/Assets/LYM/Ani/Go2Work.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b2962d731c9089a270dbf6877cae2a42c23ab48f850667bfb6ff602086d4f31 +size 8142 diff --git a/Assets/LYM/Sprites/Bus/BusAni.anim.meta b/Assets/LYM/Ani/Go2Work.anim.meta similarity index 100% rename from Assets/LYM/Sprites/Bus/BusAni.anim.meta rename to Assets/LYM/Ani/Go2Work.anim.meta diff --git a/Assets/LYM/Ani/Housework.anim b/Assets/LYM/Ani/Housework.anim new file mode 100644 index 00000000..4bec360f --- /dev/null +++ b/Assets/LYM/Ani/Housework.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d769faa1c3303712a9cf8bd8fab8519441dcee5fa161dc57a2ec5a082642eddd +size 6004 diff --git a/Assets/LYM/Sprites/LanudryMachine/LaundryMachinAni.anim.meta b/Assets/LYM/Ani/Housework.anim.meta similarity index 100% rename from Assets/LYM/Sprites/LanudryMachine/LaundryMachinAni.anim.meta rename to Assets/LYM/Ani/Housework.anim.meta diff --git a/Assets/LYM/Ani/Meal.anim b/Assets/LYM/Ani/Meal.anim new file mode 100644 index 00000000..c5c61616 --- /dev/null +++ b/Assets/LYM/Ani/Meal.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:934dc36d444c3d4ba43341bce9622e335a091a14d68c78182c2f99bee45feb6c +size 16976 diff --git a/Assets/LYM/Sprites/Salad/saladreverse.anim.meta b/Assets/LYM/Ani/Meal.anim.meta similarity index 100% rename from Assets/LYM/Sprites/Salad/saladreverse.anim.meta rename to Assets/LYM/Ani/Meal.anim.meta diff --git a/Assets/LYM/Ani/Sleep.anim b/Assets/LYM/Ani/Sleep.anim new file mode 100644 index 00000000..5893fea2 --- /dev/null +++ b/Assets/LYM/Ani/Sleep.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb633d0256055b1822c65ff190f79eca009698f10478bcf025c525aa937bb8e4 +size 6943 diff --git a/Assets/LYM/Sprites/Salad/SaladAni.anim.meta b/Assets/LYM/Ani/Sleep.anim.meta similarity index 79% rename from Assets/LYM/Sprites/Salad/SaladAni.anim.meta rename to Assets/LYM/Ani/Sleep.anim.meta index cd8ae06a..50c6c4ee 100644 --- a/Assets/LYM/Sprites/Salad/SaladAni.anim.meta +++ b/Assets/LYM/Ani/Sleep.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e08d1671503bc8f48932b7fde444f4a1 +guid: bfb6c709f7fb9d443a02eb102ea56890 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/LYM/Scenes/HousingUI.unity b/Assets/LYM/Scenes/HousingUI.unity index 5354ae0d..88020ec9 100644 --- a/Assets/LYM/Scenes/HousingUI.unity +++ b/Assets/LYM/Scenes/HousingUI.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c84eb8a5d8ad25468e65224490026d91f642c847e2b55d954b8a470fcfb33096 +oid sha256:7b663dea778b9d5747df45eac028986f316ec7eed97f9ba2b38f54464a517dde size 127544 diff --git a/Assets/LYM/Scripts/InteractionPanelController.cs b/Assets/LYM/Scripts/InteractionPanelController.cs index 74ad3303..b898fb7d 100644 --- a/Assets/LYM/Scripts/InteractionPanelController.cs +++ b/Assets/LYM/Scripts/InteractionPanelController.cs @@ -13,7 +13,8 @@ public enum LoadingState Go2Work, LeaveWork, Meal, - Dungeon + Dungeon, + Sleep } //집안일 목록 public enum HouseworkState @@ -33,7 +34,7 @@ public class InteractionPanelController : MonoBehaviour private void Start() { - Init(LoadingState.Go2Work); + Init(LoadingState.Sleep); } private void Init(LoadingState state) @@ -64,6 +65,10 @@ public class InteractionPanelController : MonoBehaviour doingText.text = "던전 진입하는 중"; animator.Play("Dungeon"); break; + case LoadingState.Sleep: + doingText.text = "잠 자는 중"; + animator.Play("Sleep"); + break; } _textAnimCoroutine = StartCoroutine(TextAnimation()); } diff --git a/Assets/LYM/Sprites/Bus/BusAni.anim b/Assets/LYM/Sprites/Bus/BusAni.anim deleted file mode 100644 index dfa5e206..00000000 --- a/Assets/LYM/Sprites/Bus/BusAni.anim +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3ecf0d1c671e5312f99959f5d447496deeb57361876dacf90ea9f04c25ffe76 -size 8283 diff --git a/Assets/LYM/Sprites/LanudryMachine/LaundryMachinAni.anim b/Assets/LYM/Sprites/LanudryMachine/LaundryMachinAni.anim deleted file mode 100644 index 69d221f4..00000000 --- a/Assets/LYM/Sprites/LanudryMachine/LaundryMachinAni.anim +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2481b446513931d3e64b0321df6cc502c9703c07188d520046222c7f007d9ee2 -size 6011 diff --git a/Assets/LYM/Sprites/LanudryMachine/LaundryMachine.controller b/Assets/LYM/Sprites/LanudryMachine/LaundryMachine.controller deleted file mode 100644 index 63157f0a..00000000 --- a/Assets/LYM/Sprites/LanudryMachine/LaundryMachine.controller +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac0d7a47149efe39edfa278cffe29f9e7896a5931e468010d74fed5d1dcf8cb9 -size 5153 diff --git a/Assets/LYM/Sprites/Salad/SaladAni.anim b/Assets/LYM/Sprites/Salad/SaladAni.anim deleted file mode 100644 index aa53b652..00000000 --- a/Assets/LYM/Sprites/Salad/SaladAni.anim +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d0eda1444b3b8aca13255b792b6686cf096681b0f6fd2979d5504869ca48a2e -size 16942 diff --git a/Assets/LYM/Sprites/Salad/refrigeratorAni.anim b/Assets/LYM/Sprites/Salad/refrigeratorAni.anim deleted file mode 100644 index 11d1f372..00000000 --- a/Assets/LYM/Sprites/Salad/refrigeratorAni.anim +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e0324cec6ffb438f3d4d2d9aa0a4d19d58dc4cde91c5fa17e2b6e909573f614 -size 11477 diff --git a/Assets/LYM/Sprites/Salad/saladreverse.anim b/Assets/LYM/Sprites/Salad/saladreverse.anim deleted file mode 100644 index 67272a6f..00000000 --- a/Assets/LYM/Sprites/Salad/saladreverse.anim +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c9f5f00c818b0cbdc55eb4486ab3b6e63745e18104bb26f0e2a9f9ac39dcfc3 -size 16984 diff --git a/Assets/LYM/Sprites/bed.meta b/Assets/LYM/Sprites/bed.meta new file mode 100644 index 00000000..a7bd01b8 --- /dev/null +++ b/Assets/LYM/Sprites/bed.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95882223f83d36e40b36d59479b880b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LYM/Sprites/bed/bed1.png b/Assets/LYM/Sprites/bed/bed1.png new file mode 100644 index 00000000..be7e86aa --- /dev/null +++ b/Assets/LYM/Sprites/bed/bed1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ceb55b97dfc61ce890789a8bfdf6e5dd0251139ca72b31660901dd7a6cf57d97 +size 2589 diff --git a/Assets/LYM/Sprites/bed/bed1.png.meta b/Assets/LYM/Sprites/bed/bed1.png.meta new file mode 100644 index 00000000..277bf2eb --- /dev/null +++ b/Assets/LYM/Sprites/bed/bed1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 300848acc179b844383bd4ae2180c5f1 +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 + 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/Assets/LYM/Sprites/bed/bed2.png b/Assets/LYM/Sprites/bed/bed2.png new file mode 100644 index 00000000..42bf37ad --- /dev/null +++ b/Assets/LYM/Sprites/bed/bed2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dee52c5f4d6140859c64fba3db1552f7b7f96bc4cf7d1fa3266d2aa484312322 +size 3081 diff --git a/Assets/LYM/Sprites/bed/bed2.png.meta b/Assets/LYM/Sprites/bed/bed2.png.meta new file mode 100644 index 00000000..2066c46b --- /dev/null +++ b/Assets/LYM/Sprites/bed/bed2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 641f7588d152f2245bd369402d91ab23 +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 + 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/Assets/LYM/Sprites/bed/bed3.png b/Assets/LYM/Sprites/bed/bed3.png new file mode 100644 index 00000000..4839cf2a --- /dev/null +++ b/Assets/LYM/Sprites/bed/bed3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb51e0f6bff8cb76d9bd8a32220200196dd90fd4aca472150d02a814c87ec34f +size 3203 diff --git a/Assets/LYM/Sprites/bed/bed3.png.meta b/Assets/LYM/Sprites/bed/bed3.png.meta new file mode 100644 index 00000000..bc4ab984 --- /dev/null +++ b/Assets/LYM/Sprites/bed/bed3.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 7fb05122a8d05ca45afc837e3a0be4b8 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: