diff --git a/Assets/02.Scripts/Audio/AudioManager.cs b/Assets/02.Scripts/Audio/AudioManager.cs index 0ed60a6b7..d9fe9bae2 100644 --- a/Assets/02.Scripts/Audio/AudioManager.cs +++ b/Assets/02.Scripts/Audio/AudioManager.cs @@ -116,31 +116,32 @@ namespace BlueWater.Audios { if (_sfxDictionary.TryGetValue(sfxName, out var value)) { + float currentTime = ignoreTimeScale ? Time.unscaledTime : Time.time; + if (_sfxPlayTimeDictionary.TryGetValue(sfxName, out var lastPlayTime)) { - if (Time.time - lastPlayTime < _sfxMinInterval) + if (currentTime - lastPlayTime < _sfxMinInterval) { - return; + return; // 최소 간격 조건 미충족 시 재생하지 않음 } } var availableSfxAudioSource = GetAvailableSfxAudioSource(); availableSfxAudioSource.clip = value; availableSfxAudioSource.loop = loop; - + if (ignoreTimeScale) { - // Time.timeScale 영향을 받지 않는 효과음 처리 availableSfxAudioSource.pitch = duration.HasValue ? value.length / duration.Value : 1f; } else { - // Time.timeScale 적용 _sfxPitchDictionary[availableSfxAudioSource] = duration.HasValue ? value.length / duration.Value : 1f; availableSfxAudioSource.pitch = _sfxPitchDictionary[availableSfxAudioSource] * Time.timeScale; } - + availableSfxAudioSource.Play(); - _sfxPlayTimeDictionary[sfxName] = Time.time; + + _sfxPlayTimeDictionary[sfxName] = currentTime; } else { @@ -188,8 +189,6 @@ namespace BlueWater.Audios } // 모든 AudioSource가 사용 중이면 첫 번째 AudioSource를 재사용 - //return sfxPitchDictionary.Keys.GetEnumerator().Current; - using var enumerator = _sfxPitchDictionary.Keys.GetEnumerator(); enumerator.MoveNext(); return enumerator.Current; diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index 8c36f4c2f..150b3f921 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -23,8 +23,8 @@ namespace BlueWater.Players.Tycoons private void Start() { - _interactionAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, "Interaction"); - _developKey01Action = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, "DevelopKey01"); + _interactionAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.Interaction); + _developKey01Action = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.DevelopKey01); _interactionAction.performed += OnInteraction; _interactionAction.canceled += OnInteraction; diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index 3df4137d2..af43283fb 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -85,8 +85,8 @@ namespace BlueWater.Players.Tycoons private void Start() { - _moveAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, "Move"); - _dashAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, "Dash"); + _moveAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.Move); + _dashAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.Dash); _moveAction.performed += OnMove; _moveAction.canceled += OnMove; diff --git a/Assets/02.Scripts/PlayerInputKeyManager.cs b/Assets/02.Scripts/PlayerInputKeyManager.cs index c7e4790bd..1a80ef74e 100644 --- a/Assets/02.Scripts/PlayerInputKeyManager.cs +++ b/Assets/02.Scripts/PlayerInputKeyManager.cs @@ -16,6 +16,26 @@ namespace BlueWater Combat, CombatUi, } + + public static class TycoonActions + { + public const string Move = "Move"; + public const string Dash = "Dash"; + public const string Interaction = "Interaction"; + public const string DevelopKey01 = "DevelopKey01"; + public const string OpenManualBook = "OpenManualBook"; + public const string ZoomOut = "ZoomOut"; + public const string ZoomIn = "ZoomIn"; + public const string Options = "Options"; + } + + public static class TycoonUiActions + { + public const string Cancel = "Cancel"; + public const string PressQ = "PressQ"; + public const string PressAnyKey = "PressAnyKey"; + public const string InteractionE = "InteractionE"; + } public class PlayerInputKeyManager : Singleton { diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index e3ad6a501..bcc889f3a 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -162,7 +162,7 @@ namespace BlueWater.Tycoons { GameManager.Instance.CurrentTycoonPlayer.IsCleaningTable = true; _isPlayerInteracting = true; - AudioManager.Instance.PlaySfx(_cleaningSfxName, loop: true); + AudioManager.Instance.PlaySfx(_cleaningSfxName); } public override void CancelInteraction() diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index 7bee35ff8..6372437c8 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -116,7 +116,7 @@ namespace BlueWater.Tycoons { GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = true; _isPlayerInteracting = true; - AudioManager.Instance.PlaySfx(_cleaningSfxName, loop: true); + AudioManager.Instance.PlaySfx(_cleaningSfxName); } public override void CancelInteraction() diff --git a/Assets/02.Scripts/TycoonCameraManager.cs b/Assets/02.Scripts/TycoonCameraManager.cs index 1590e54c2..1b7a00d13 100644 --- a/Assets/02.Scripts/TycoonCameraManager.cs +++ b/Assets/02.Scripts/TycoonCameraManager.cs @@ -86,8 +86,8 @@ namespace BlueWater private void Start() { - _zoomInAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, "ZoomIn"); - _zoomOutAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, "ZoomOut"); + _zoomInAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.ZoomIn); + _zoomOutAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.ZoomOut); _zoomInAction.performed += OnZoomChanged; _zoomOutAction.performed += OnZoomChanged; diff --git a/Assets/02.Scripts/Ui/Title/TitleOptions.cs b/Assets/02.Scripts/Ui/Title/TitleOptions.cs index cfa2a0273..2ae94cf9c 100644 --- a/Assets/02.Scripts/Ui/Title/TitleOptions.cs +++ b/Assets/02.Scripts/Ui/Title/TitleOptions.cs @@ -29,7 +29,7 @@ public class TitleOptions : MonoBehaviour private void Start() { - CancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, "Cancel"); + CancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); _audioManager = AudioManager.Instance; diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index df83bdf3e..c2033b086 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -56,9 +56,9 @@ namespace BlueWater.Titles private void Start() { _playerInputKeyManager = PlayerInputKeyManager.Instance; - _interactionEAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, "InteractionE"); - _openAction = _playerInputKeyManager.GetAction(InputActionMaps.Tycoon, "Options"); - _closeAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, "Cancel"); + _interactionEAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE); + _openAction = _playerInputKeyManager.GetAction(InputActionMaps.Tycoon, TycoonActions.Options); + _closeAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); if (_isTitleScene) { diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs index 33b3d6326..cdf33831e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs @@ -57,9 +57,9 @@ namespace BlueWater.Uis private void Start() { - _openManualBookAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, "OpenManualBook"); - _pressQAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, "PressQ"); - _cancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, "Cancel"); + _openManualBookAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.OpenManualBook); + _pressQAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressQ); + _cancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); var allCocktails = ItemManager.Instance.CocktailDataSo.GetData(); _button = new List(allCocktails.Count); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs index 70c1a3048..da02f0396 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs @@ -44,7 +44,6 @@ namespace BlueWater.Uis public override void Open() { AudioManager.Instance.PlaySfx(_openSfxName, ignoreTimeScale: true); - PlayerInputKeyManager.Instance.DisableAction("OpenManualBook"); VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); PopupUiController.RegisterPopup(this); @@ -59,7 +58,6 @@ namespace BlueWater.Uis PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); IsOpened = false; VisualFeedbackManager.Instance.ResetTimeScale(); - PlayerInputKeyManager.Instance.EnableAction("OpenManualBook"); } [Button("레어 상자 열기")] diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs index 1ee010a4d..c77438566 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs @@ -191,8 +191,8 @@ namespace BlueWater.Uis public void Start() { - _cancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, "Cancel"); - _pressAnyKeyAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, "PressAnyKey"); + _cancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); + _pressAnyKeyAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressAnyKey); foreach (Transform element in _resultCardContents.transform) { diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 778cad590..9761d731d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -38,7 +38,6 @@ namespace BlueWater.Uis public override void Open() { - PlayerInputKeyManager.Instance.DisableAction("OpenManualBook"); VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); PopupUiController.RegisterPopup(this); @@ -53,7 +52,6 @@ namespace BlueWater.Uis PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); IsOpened = false; VisualFeedbackManager.Instance.ResetTimeScale(); - PlayerInputKeyManager.Instance.EnableAction("OpenManualBook"); } [Button("카드 생성하기(레벨업)")] @@ -122,7 +120,7 @@ namespace BlueWater.Uis RectTransform rect02 = null; RectTransform rect03 = null; - rect03 = currentTycoonCard.GetComponent(); + rect03 = currentTycoonCard.RectTransform; startPosition03 = rect03.anchoredPosition; endPosition03 = new Vector2(0.0f, 0.0f); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs index 975a90280..d8c0b3bb9 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs @@ -103,7 +103,6 @@ namespace BlueWater.Uis public override void Open() { - PlayerInputKeyManager.Instance.DisableAction("OpenManualBook"); VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); PopupUiController.RegisterPopup(this); @@ -118,7 +117,6 @@ namespace BlueWater.Uis PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); IsOpened = false; VisualFeedbackManager.Instance.ResetTimeScale(); - PlayerInputKeyManager.Instance.EnableAction("OpenManualBook"); EventManager.InvokeTycoonGameStarted(); } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs deleted file mode 100644 index 85c3a67cb..000000000 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace BlueWater.Uis -{ - public class TycoonUpgradeUi : SwitchActionPopupUi - { - - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs.meta deleted file mode 100644 index fc8d11f41..000000000 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: ce8b8bf51887c134abe0cc8e8ad942cc \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs index e1b648875..d7c98725e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs @@ -31,7 +31,6 @@ namespace BlueWater.Uis public override void Open() { - PlayerInputKeyManager.Instance.DisableAction("OpenManualBook"); VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); PopupUiController.RegisterPopup(this); @@ -46,7 +45,6 @@ namespace BlueWater.Uis PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); IsOpened = false; VisualFeedbackManager.Instance.ResetTimeScale(); - PlayerInputKeyManager.Instance.EnableAction("OpenManualBook"); } private void StartUpgradePopup(LevelData currentLevelData) diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 62ce7303c..000000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta deleted file mode 100644 index 80ee633cb..000000000 --- a/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 690c62745860f4a45968f90d5fd2322d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 9fee1643c..5a686f70c 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -36,24 +36,24 @@ MonoBehaviour: - rid: 5032277253446697243 - rid: 5032277253446697244 - rid: 5032277253446697245 - - rid: 7789285205019197450 + - rid: 5889118814996267141 - rid: 5032277253446697247 - rid: 5032277253446697248 - - rid: 7789285205019197451 - - rid: 7789285205019197452 + - rid: 5889118814996267142 + - rid: 5889118814996267143 - rid: 5032277253446697251 - - rid: 7789285205019197453 + - rid: 5889118814996267144 - rid: 5032277253446697253 - - rid: 7789285205019197454 + - rid: 5889118814996267145 - rid: 5032277253446697255 - - rid: 7789285205019197455 - - rid: 7789285205019197456 + - rid: 5889118814996267146 + - rid: 5889118814996267147 - rid: 5032277253446697258 - rid: 5032277253446697259 - - rid: 7789285205019197457 - - rid: 7789285205019197458 + - rid: 5889118814996267148 + - rid: 5889118814996267149 - rid: 5032277253446697262 - - rid: 7789285205019197459 + - rid: 5889118814996267150 m_RuntimeSettings: m_List: - rid: 5032277253446697243 @@ -160,7 +160,7 @@ MonoBehaviour: m_version: 0 m_EnableCompilationCaching: 1 m_EnableValidityChecks: 1 - - rid: 7789285205019197450 + - rid: 5889118814996267141 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -175,14 +175,14 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 7789285205019197451 + - rid: 5889118814996267142 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 7789285205019197452 + - rid: 5889118814996267143 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -190,7 +190,7 @@ MonoBehaviour: m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - - rid: 7789285205019197453 + - rid: 5889118814996267144 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -202,7 +202,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 7789285205019197454 + - rid: 5889118814996267145 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -215,7 +215,7 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 7789285205019197455 + - rid: 5889118814996267146 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -225,7 +225,7 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 7789285205019197456 + - rid: 5889118814996267147 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -238,19 +238,19 @@ MonoBehaviour: skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3} renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3} - - rid: 7789285205019197457 + - rid: 5889118814996267148 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 7789285205019197458 + - rid: 5889118814996267149 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 7789285205019197459 + - rid: 5889118814996267150 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 033c0ed39..a4937e147 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -748,7 +748,7 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 scriptingDefineSymbols: - Android: UNITY_POST_PROCESSING_STACK_V2;USE_NEW_INPUT;USE_CINEMACHINE;DOTWEEN;UNITY_VISUAL_SCRIPTING + Android: UNITY_POST_PROCESSING_STACK_V2;USE_NEW_INPUT;USE_CINEMACHINE;DOTWEEN;UNITY_VISUAL_SCRIPTING;COZY_WEATHER;COZY_3_AND_UP;COZY_URP;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2;DOTWEEN;UNITY_VISUAL_SCRIPTING GameCoreScarlett: DOTWEEN GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2;DOTWEEN