diff --git a/Assets/KSH/ReHousing.unity b/Assets/KSH/ReHousing.unity index a388ceab..5515d1ac 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:306b89c4ca98dcafa3b8cd9ca0bb5b7bd113f5fb2f491ed9137347041a16193e -size 71543 +oid sha256:b78f0bfed1d3d148a76f0032abb0e6f41226b5c3f91b6ff6b24d30c8eadad8ee +size 49095 diff --git a/Assets/KSH/ReHousing/LightingData.asset b/Assets/KSH/ReHousing/LightingData.asset deleted file mode 100644 index 2a3dc6bb..00000000 Binary files a/Assets/KSH/ReHousing/LightingData.asset and /dev/null differ diff --git a/Assets/KSH/ReHousing/LightingData.asset.meta b/Assets/KSH/ReHousing/LightingData.asset.meta deleted file mode 100644 index e483de4c..00000000 --- a/Assets/KSH/ReHousing/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index af1f2620..00000000 --- a/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index df8be4d4..00000000 --- a/Assets/KSH/ReHousing/Lightmap-0_comp_dir.png.meta +++ /dev/null @@ -1,114 +0,0 @@ -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 deleted file mode 100644 index c0d78d81..00000000 Binary files a/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr and /dev/null differ diff --git a/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr.meta b/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr.meta deleted file mode 100644 index 6f9cfb65..00000000 --- a/Assets/KSH/ReHousing/Lightmap-0_comp_light.exr.meta +++ /dev/null @@ -1,114 +0,0 @@ -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/ReflectionProbe-0.exr b/Assets/KSH/ReHousing/ReflectionProbe-0.exr deleted file mode 100644 index e76a15c5..00000000 Binary files a/Assets/KSH/ReHousing/ReflectionProbe-0.exr and /dev/null differ diff --git a/Assets/KSH/ReHousing/ReflectionProbe-0.exr.meta b/Assets/KSH/ReHousing/ReflectionProbe-0.exr.meta deleted file mode 100644 index 7a1c9d96..00000000 --- a/Assets/KSH/ReHousing/ReflectionProbe-0.exr.meta +++ /dev/null @@ -1,114 +0,0 @@ -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 index 374cfab9..2bce06d4 100644 --- a/Assets/LYM/Scenes/MainUI.unity +++ b/Assets/LYM/Scenes/MainUI.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f10f4e35773660298dcd5a142ff5ac4918e6c8e71a9a2904ecc154b25fddd4e1 -size 144813 +oid sha256:38cbfd282bcf3484d2a2b57cbfb87c5fcaf5e026b926d152194e68872313950a +size 139776 diff --git a/Assets/New Lighting Settings.lighting b/Assets/New Lighting Settings.lighting deleted file mode 100644 index 484e17f0..00000000 --- a/Assets/New Lighting Settings.lighting +++ /dev/null @@ -1,66 +0,0 @@ -%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/New Lighting Settings.lighting.meta b/Assets/New Lighting Settings.lighting.meta deleted file mode 100644 index c84d5d69..00000000 --- a/Assets/New Lighting Settings.lighting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ebf96f8647c301c4b8c330c457e6c590 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 4890085278179872738 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index 7d9ce93a..aa7a98c4 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -28,6 +28,9 @@ public partial class GameManager : Singleton,ISaveable // 오디오 초기화 InitializeAudio(); + // 이벤트 할당 + PlayerStats.Instance.OnDayEnded += AdvanceDay; // 날짜 변경 + PlayerStats.Instance.ZeroReputation += ZeroReputationEnd; // 평판 0 엔딩 //패널 매니저 생성 panelManager = Instantiate(Resources.Load("Prefabs/PanelManager")).GetComponent(); @@ -82,26 +85,9 @@ public partial class GameManager : Singleton,ISaveable public void ChangeToHomeScene() { - StartCoroutine(LoadSceneAsync("ReHousing")); // Home Scene + SceneManager.LoadScene("ReHousing"); // Home Scene HandleSceneAudio("Housing"); } - IEnumerator LoadSceneAsync(string sceneName) - { - AsyncOperation asyncLoad = SceneManager.LoadSceneAsync(sceneName); - asyncLoad.allowSceneActivation = false; - - while (!asyncLoad.isDone) - { - if (asyncLoad.progress >= 0.9f) - { - // 씬 준비 완료, 약간의 시간 대기 후 활성화 - yield return new WaitForSeconds(0.1f); - asyncLoad.allowSceneActivation = true; - } - - yield return null; - } - } // TODO: Open Setting Panel 등 Panel 처리 @@ -111,13 +97,6 @@ public partial class GameManager : Singleton,ISaveable // UI용 Canvas 찾기 // _canvas = GameObject.FindObjectOfType(); - - // 이벤트 할당 - if (SceneManager.GetActiveScene().buildIndex != 0) - { - PlayerStats.Instance.OnDayEnded += AdvanceDay; // 날짜 변경 - PlayerStats.Instance.ZeroReputation += ZeroReputationEnd; // 평판 0 엔딩 - } } private void OnDestroy() diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5c6e70a9..f982c05c 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,6 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/LYM/Scenes/MainUI.unity - guid: fe5619f467b6e0f42b57ee216ffdd7c7 - enabled: 1 path: Assets/KSH/ReHousing.unity guid: b748e35b920bde64cbd6ffe5fdb43e23