diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 63f14b0d4..ea5c6bad4 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -10756,17 +10756,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1670140492} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2055968244} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -8.4703214e-24, y: 0} - m_Pivot: {x: 0.48, y: 0.456} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.2} --- !u!114 &1670140494 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10787,7 +10787,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e5350bbc62b84c340a8b1c88a857d366, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f2b7a8431f40754f8f61fc1371a2946, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10965,7 +10965,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -20, y: 0} m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 1, y: 1} --- !u!114 &1701236785 @@ -14130,7 +14130,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055968243} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.025177503} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -14141,7 +14141,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 1} --- !u!114 &2055968245 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14162,7 +14162,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1502417ee2a0ecb439c3e0934d72fe78, type: 3} + m_Sprite: {fileID: 21300000, guid: a88ccd5bf0b599945b18be3cd76c3e14, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/02.Scripts/GameTimeManager.cs b/Assets/02.Scripts/GameTimeManager.cs index eddb48372..c4331e1b1 100644 --- a/Assets/02.Scripts/GameTimeManager.cs +++ b/Assets/02.Scripts/GameTimeManager.cs @@ -104,6 +104,7 @@ namespace BlueWater public int GetTycoonOpenTime() => _gameTimeDataSo.TycoonOpenTime; public int GetTycoonCloseTime() => _gameTimeDataSo.TycoonCloseTime; + public TimeSpan GetTycoonOpenTimeSpan() => new(_gameTime.Days, GetTycoonOpenTime(), 0, 0); public TimeSpan GetTycoonCloseTimeSpan() => new(_gameTime.Days, GetTycoonCloseTime(), 0, 0); private void OnTycoonPreparing() diff --git a/Assets/02.Scripts/Prop/Tycoon/Pot.cs b/Assets/02.Scripts/Prop/Tycoon/Pot.cs index cb0377f14..0ab21b79d 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Pot.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Pot.cs @@ -44,7 +44,7 @@ namespace BlueWater.Tycoons var currentFireWoodLevel = _potDataSo.FireWoodLevel[level]; // 음식 게이지 관리 및 음식 생성 - if (_currentFoodData.Plate < _cookedFoodDatas.Count) + if (_currentFoodData != null && _currentFoodData.Plate < _cookedFoodDatas.Count) { _currentCookGauge += currentFireWoodLevel.CookGauge * Time.deltaTime; if (_currentCookGauge >= _currentFoodData.CookGauge) @@ -70,7 +70,7 @@ namespace BlueWater.Tycoons } // Ui 표기 - _cookGauge.text = $"{(int)_currentCookGauge}/{_currentFoodData.CookGauge}"; + _cookGauge.text = $"{(int)_currentCookGauge}/{_currentFoodData?.CookGauge ?? 0}"; _fireWoodCount.text = $"{_currentFireWoodCount}/{_potDataSo.MaxFireWoodCount}"; } diff --git a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs index 37b03f8a5..0cf75aa84 100644 --- a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs +++ b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs @@ -1,9 +1,13 @@ +using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Tycoons { public class PowerSwitch : InteractionFurniture { + [SerializeField, Required] + private Transform _visualLook; + // TODO : 추후에 다시 활성화 하는 기능 필요 [SerializeField] private bool _isOpened; @@ -27,6 +31,7 @@ namespace BlueWater.Tycoons private void OpenTycoonSwitch() { _isOpened = true; + _visualLook.localScale = new Vector3(-1f, 1f, 1f); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/GameTimeData.asset b/Assets/02.Scripts/ScriptableObject/GameTimeData.asset index 9dad76bdb..f3f59bb40 100644 --- a/Assets/02.Scripts/ScriptableObject/GameTimeData.asset +++ b/Assets/02.Scripts/ScriptableObject/GameTimeData.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 02ad0ead42640754d821166bbeec1306, type: 3} m_Name: GameTimeData m_EditorClassIdentifier: - k__BackingField: 0.5 + k__BackingField: 1 k__BackingField: 18 k__BackingField: 22 diff --git a/Assets/02.Scripts/Ui/GameTimeUi.cs b/Assets/02.Scripts/Ui/GameTimeUi.cs index be332727f..1b7c49c4a 100644 --- a/Assets/02.Scripts/Ui/GameTimeUi.cs +++ b/Assets/02.Scripts/Ui/GameTimeUi.cs @@ -10,11 +10,15 @@ namespace BlueWater.Uis private Transform _handHour; private GameTimeManager _gameTimeManager; + private TimeSpan _openTime; + private TimeSpan _closeTime; private TimeSpan _currentTime; private void Awake() { _gameTimeManager = GameTimeManager.Instance; + _openTime = _gameTimeManager.GetTycoonOpenTimeSpan(); + _closeTime = _gameTimeManager.GetTycoonCloseTimeSpan(); } private void Start() @@ -24,10 +28,13 @@ namespace BlueWater.Uis private void Update() { - var currentTime = _gameTimeManager.GetCurrentGameTime(); - var hours = (float)currentTime.TotalHours % 24; - var minutes = currentTime.Minutes; - var hourAngle = -360f * (hours / 24f) - (minutes / 60f) * 15f; + _currentTime = _gameTimeManager.GetCurrentGameTime(); + var openTimeHours = (float)_openTime.TotalHours; + var closeTimeHours = (float)_closeTime.TotalHours; + var currentTimeHours = (float)_currentTime.TotalHours; + + var t = (currentTimeHours - openTimeHours) / (closeTimeHours - openTimeHours); + var hourAngle = Mathf.Lerp(90f, -90f, t); _handHour.localRotation = Quaternion.Euler(0, 0, hourAngle); } diff --git a/Assets/03.Images/Props/Furniture/PowerSwitch.png b/Assets/03.Images/Props/Furniture/PowerSwitch.png deleted file mode 100644 index 35a3aa372..000000000 Binary files a/Assets/03.Images/Props/Furniture/PowerSwitch.png and /dev/null differ diff --git a/Assets/03.Images/Props/Furniture/PowerSwitch.png.meta b/Assets/03.Images/Props/Furniture/PowerSwitch.png.meta deleted file mode 100644 index 29d6711cb..000000000 --- a/Assets/03.Images/Props/Furniture/PowerSwitch.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: 0e9f85c2dba90604380a191b40134308 -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: 2048 - 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: 4 - 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: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Props/Furniture/PowerSwitchHandle.png b/Assets/03.Images/Props/Furniture/PowerSwitchHandle.png deleted file mode 100644 index 645f6c6ea..000000000 Binary files a/Assets/03.Images/Props/Furniture/PowerSwitchHandle.png and /dev/null differ diff --git a/Assets/03.Images/Props/Furniture/PowerSwitchHandle.png.meta b/Assets/03.Images/Props/Furniture/PowerSwitchHandle.png.meta deleted file mode 100644 index ea1ffd484..000000000 --- a/Assets/03.Images/Props/Furniture/PowerSwitchHandle.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: 9fed298ec4498d644b02246d59128d54 -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: 7 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 - 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: 4 - 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: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/GameTimeClock.png b/Assets/03.Images/Ui/GameTimeClock.png deleted file mode 100644 index af85b0852..000000000 Binary files a/Assets/03.Images/Ui/GameTimeClock.png and /dev/null differ diff --git a/Assets/03.Images/Ui/GameTimeClock.png.meta b/Assets/03.Images/Ui/GameTimeClock.png.meta deleted file mode 100644 index f87d36101..000000000 --- a/Assets/03.Images/Ui/GameTimeClock.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: 1502417ee2a0ecb439c3e0934d72fe78 -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: 1024 - 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: 4 - 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: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/HourHand.png b/Assets/03.Images/Ui/HourHand.png deleted file mode 100644 index eebcc0d0d..000000000 Binary files a/Assets/03.Images/Ui/HourHand.png and /dev/null differ diff --git a/Assets/03.Images/Ui/HourHand.png.meta b/Assets/03.Images/Ui/HourHand.png.meta deleted file mode 100644 index 65bf98340..000000000 --- a/Assets/03.Images/Ui/HourHand.png.meta +++ /dev/null @@ -1,141 +0,0 @@ -fileFormatVersion: 2 -guid: e5350bbc62b84c340a8b1c88a857d366 -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.48, y: 0.456} - spritePixelsToUnits: 1024 - 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: 4 - 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: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 1537655665 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/GameTimeClock02.png b/Assets/03.Images/Ui/Tycoon/GameTimeClock.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/GameTimeClock02.png rename to Assets/03.Images/Ui/Tycoon/GameTimeClock.png diff --git a/Assets/03.Images/Ui/Tycoon/GameTimeClock02.png.meta b/Assets/03.Images/Ui/Tycoon/GameTimeClock.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/GameTimeClock02.png.meta rename to Assets/03.Images/Ui/Tycoon/GameTimeClock.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/HourHand02.png b/Assets/03.Images/Ui/Tycoon/HourHand.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/HourHand02.png rename to Assets/03.Images/Ui/Tycoon/HourHand.png diff --git a/Assets/03.Images/Ui/Tycoon/HourHand02.png.meta b/Assets/03.Images/Ui/Tycoon/HourHand.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/HourHand02.png.meta rename to Assets/03.Images/Ui/Tycoon/HourHand.png.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab index a3d9191d0..1acb60aed 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab @@ -31,7 +31,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9fed298ec4498d644b02246d59128d54, type: 3} + objectReference: {fileID: 21300000, guid: c06ce735bf1f1b947af79593f2d1d8e4, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -95,7 +95,7 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9fed298ec4498d644b02246d59128d54, type: 3} + objectReference: {fileID: 21300000, guid: c06ce735bf1f1b947af79593f2d1d8e4, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -108,6 +108,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 141444551257579178} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!4 &203741387490724426 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!4 &809828747251277026 stripped Transform: m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -134,6 +139,7 @@ MonoBehaviour: k__BackingField: {fileID: 8975593228546502023} k__BackingField: {fileID: 8793236136028073839} k__BackingField: 1 + _visualLook: {fileID: 203741387490724426} _isOpened: 0 --- !u!224 &8793236136028073839 stripped RectTransform: