From a228267f880a30b0cc219069d16807c92456c495 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Sun, 1 Dec 2024 00:00:24 +0900 Subject: [PATCH] 0.3.5.1 --- Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs | 14 ++--------- Assets/AddressableAssetsData/link.xml | 24 ------------------- Assets/AddressableAssetsData/link.xml.meta | 7 ------ ProjectSettings/ProjectSettings.asset | 2 +- 4 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 Assets/AddressableAssetsData/link.xml delete mode 100644 Assets/AddressableAssetsData/link.xml.meta diff --git a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs index 4d89fd914..506e9e518 100644 --- a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs @@ -187,16 +187,6 @@ namespace BlueWater.Tycoons } } - public override void SetCurrentAmount(int amount) - { - if (CurrentAmount == int.MaxValue) - { - return; - } - - base.SetCurrentAmount(amount); - } - public override void Activate() { base.Activate(); @@ -211,7 +201,7 @@ namespace BlueWater.Tycoons public override void Consume(int amount) { - if (!IsActivated || IsMoldy) return; + if (!IsActivated || IsMoldy || IsStatue) return; base.Consume(amount); @@ -225,7 +215,7 @@ namespace BlueWater.Tycoons public override void AddCurrentAmount(int addedValue) { - if (!IsActivated) return; + if (!IsActivated || IsStatue) return; base.AddCurrentAmount(addedValue); 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 e6760a186..000000000 --- a/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0a10b6b885a6b3747ad095c3e0a07009 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bc5f90f85..655e45b37 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.5.0 + bundleVersion: 0.3.5.1 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}