diff --git a/Assets/KSH/Main.unity b/Assets/KSH/Main.unity new file mode 100644 index 00000000..441da35e --- /dev/null +++ b/Assets/KSH/Main.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:257e11afc933eff4ed558222483bc6d6bf886a150ab7d48909b6aee4e0d0c490 +size 144813 diff --git a/Assets/LYM/Scenes/MainUI.unity.meta b/Assets/KSH/Main.unity.meta similarity index 100% rename from Assets/LYM/Scenes/MainUI.unity.meta rename to Assets/KSH/Main.unity.meta diff --git a/Assets/KSH/PlayerStats.cs b/Assets/KSH/PlayerStats.cs index b3690490..b8ebbc03 100644 --- a/Assets/KSH/PlayerStats.cs +++ b/Assets/KSH/PlayerStats.cs @@ -82,6 +82,7 @@ public class PlayerStats : MonoBehaviour,ISaveable LoadMessagePanel(); CheckBubble(); + GameManager.Instance.SetEvents(); SceneManager.sceneLoaded += OnSceneLoaded; // 씬 전환 이벤트 _mealCount = 0; // 식사 횟수 0회 } diff --git a/Assets/KSH/ReHousing.unity b/Assets/KSH/ReHousing.unity index cb0adc85..1631d7aa 100644 --- a/Assets/KSH/ReHousing.unity +++ b/Assets/KSH/ReHousing.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e9db94063763202228402f11b8da00c7d857151f07be37822e803f7b7538e11 -size 55239 +oid sha256:235ac1c229bb2ae87676def6f645666b2638d869ebc47609fe8e402e9f1f72e8 +size 55371 diff --git a/Assets/KSH/ReHousing/LightingData.asset b/Assets/KSH/ReHousing/LightingData.asset new file mode 100644 index 00000000..6a16522a Binary files /dev/null and b/Assets/KSH/ReHousing/LightingData.asset differ diff --git a/Assets/KSH/ReHousing/LightingData.asset.meta b/Assets/KSH/ReHousing/LightingData.asset.meta new file mode 100644 index 00000000..e483de4c --- /dev/null +++ b/Assets/KSH/ReHousing/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b8cded1d15a2894aace3a4132962f78 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png b/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png new file mode 100644 index 00000000..af1f2620 --- /dev/null +++ b/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b08d6b40263b1b7ab29f463f817131cc91b0092448df554abbcaebe72de0534a +size 61924 diff --git a/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png.meta b/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png.meta new file mode 100644 index 00000000..df8be4d4 --- /dev/null +++ b/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: c66841f6a1f18454a9c19784c18f55e5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 12 + 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 + 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/KSH/ReHousing/Lightmap-0_comp_light.exr b/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr new file mode 100644 index 00000000..be89d544 Binary files /dev/null and b/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr differ diff --git a/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr.meta b/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr.meta new file mode 100644 index 00000000..6f9cfb65 --- /dev/null +++ b/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 597adeb542a1dda458ce101eb272809c +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: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + 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 + 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/KSH/ReHousing/New Lighting Settings.lighting b/Assets/KSH/ReHousing/New Lighting Settings.lighting new file mode 100644 index 00000000..484e17f0 --- /dev/null +++ b/Assets/KSH/ReHousing/New Lighting Settings.lighting @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Lighting Settings + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Assets/KSH/ReHousing/New Lighting Settings.lighting.meta b/Assets/KSH/ReHousing/New Lighting Settings.lighting.meta new file mode 100644 index 00000000..c84d5d69 --- /dev/null +++ b/Assets/KSH/ReHousing/New Lighting Settings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebf96f8647c301c4b8c330c457e6c590 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/KSH/ReHousing/ReflectionProbe-0.exr b/Assets/KSH/ReHousing/ReflectionProbe-0.exr new file mode 100644 index 00000000..e76a15c5 Binary files /dev/null and b/Assets/KSH/ReHousing/ReflectionProbe-0.exr differ diff --git a/Assets/KSH/ReHousing/ReflectionProbe-0.exr.meta b/Assets/KSH/ReHousing/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000..7a1c9d96 --- /dev/null +++ b/Assets/KSH/ReHousing/ReflectionProbe-0.exr.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8dab02e1aaa849244b308601fb521da2 +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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + 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: 100 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LYM/Scenes/MainUI.unity b/Assets/LYM/Scenes/MainUI.unity deleted file mode 100644 index 2bce06d4..00000000 --- a/Assets/LYM/Scenes/MainUI.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38cbfd282bcf3484d2a2b57cbfb87c5fcaf5e026b926d152194e68872313950a -size 139776 diff --git a/Assets/Prefabs/ReHousing/Interior.prefab b/Assets/Prefabs/ReHousing/Interior.prefab index fd1c35af..5e7275d5 100644 --- a/Assets/Prefabs/ReHousing/Interior.prefab +++ b/Assets/Prefabs/ReHousing/Interior.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dd111e590d240557453f80b442b4e60e0e0c7177643b7c98d8ebb256c58e2e4 -size 158277 +oid sha256:fbf5e9a2ce75d4d1df0c38179e233801fc3b82ba84868d606291f3938725144f +size 169919 diff --git a/Assets/Prefabs/ReHousing/Plane.prefab b/Assets/Prefabs/ReHousing/Plane.prefab index 13444f76..164fb213 100644 --- a/Assets/Prefabs/ReHousing/Plane.prefab +++ b/Assets/Prefabs/ReHousing/Plane.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1423755894d270aa123284f5ce5a7e1256ab122bae241d63af1cb60f81bc1315 +oid sha256:6fcb57c276ed5577f3729f467c4851da86148f3275a880fbf919c973f3de8418 size 3050 diff --git a/Assets/Prefabs/ReHousing/Room.prefab b/Assets/Prefabs/ReHousing/Room.prefab index 7aeb8ec3..136463f7 100644 --- a/Assets/Prefabs/ReHousing/Room.prefab +++ b/Assets/Prefabs/ReHousing/Room.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4931baae63e2b32cf1f4d03c0c3604f96091285aebe734ea1ce250fdaa701a3d -size 88139 +oid sha256:037fba014429f6a80d608f55ffced001972483febbaed6f578e288ccc8b98e55 +size 95965 diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index 32a308c2..85bd6035 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -31,10 +31,6 @@ public partial class GameManager : Singleton,ISaveable // 오디오 초기화 InitializeAudio(); - // 이벤트 할당 - PlayerStats.Instance.OnDayEnded += AdvanceDay; // 날짜 변경 - PlayerStats.Instance.ZeroReputation += ZeroReputationEnd; // 평판 0 엔딩 - //패널 매니저 생성 panelManager = Instantiate(Resources.Load("Prefabs/PanelManager")).GetComponent(); } @@ -75,6 +71,13 @@ public partial class GameManager : Singleton,ISaveable { Time.timeScale = 1; } + + // 이벤트 할당(PlayerStats Start에서 호출) + public void SetEvents() + { + PlayerStats.Instance.OnDayEnded += AdvanceDay; // 날짜 변경 + PlayerStats.Instance.ZeroReputation += ZeroReputationEnd; // 평판 0 엔딩 + } // 날짜 진행 public void AdvanceDay() diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index f982c05c..8f617ebc 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/KSH/Main.unity + guid: fe5619f467b6e0f42b57ee216ffdd7c7 - enabled: 1 path: Assets/KSH/ReHousing.unity guid: b748e35b920bde64cbd6ffe5fdb43e23