diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 5143b2c9a..07cd043c9 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -6705,7 +6705,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -10184,11 +10184,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -120 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -10901,11 +10901,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 120 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -20018,11 +20018,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -60 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -22590,11 +22590,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs b/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs index d7fd18422..2f09d9ef1 100644 --- a/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs +++ b/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs @@ -14,7 +14,7 @@ namespace BlueWater.Tycoons public class MoneyCounter : InteractionFurniture { [SerializeField] - private float _playerHoldingTime = 3f; + private float _playerHoldingTime = 1f; [SerializeField] private PayMoneyUi _payMoneyUiObject; diff --git a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs index a46ed205b..01d4ead65 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs @@ -1,7 +1,5 @@ - using System; using UnityEngine; -using UnityEngine.Serialization; namespace BlueWater.Tycoons { @@ -15,21 +13,9 @@ namespace BlueWater.Tycoons private Sprite _heartSprite; private bool _isPlayerInteracting; - - protected override void OnEnable() - { - base.OnEnable(); - - Initialize(); - } private void Update() { - if (InteractionCanvas.BalloonUi.IsWaitTimeOver()) - { - Destroy(); - } - if (IsShowing) { EventManager.InvokeHoldInteracting(HoldingElapsedTime); @@ -55,11 +41,6 @@ namespace BlueWater.Tycoons } } - public void Initialize() - { - InteractionCanvas.BalloonUi.OrderItem(_heartSprite, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.MushroomWaitTime); - } - public override void Interaction() { GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = true; diff --git a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs index 96af7d5bf..f465b5806 100644 --- a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs +++ b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs @@ -1,5 +1,7 @@ using System; using System.Collections; +using DG.Tweening; +using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Tycoons @@ -10,10 +12,36 @@ namespace BlueWater.Tycoons [SerializeField] private AnimationController _animationController; + [Title("구매 불가능 연출")] + [SerializeField] + private float _shakeDuration = 0.3f; + + [SerializeField] + private Vector3 _shakePosition = new(0.05f, 0f, 0f); + + [SerializeField] + private int _vibrato = 30; + + [SerializeField] + private Ease _ease = Ease.OutQuad; + + private Tween _unavailablePurchaseTween; private RewardBoxType _rewardBoxType; private int _requiredGold; private bool _isInteracting; - + + protected override void Start() + { + base.Start(); + + _unavailablePurchaseTween = VisualLook.transform.DOShakePosition(_shakeDuration, _shakePosition, _vibrato).SetEase(_ease).SetAutoKill(false).Pause(); + } + + private void OnDestroy() + { + _unavailablePurchaseTween.Kill(); + } + public void Initialize(LevelData levelData) { _rewardBoxType = levelData.RewardBoxType; @@ -24,6 +52,12 @@ namespace BlueWater.Tycoons public override void Interaction() { if (_isInteracting) return; + + if (TycoonManager.Instance.TycoonStatus.CurrentGold < _requiredGold) + { + _unavailablePurchaseTween.Restart(); + return; + } StartCoroutine(nameof(OpenRewardBoxCoroutine)); } @@ -33,11 +67,6 @@ namespace BlueWater.Tycoons } - public override bool CanInteraction() - { - return TycoonManager.Instance.TycoonStatus.CurrentGold >= _requiredGold; - } - private IEnumerator OpenRewardBoxCoroutine() { _isInteracting = true; diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 04d0fc85a..1b6d64bdb 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -2,6 +2,7 @@ using BlueWater.Audios; using BlueWater.Items; using BlueWater.Players; using UnityEngine; +using UnityEngine.Serialization; namespace BlueWater.Tycoons { @@ -20,9 +21,12 @@ namespace BlueWater.Tycoons { [SerializeField] private SpineController _spineController; + + [SerializeField] + private float _discardHoldingTime = 0.5f; [SerializeField] - private float _playerHoldingTime = 1f; + private float _randomChangeHoldingTime = 1f; [SerializeField] private bool _canRandomChange; @@ -81,13 +85,27 @@ namespace BlueWater.Tycoons if (_isPlayerInteracting) { - HoldingElapsedTime += Time.deltaTime / _playerHoldingTime; + if (_isChanged) + { + HoldingElapsedTime += Time.deltaTime / _randomChangeHoldingTime; + } + else + { + HoldingElapsedTime += Time.deltaTime / _discardHoldingTime; + } } else { if (HoldingElapsedTime > 0f) { - HoldingElapsedTime -= Time.deltaTime; + if (_isChanged) + { + HoldingElapsedTime -= Time.deltaTime / _randomChangeHoldingTime; + } + else + { + HoldingElapsedTime -= Time.deltaTime / _discardHoldingTime; + } } } } diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 1e1509d18..da0c701d9 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -130,7 +130,6 @@ namespace BlueWater.Tycoons { var spawnPosition = Utils.RandomPositionOnGraph(); var mushroom = Instantiate(_mushroomObject, spawnPosition, _mushroomObject.transform.rotation); - mushroom.Initialize(); } public void CreateChest(LevelData levelData) diff --git a/Assets/03.Images/Props/Furniture/Statue03.png b/Assets/03.Images/Props/Furniture/Statue.png similarity index 100% rename from Assets/03.Images/Props/Furniture/Statue03.png rename to Assets/03.Images/Props/Furniture/Statue.png diff --git a/Assets/03.Images/Props/Furniture/Statue03.png.meta b/Assets/03.Images/Props/Furniture/Statue.png.meta similarity index 100% rename from Assets/03.Images/Props/Furniture/Statue03.png.meta rename to Assets/03.Images/Props/Furniture/Statue.png.meta diff --git a/Assets/03.Images/Props/Furniture/test4.png b/Assets/03.Images/Props/Furniture/test4.png deleted file mode 100644 index 3ce112d4b..000000000 Binary files a/Assets/03.Images/Props/Furniture/test4.png and /dev/null differ diff --git a/Assets/03.Images/Props/Furniture/test4.png.meta b/Assets/03.Images/Props/Furniture/test4.png.meta deleted file mode 100644 index ac7107e4d..000000000 --- a/Assets/03.Images/Props/Furniture/test4.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 6aa6548e9b3c0574d8d53929da3eeac9 -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: 512 - 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: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Props/Furniture/test5.png b/Assets/03.Images/Props/Furniture/test5.png deleted file mode 100644 index 492d3c37a..000000000 Binary files a/Assets/03.Images/Props/Furniture/test5.png and /dev/null differ diff --git a/Assets/03.Images/Props/Furniture/test5.png.meta b/Assets/03.Images/Props/Furniture/test5.png.meta deleted file mode 100644 index cd331c7f5..000000000 --- a/Assets/03.Images/Props/Furniture/test5.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: c756503014e6eda40a45523c05505d87 -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: 512 - 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: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab index 6e2d97b33..df4c3de55 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab @@ -26,7 +26,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Name - value: Fence02 + value: LongTableBar objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalRotation.w @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Size.z - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Center.y @@ -82,7 +82,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Center.z - value: 0.1 + value: 0.05 objectReference: {fileID: 0} - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Sprite diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab index 8c98060a0..d418be7c6 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab @@ -16,6 +16,18 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 0.5 @@ -192,18 +204,20 @@ MonoBehaviour: k__BackingField: {fileID: 6077686033771388879} k__BackingField: {fileID: 6533109861150454071} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: {fileID: 0} k__BackingField: 1 k__BackingField: 0.8 k__BackingField: IsOpened: 0 - _playerHoldingTime: 3 + _playerHoldingTime: 1 _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} _offset: {x: 0, y: 1.5, z: 0} + _delay: 0.2 + _payMoneyUiDuration: 0.5 _empty: {fileID: 21300000, guid: 3da5d6eace330f04397ef9c546a69ced, type: 3} _level1: {fileID: 21300000, guid: 217c5c30fa315ab4c8e0fe76ef1d18f7, type: 3} _level2: {fileID: 21300000, guid: ffbde217e84dd754ab6e6d721618490b, type: 3} _level3: {fileID: 21300000, guid: 5c3538f8606c62847a8dfd21aa39a2fe, type: 3} - k__BackingField: 0 --- !u!114 &2621544615787308462 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab index 6422950d2..1c1928e90 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab @@ -92,25 +92,41 @@ PrefabInstance: propertyPath: m_FillOrigin value: 2 objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab index ea76ce918..560f07e9a 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab @@ -76,15 +76,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -100,7 +100,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.15 objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -110,6 +110,26 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsTrigger value: 1 @@ -132,15 +152,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -152,11 +172,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.15 objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite @@ -178,17 +198,25 @@ PrefabInstance: propertyPath: m_Name value: NormalRewardBox objectReference: {fileID: 0} + - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5297271561052779189, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 6069594819010820018, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -0.35000002 objectReference: {fileID: 0} - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite @@ -218,13 +246,25 @@ PrefabInstance: propertyPath: m_FillOrigin value: 2 objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -298,6 +338,18 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y value: 0.2 @@ -314,8 +366,7 @@ PrefabInstance: propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -394,6 +445,10 @@ MonoBehaviour: k__BackingField: IsOpened: 0 _animationController: {fileID: 4960744589634642266} + _shakeDuration: 0.3 + _shakePosition: {x: 0.05, y: 0, z: 0} + _vibrato: 30 + _ease: 6 --- !u!114 &4960744589634642266 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab index fe55b009b..67607d010 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab @@ -74,6 +74,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15 + objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 40 @@ -82,6 +106,26 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsTrigger value: 1 @@ -102,6 +146,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 80 objectReference: {fileID: 0} + - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15 + objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: @@ -122,14 +194,26 @@ PrefabInstance: propertyPath: m_Name value: RareRewardBox objectReference: {fileID: 0} + - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5297271561052779189, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6069594819010820018, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: -0.35000002 + objectReference: {fileID: 0} - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: @@ -158,13 +242,25 @@ PrefabInstance: propertyPath: m_FillOrigin value: 2 objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -222,6 +318,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y value: 0.2 @@ -317,6 +425,10 @@ MonoBehaviour: k__BackingField: IsOpened: 0 _animationController: {fileID: 4960744589634642266} + _shakeDuration: 0.3 + _shakePosition: {x: 0.05, y: 0, z: 0} + _vibrato: 30 + _ease: 6 --- !u!114 &4960744589634642266 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 208eafc06..c21692ea3 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -36,24 +36,24 @@ MonoBehaviour: - rid: 5032277253446697243 - rid: 5032277253446697244 - rid: 5032277253446697245 - - rid: 203358408982659253 + - rid: 203358408982659296 - rid: 5032277253446697247 - rid: 5032277253446697248 - - rid: 203358408982659254 - - rid: 203358408982659255 + - rid: 203358408982659297 + - rid: 203358408982659298 - rid: 5032277253446697251 - - rid: 203358408982659256 + - rid: 203358408982659299 - rid: 5032277253446697253 - - rid: 203358408982659257 + - rid: 203358408982659300 - rid: 5032277253446697255 - - rid: 203358408982659258 - - rid: 203358408982659259 + - rid: 203358408982659301 + - rid: 203358408982659302 - rid: 5032277253446697258 - rid: 5032277253446697259 - - rid: 203358408982659260 - - rid: 203358408982659261 + - rid: 203358408982659303 + - rid: 203358408982659304 - rid: 5032277253446697262 - - rid: 203358408982659262 + - rid: 203358408982659305 m_RuntimeSettings: m_List: - rid: 5032277253446697243 @@ -90,7 +90,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 203358408982659253 + - rid: 203358408982659296 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -105,14 +105,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: 203358408982659254 + - rid: 203358408982659297 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: 203358408982659255 + - rid: 203358408982659298 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -120,7 +120,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: 203358408982659256 + - rid: 203358408982659299 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -132,7 +132,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: 203358408982659257 + - rid: 203358408982659300 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -145,7 +145,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: 203358408982659258 + - rid: 203358408982659301 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -155,7 +155,7 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 203358408982659259 + - rid: 203358408982659302 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -168,19 +168,19 @@ MonoBehaviour: skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3} renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3} - - rid: 203358408982659260 + - rid: 203358408982659303 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 203358408982659261 + - rid: 203358408982659304 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: 203358408982659262 + - rid: 203358408982659305 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 4bc9e92e3..a8c42bb78 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.4.15 + bundleVersion: 0.3.4.16 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}