diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 5e9fba18c..b6ac20ca2 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -5716,7 +5716,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 437358690} 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: @@ -5726,7 +5726,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -30} + m_AnchoredPosition: {x: 290, y: -30} m_SizeDelta: {x: 156.65, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &437358692 @@ -6983,10 +6983,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 437358691} - {fileID: 787877602} - {fileID: 795005108} - {fileID: 1289750986} + - {fileID: 437358691} m_Father: {fileID: 588336991} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -16664,6 +16664,18 @@ PrefabInstance: propertyPath: _instanceLocation value: objectReference: {fileID: 410235870} + - target: {fileID: 4119089025960676272, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7640850047456124134, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8858452115783968250, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} - target: {fileID: 9041926907780427371, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Name value: NewTycoonMap @@ -22659,6 +22671,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2} + _mushroomObject: {fileID: 9017181398980009727, guid: 6ae3ef0fd03a4f14bb60802eb4fc0fa8, type: 3} --- !u!114 &1665075873 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs index cbf4ca932..457a2fc93 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs @@ -15,7 +15,7 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - if (_crew.CrewInteraction != null) + if (_crew.CrewInteraction != null && _crew.CrewInteraction.CenterTransform) { _crew.AIMovement.Move(_crew.CrewInteraction.CenterTransform.position); } diff --git a/Assets/02.Scripts/Character/Npc/Crew/Crew.cs b/Assets/02.Scripts/Character/Npc/Crew/Crew.cs index fd317438e..903496225 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/Crew.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/Crew.cs @@ -95,7 +95,6 @@ namespace BlueWater.Npcs.Crews protected virtual void Update() { - //CurrentAnimationState.UpdateState(this); HandleMovement(); FlipVisualLook(); } diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index e1dcab401..d2d31aa6d 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -439,6 +439,23 @@ namespace BlueWater.Npcs.Customers { var spawnPosition = transform.position + new Vector3(0f, 0f, 0.1f); Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation); + TycoonStageController.VomitCount++; + if (TycoonStageController.VomitCount >= 3) + { + // TODO : 80% 곰팡이, 20% 버섯 + var random = Random.Range(0, 101); + if (random <= 20) + { + print("버섯 생성"); + EventManager.InvokeCreateMushroom(); + } + else + { + print("곰팡이 생성"); + EventManager.InvokeCreateMold(); + } + TycoonStageController.VomitCount = 0; + } IsVomited = true; StateMachineController.TransitionToState(IdleState, this); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index fdd852adc..bdb7e9740 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -125,6 +125,14 @@ namespace BlueWater.Players.Tycoons } } + public void OnManual(InputAction.CallbackContext context) + { + if (context.performed) + { + TycoonUiManager.Instance.ManualBook.Open(); + } + } + public void OnZoomOut(InputAction.CallbackContext context) { var value = context.ReadValue(); @@ -154,22 +162,6 @@ namespace BlueWater.Players.Tycoons } } - // Bar - public void OnPour(InputAction.CallbackContext context) - { - var bar = FindAnyObjectByType(); - if (!bar) return; - - if (context.performed) - { - bar.ActiveIsPouring(); - } - else if (context.canceled) - { - bar.InActiveIsPouring(); - } - } - #endregion #region Methods diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 932d208c3..8f50d42b6 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -256,6 +256,20 @@ namespace BlueWater OnAutoSupplyBarrels?.Invoke(); } + // 버섯 생성 이벤트 + public static Action OnCreateMushroom; + public static void InvokeCreateMushroom() + { + OnCreateMushroom?.Invoke(); + } + + // 곰팡이 생성 이벤트 + public static Action OnCreateMold; + public static void InvokeCreateMold() + { + OnCreateMold?.Invoke(); + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index 7297913c4..aa7f9ff71 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -58,7 +58,7 @@ namespace BlueWater.Tycoons EventManager.OnAddBarrels += AddCurrentAmount; EventManager.OnAutoSupplyBarrels += AutoSupply; - _liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock; + _liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; InteractionMessage = $"{_liquidData.Name} 따르기"; _instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity); } @@ -144,7 +144,7 @@ namespace BlueWater.Tycoons public void Activate() { IsActivated = true; - _liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock; + _liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; SetCurrentAmount(_liquidData.GetMaxAmount()); } diff --git a/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs index af906086f..c179fb07f 100644 --- a/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs @@ -7,9 +7,6 @@ namespace BlueWater.Tycoons { public class CustomerTable : MonoBehaviour { - [SerializeField] - private GameObject _carpetObject; - [SerializeField] private List _tableSeats; @@ -59,13 +56,11 @@ namespace BlueWater.Tycoons public void Show() { gameObject.SetActive(true); - _carpetObject.SetActive(true); } public void Hide() { gameObject.SetActive(false); - _carpetObject.SetActive(false); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs new file mode 100644 index 000000000..5c7cf28e3 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs @@ -0,0 +1,88 @@ + +using System; +using UnityEngine; + +namespace BlueWater.Tycoons +{ + [Serializable] + public class Mushroom : InteractionFurniture + { + [SerializeField] + private float _playerHoldingTime = 3f; + + private Sprite _mushroomSprite; + private bool _isPlayerInteracting; + + protected override void OnEnable() + { + base.OnEnable(); + + Initialize(); + } + + private void Update() + { + if (InteractionCanvas.BalloonUi.IsWaitTimeOver()) + { + Destroy(); + } + + if (IsShowing) + { + EventManager.InvokeHoldInteracting(HoldingElapsedTime); + } + + if (HoldingElapsedTime >= 1f) + { + TycoonManager.Instance.TycoonStatus.CurrentPlayerHealth++; + + Destroy(); + } + + if (_isPlayerInteracting) + { + HoldingElapsedTime += Time.deltaTime / _playerHoldingTime; + } + else + { + if (HoldingElapsedTime > 0f) + { + HoldingElapsedTime -= Time.deltaTime; + } + } + } + + public void Initialize() + { + _mushroomSprite = VisualLook.GetComponent().sprite; + InteractionCanvas.BalloonUi.OrderItem(_mushroomSprite, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.MushroomWaitTime); + } + + public override void Interaction() + { + GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = true; + _isPlayerInteracting = true; + } + + public override void CancelInteraction() + { + GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = false; + _isPlayerInteracting = false; + } + + public override bool CanInteraction() + { + return !GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything(); + } + + private void Destroy() + { + if (_isPlayerInteracting) + { + GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = false; + } + + Destroy(gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs.meta b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs.meta new file mode 100644 index 000000000..d9bee2348 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6fe2e54f1eabe774a99eaf6fe7068379 diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index 3c0d66c03..3dbfdfb36 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -24,7 +24,7 @@ namespace BlueWater.Tycoons private float _crewHoldingTime = 9f; private LevelData _currentLevelData; - private Sprite vomitingImage; + private Sprite _vomitingImage; private Coroutine _findCleanerCrewInstance; private bool _isPlayerInteracting; private bool _isCrewInteracting; @@ -100,9 +100,8 @@ namespace BlueWater.Tycoons public void Initialize() { - InteractionMessage = "치우기"; - vomitingImage = VisualLook.GetComponent().sprite; - InteractionCanvas.BalloonUi.OrderItem(vomitingImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime); + _vomitingImage = VisualLook.GetComponent().sprite; + InteractionCanvas.BalloonUi.OrderItem(_vomitingImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime); var crewController = TycoonManager.Instance.CrewController; Utils.StartUniqueCoroutine(this, ref _findCleanerCrewInstance, crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.CleanerCrews, crew => crew.OnMission(this))); diff --git a/Assets/02.Scripts/ScriptableObject/SpriteData.asset b/Assets/02.Scripts/ScriptableObject/SpriteData.asset index 3061476f1..5d6188320 100644 --- a/Assets/02.Scripts/ScriptableObject/SpriteData.asset +++ b/Assets/02.Scripts/ScriptableObject/SpriteData.asset @@ -15,4 +15,6 @@ MonoBehaviour: k__BackingField: {fileID: 21300000, guid: 51c11bee66d04f64d8d44afcb9975321, type: 3} k__BackingField: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} k__BackingField: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} - k__BackingField: {fileID: 21300000, guid: c0cab5e7cc9fc5147b3f0aef86b2feab, type: 3} + k__BackingField: {fileID: 21300000, guid: c0cab5e7cc9fc5147b3f0aef86b2feab, type: 3} + k__BackingField: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} + k__BackingField: {fileID: 21300000, guid: e9275315ca60c1f479efa8f9393c7627, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/StageData.asset b/Assets/02.Scripts/ScriptableObject/StageData.asset index fa2711503..44f4288ab 100644 --- a/Assets/02.Scripts/ScriptableObject/StageData.asset +++ b/Assets/02.Scripts/ScriptableObject/StageData.asset @@ -17,3 +17,4 @@ MonoBehaviour: k__BackingField: 20 k__BackingField: 100 k__BackingField: 30 + k__BackingField: 30 diff --git a/Assets/02.Scripts/SpriteDataSo.cs b/Assets/02.Scripts/SpriteDataSo.cs index b28b19d15..bf018fecc 100644 --- a/Assets/02.Scripts/SpriteDataSo.cs +++ b/Assets/02.Scripts/SpriteDataSo.cs @@ -15,6 +15,12 @@ namespace BlueWater public Sprite FullBeerGlass { get; private set; } [field: SerializeField] - public Sprite Lock { get; private set; } + public Sprite BarrelLock { get; private set; } + + [field: SerializeField] + public Sprite ServingTable { get; private set; } + + [field: SerializeField] + public Sprite BartenderTable { get; private set; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/StageDataSo.cs b/Assets/02.Scripts/Tycoon/StageDataSo.cs index 17353fdb6..b9dff8497 100644 --- a/Assets/02.Scripts/Tycoon/StageDataSo.cs +++ b/Assets/02.Scripts/Tycoon/StageDataSo.cs @@ -19,5 +19,8 @@ namespace BlueWater.Tycoons [field: SerializeField] public int DirtyTableWaitTime { get; private set; } = 30; + + [field: SerializeField] + public int MushroomWaitTime { get; private set; } = 30; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index bf0ea1f28..57c546f15 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -13,21 +13,35 @@ namespace BlueWater.Tycoons [field: SerializeField, Required] public StageDataSo StageDataSo { get; private set; } + [SerializeField] + private Mushroom _mushroomObject; + public Dictionary InstanceCocktailDatas { get; private set; } = new(); + public static int VomitCount; + private bool _isClosedTime; private TycoonManager _tycoonManager; + private AstarPath _astarPath; private Coroutine _startStageCoroutineInstance; private TimeSpan _closedTime; + private void Awake() + { + _astarPath = FindAnyObjectByType(); + } + private void Start() { _tycoonManager = TycoonManager.Instance; + VomitCount = 0; + EventManager.OnInitializedPlayerInput += StartStage; EventManager.OnMakeCocktailCompleted += AddInstanceCocktail; EventManager.OnCocktailServedToCustomer += RemoveInstanceCocktail; EventManager.OnCocktailDiscarded += RemoveInstanceCocktail; + EventManager.OnCreateMushroom += CreateMushroom; } private void OnDestroy() @@ -36,6 +50,7 @@ namespace BlueWater.Tycoons EventManager.OnMakeCocktailCompleted -= AddInstanceCocktail; EventManager.OnCocktailServedToCustomer -= RemoveInstanceCocktail; EventManager.OnCocktailDiscarded -= RemoveInstanceCocktail; + EventManager.OnCreateMushroom -= CreateMushroom; } private void StartStage() @@ -102,5 +117,12 @@ namespace BlueWater.Tycoons } print("\n"); } + + public void CreateMushroom() + { + var spawnPosition = Utils.RandomPositionOnGraph(); + var mushroom = Instantiate(_mushroomObject, spawnPosition, _mushroomObject.transform.rotation); + mushroom.Initialize(); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs b/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs index b64031b9a..1fc32d26e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs @@ -21,12 +21,6 @@ namespace BlueWater.Uis [SerializeField] private float _duration = 2f; - - [SerializeField] - private float _shakeAmount = 0.1f; - - [SerializeField] - private int _shakeVibrato = 4; public void Initialize(int gold) { diff --git a/Assets/02.Scripts/Ui/Tycoon/PumpingMessage.cs b/Assets/02.Scripts/Ui/Tycoon/PumpingMessage.cs index 1fccb92bb..1586080e1 100644 --- a/Assets/02.Scripts/Ui/Tycoon/PumpingMessage.cs +++ b/Assets/02.Scripts/Ui/Tycoon/PumpingMessage.cs @@ -17,12 +17,6 @@ namespace BlueWater [SerializeField] private float _duration = 2f; - - [SerializeField] - private float _shakeAmount = 0.1f; - - [SerializeField] - private int _shakeVibrato = 4; public void Initialize(int addedLiquid) { diff --git a/Assets/02.Scripts/Utility/Utils.cs b/Assets/02.Scripts/Utility/Utils.cs index 1fbe324a7..6a3479a91 100644 --- a/Assets/02.Scripts/Utility/Utils.cs +++ b/Assets/02.Scripts/Utility/Utils.cs @@ -1,7 +1,9 @@ using System; using System.Collections; using System.Collections.Generic; +using Pathfinding; using UnityEngine; +using Random = UnityEngine.Random; namespace BlueWater.Utility { @@ -54,5 +56,39 @@ namespace BlueWater.Utility list.Remove(item); } + + public static Vector3 RandomPositionOnGraph(int graphIndex = 0) + { + // 그래프 인덱스가 유효한지 검사 + if (graphIndex < 0 || graphIndex >= AstarPath.active.data.graphs.Length) + { + throw new Exception("유효하지 않은 그래프 인덱스입니다."); + } + + // 특정 그래프를 가져와 모든 walkable 노드를 수집 + List walkableNodes = new List(); + NavGraph graph = AstarPath.active.data.graphs[graphIndex]; + + graph.GetNodes(node => + { + if (node.Walkable) + { + walkableNodes.Add(node); + } + return true; // 모든 노드를 반복하도록 true 반환 + }); + + // walkable한 노드가 없을 경우 Vector3.zero 반환 + if (walkableNodes.Count == 0) + { + throw new Exception("이동 가능한 노드가 없습니다."); + } + + // walkable한 노드 중 하나를 무작위로 선택 + GraphNode randomNode = walkableNodes[Random.Range(0, walkableNodes.Count)]; + + // 선택한 노드의 위치 반환 + return (Vector3)randomNode.position; + } } } \ No newline at end of file diff --git a/Assets/03.Images/Props/Furniture/BartenderTable.png b/Assets/03.Images/Props/Furniture/BartenderTable.png new file mode 100644 index 000000000..f3cdc212f Binary files /dev/null and b/Assets/03.Images/Props/Furniture/BartenderTable.png differ diff --git a/Assets/03.Images/Props/Furniture/BartenderTable01.png.meta b/Assets/03.Images/Props/Furniture/BartenderTable.png.meta similarity index 100% rename from Assets/03.Images/Props/Furniture/BartenderTable01.png.meta rename to Assets/03.Images/Props/Furniture/BartenderTable.png.meta diff --git a/Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png b/Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png new file mode 100644 index 000000000..7d46a8acc Binary files /dev/null and b/Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png differ diff --git a/Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png.meta b/Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png.meta new file mode 100644 index 000000000..2c8333beb --- /dev/null +++ b/Assets/03.Images/Props/Furniture/LiquidBarrelDirty.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: ba260ff89030fda4b99b2bb66f6da61d +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/Mushroom.png b/Assets/03.Images/Props/Furniture/Mushroom.png new file mode 100644 index 000000000..ba9677e7d Binary files /dev/null and b/Assets/03.Images/Props/Furniture/Mushroom.png differ diff --git a/Assets/03.Images/Props/Furniture/Mushroom.png.meta b/Assets/03.Images/Props/Furniture/Mushroom.png.meta new file mode 100644 index 000000000..c8a7d17ec --- /dev/null +++ b/Assets/03.Images/Props/Furniture/Mushroom.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 9b1a96853ff579e448f90dd066ea0eb0 +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/BartenderTable01.png b/Assets/03.Images/Props/Furniture/ServingTable.png similarity index 100% rename from Assets/03.Images/Props/Furniture/BartenderTable01.png rename to Assets/03.Images/Props/Furniture/ServingTable.png diff --git a/Assets/03.Images/Props/Furniture/ServingTable01.png.meta b/Assets/03.Images/Props/Furniture/ServingTable.png.meta similarity index 100% rename from Assets/03.Images/Props/Furniture/ServingTable01.png.meta rename to Assets/03.Images/Props/Furniture/ServingTable.png.meta diff --git a/Assets/03.Images/Props/Furniture/ServingTable01.png b/Assets/03.Images/Props/Furniture/ServingTable01.png deleted file mode 100644 index 6d7bc9a3c..000000000 Binary files a/Assets/03.Images/Props/Furniture/ServingTable01.png and /dev/null differ diff --git a/Assets/03.Images/Props/Furniture/TrashCan.png b/Assets/03.Images/Props/Furniture/TrashCan.png index da6bea146..05a4d7d82 100644 Binary files a/Assets/03.Images/Props/Furniture/TrashCan.png and b/Assets/03.Images/Props/Furniture/TrashCan.png differ diff --git a/Assets/03.Images/Props/Furniture/Vomiting.png b/Assets/03.Images/Props/Furniture/Vomiting.png index 4dd13db93..22c39a7be 100644 Binary files a/Assets/03.Images/Props/Furniture/Vomiting.png and b/Assets/03.Images/Props/Furniture/Vomiting.png differ diff --git a/Assets/03.Images/Props/Furniture/Vomiting.png.meta b/Assets/03.Images/Props/Furniture/Vomiting.png.meta index 4e6f79f3a..e4c2a9c9f 100644 --- a/Assets/03.Images/Props/Furniture/Vomiting.png.meta +++ b/Assets/03.Images/Props/Furniture/Vomiting.png.meta @@ -47,8 +47,8 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 0.5, y: 0.3} - spritePixelsToUnits: 1024 + spritePivot: {x: 0.5, y: 0.27} + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Ui/Tycoon/Lock.png b/Assets/03.Images/Ui/Tycoon/BarrelLock.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Lock.png rename to Assets/03.Images/Ui/Tycoon/BarrelLock.png diff --git a/Assets/03.Images/Ui/Tycoon/Lock.png.meta b/Assets/03.Images/Ui/Tycoon/BarrelLock.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Lock.png.meta rename to Assets/03.Images/Ui/Tycoon/BarrelLock.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/BartenderIcon.png b/Assets/03.Images/Ui/Tycoon/BartenderIcon.png index d44413d90..602f6b49f 100644 Binary files a/Assets/03.Images/Ui/Tycoon/BartenderIcon.png and b/Assets/03.Images/Ui/Tycoon/BartenderIcon.png differ diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab index bdb6d78ed..f6f0736b1 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab @@ -54,10 +54,9 @@ MonoBehaviour: k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 k__BackingField: 0.6 - k__BackingField: + k__BackingField: Cleaning up table IsOpened: 0 _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} - _instanceLocation: {fileID: 0} _offset: {x: 0, y: 1.5, z: 0} k__BackingField: 0 k__BackingField: 0 @@ -383,10 +382,9 @@ MonoBehaviour: k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 k__BackingField: 0.6 - k__BackingField: + k__BackingField: Cleaning up table IsOpened: 0 _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} - _instanceLocation: {fileID: 0} _offset: {x: 0, y: 1.5, z: 0} k__BackingField: 0 k__BackingField: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab new file mode 100644 index 000000000..7dd882106 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab @@ -0,0 +1,221 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 1702261025824090784, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9b1a96853ff579e448f90dd066ea0eb0, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: Mushroom + objectReference: {fileID: 0} + - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a327d1fc80d90bd438cfcd1ad2b219c7, type: 3} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.g + value: 0.026785713 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillAmount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillMethod + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillOrigin + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + 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 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9b1a96853ff579e448f90dd066ea0eb0, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 9017181398980009727} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9017181398980009727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6fe2e54f1eabe774a99eaf6fe7068379, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 6533109861150454071} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: 1 + k__BackingField: 0.6 + k__BackingField: Cleaning up mushroom + IsOpened: 0 + _playerHoldingTime: 3 +--- !u!4 &5927803667513949971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!212 &6077686033771388879 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab.meta new file mode 100644 index 000000000..efae9f34f --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ae3ef0fd03a4f14bb60802eb4fc0fa8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab index 54b0687c7..aff595ff9 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 6373979881487551315} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.679, z: -0} + m_LocalPosition: {x: 0, y: 0.438, z: -0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -130,7 +130,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2c91f9927b2422c4382675d00e294834, type: 3} + objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -143,6 +143,10 @@ PrefabInstance: propertyPath: m_Name value: ServingTable02 objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.3 + objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 30 @@ -153,15 +157,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -206,7 +210,7 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2c91f9927b2422c4382675d00e294834, type: 3} + objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab index 493eb8705..a1623f769 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab @@ -12,6 +12,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 40 objectReference: {fileID: 0} + - target: {fileID: 1702261025824090784, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 1 @@ -203,10 +207,9 @@ MonoBehaviour: k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 k__BackingField: 0.5 - k__BackingField: "\uCE58\uC6B0\uAE30" + k__BackingField: Cleaning up vomiting IsOpened: 0 _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} - _instanceLocation: {fileID: 0} _offset: {x: 0, y: 1.5, z: 0} _playerHoldingTime: 3 _crewHoldingTime: 9