diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 6d0b3a89d..3837c8ba9 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -4292,7 +4292,7 @@ Canvas: m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 + m_SortingLayerID: -403788685 m_SortingOrder: 6 m_TargetDisplay: 0 --- !u!224 &410235870 @@ -13738,6 +13738,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 371415756620820274, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15000153 + objectReference: {fileID: 0} - target: {fileID: 394003937711580801, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -13770,10 +13774,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 482603425943616072, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 489636773431890722, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 662613168352054153, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.30000305 + objectReference: {fileID: 0} + - target: {fileID: 662613168352054153, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15000153 + objectReference: {fileID: 0} - target: {fileID: 673115180100039284, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13834,6 +13850,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 831318709511076936, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 854623182969124375, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -13862,6 +13882,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 910525772579420346, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1083130634513463642, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13894,6 +13918,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1135814094815798845, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1200502737992636705, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -14154,6 +14182,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2360814617420580628, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15000153 + objectReference: {fileID: 0} - target: {fileID: 2378963517708785758, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -14214,6 +14246,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2696863799550889229, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2700294535905665279, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -14330,6 +14366,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3231007145086706607, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.30000305 + objectReference: {fileID: 0} + - target: {fileID: 3231007145086706607, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15000153 + objectReference: {fileID: 0} - target: {fileID: 3277011480977519073, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -14614,6 +14658,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4680308257036555518, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4750100252886375725, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -14874,6 +14922,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5724500824176785532, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15000153 + objectReference: {fileID: 0} - target: {fileID: 5735524630930733454, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -14902,6 +14954,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5801760501036704266, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5803948774012958269, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -15114,6 +15170,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6981944202713437315, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7024048738036787745, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -15186,6 +15246,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7386145710632432865, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.30000305 + objectReference: {fileID: 0} + - target: {fileID: 7386145710632432865, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.15000153 + objectReference: {fileID: 0} - target: {fileID: 7415030781250900063, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -15270,6 +15338,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7763168041638109675, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7772255840530486879, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -27585,10 +27657,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.27579662 objectReference: {fileID: 0} - - target: {fileID: 7860912239456808729, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8258969574862853637, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x value: 0.14923969 @@ -27677,10 +27745,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.35711366 objectReference: {fileID: 0} - - target: {fileID: 8804688619532928159, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8873814250568851775, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x value: -0.15334415 diff --git a/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs b/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs index 048acc210..b89d15edf 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs @@ -78,7 +78,11 @@ namespace BlueWater.Npcs.Crews.Bartender return !OrderedCustomer && !IsMakingCocktail; } - public void SetBartenderTable(BartenderTable bartenderTable) => MyBartenderTable = bartenderTable; + public void SetBartenderTable(BartenderTable bartenderTable) + { + MyBartenderTable = bartenderTable; + MyBartenderTable.Active(); + } public void SetOrderedCustomer(Customer orderedCustomer) { diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 81870b204..5e63a513f 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -96,12 +96,6 @@ namespace BlueWater.Npcs.Customers [SerializeField] private Vomiting _vomiting; - [SerializeField] - private Color _startColor = Color.green; - - [SerializeField] - private Color _endColor = Color.red; - [field: Title("실시간 데이터")] [field: SerializeField] public LevelData CurrentLevelData { get; private set; } @@ -173,6 +167,14 @@ namespace BlueWater.Npcs.Customers // Unity events #region Unity events + + private void OnDrawGizmosSelected() + { + if (!CenterTransform) return; + + Gizmos.color = Color.blue; + Gizmos.DrawWireSphere(CenterTransform.position, InteractionRadius); + } private void Awake() { @@ -291,7 +293,7 @@ namespace BlueWater.Npcs.Customers CurrentTableSeat.MenuBalloonUi.ReceiveItem(cocktailData); if (IsOrderedCorrected) { - CurrentTableSeat.SetFood(); + CurrentTableSeat.SetFood(cocktailData.Sprite); StateMachineController.TransitionToState(HappyState, this); int tip; @@ -505,7 +507,7 @@ namespace BlueWater.Npcs.Customers IsOrderedCorrected = false; OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); var hurryTime = CurrentLevelData.HurryTime + TycoonManager.Instance.TycoonStatus.CustomerHurryTimeIncrease; - CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, startColor: _startColor, endColor: _endColor); + CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, true); _customerInteractionType = CustomerInteractionType.ServedCocktail; RegisterPlayerInteraction(); diff --git a/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs index 051fbfce1..2e93ff833 100644 --- a/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs @@ -2,11 +2,30 @@ using System; using BlueWater.Interfaces; using BlueWater.Npcs.Crews; using BlueWater.Npcs.Crews.Server; +using UnityEngine; namespace BlueWater.Tycoons { public class BartenderTable : ServingTable { + [SerializeField] + private Sprite _activeSprite; + + [SerializeField] + private Sprite _inactiveSprite; + + protected override void Awake() + { + base.Awake(); + + VisualLook.sprite = _inactiveSprite; + } + + public void Active() + { + VisualLook.sprite = _activeSprite; + } + public override void Interaction() { // 테이블의 칵테일을 가져가는 경우 @@ -14,8 +33,9 @@ namespace BlueWater.Tycoons { CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(CurrentPickupItem, true); CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + CocktailGlassImage.sprite = null; CocktailGlassImage.enabled = false; - InteractionCanvas.BalloonUi.DiscardItem(); + // InteractionCanvas.BalloonUi.DiscardItem(); CurrentPickupItem = null; OrderedCustomer = null; } @@ -40,8 +60,9 @@ namespace BlueWater.Tycoons public void CompleteMakingCocktail(IPickup cocktailData) { CurrentPickupItem = cocktailData; + CocktailGlassImage.sprite = CurrentPickupItem.Sprite; CocktailGlassImage.enabled = true; - InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + // InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs index c179fb07f..f7beb5e99 100644 --- a/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -7,30 +8,37 @@ namespace BlueWater.Tycoons { public class CustomerTable : MonoBehaviour { + [SerializeField] + private Collider _collider; + + [SerializeField] + private GameObject _visualLookObject; + + [SerializeField] + private SpriteRenderer _carpetRenderer; + [SerializeField] private List _tableSeats; [SerializeField] private int _tableNumber; + + [SerializeField] + private Sprite _carpetOnSprite; + + [SerializeField] + private Sprite _carpetOffSprite; private TableSeat _tableSeat; private Random _random = new(); private TycoonManager _tycoonManager; - private void OnEnable() + private void OnDestroy() { - foreach (var element in _tableSeats) + if (_tycoonManager && _tycoonManager.CustomerTableController) { - element.SetTableNumber(_tableNumber); + _tycoonManager.CustomerTableController.UnregisterTable(this); } - - _tycoonManager = TycoonManager.Instance; - _tycoonManager.CustomerTableController.RegisterTable(this); - } - - private void OnDisable() - { - _tycoonManager.CustomerTableController.UnregisterTable(this); } public TableSeat FindEmptySeat() @@ -55,12 +63,24 @@ namespace BlueWater.Tycoons public void Show() { - gameObject.SetActive(true); + _collider.enabled = true; + _carpetRenderer.sprite = _carpetOnSprite; + _visualLookObject.SetActive(true); + + foreach (var element in _tableSeats) + { + element.SetTableNumber(_tableNumber); + } + + _tycoonManager = TycoonManager.Instance; + _tycoonManager.CustomerTableController.RegisterTable(this); } public void Hide() { - gameObject.SetActive(false); + _collider.enabled = false; + _carpetRenderer.sprite = _carpetOffSprite; + _visualLookObject.SetActive(false); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs b/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs index 2f09d9ef1..3557d77e5 100644 --- a/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs +++ b/Assets/02.Scripts/Prop/Tycoon/MoneyCounter.cs @@ -1,4 +1,3 @@ - using System; using System.Collections; using System.Collections.Generic; @@ -6,6 +5,7 @@ using System.Linq; using BlueWater.Uis; using BlueWater.Utility; using Sirenix.OdinInspector; +using TMPro; using UnityEngine; namespace BlueWater.Tycoons @@ -13,9 +13,13 @@ namespace BlueWater.Tycoons [Serializable] public class MoneyCounter : InteractionFurniture { + [SerializeField] + private TMP_Text _totalGoldText; + [SerializeField] private float _playerHoldingTime = 1f; + [Title("연출")] [SerializeField] private PayMoneyUi _payMoneyUiObject; @@ -28,6 +32,7 @@ namespace BlueWater.Tycoons [SerializeField] private float _payMoneyUiDuration = 0.5f; + [Title("이미지")] [SerializeField] private Sprite _empty; @@ -100,6 +105,7 @@ namespace BlueWater.Tycoons public void Initialize() { _spriteRenderer = VisualLook.GetComponent(); + _totalGoldText.text = _addedGolds.Sum().ToString(); } public override void Interaction() @@ -120,6 +126,7 @@ namespace BlueWater.Tycoons public void AddCurrentGold(int gold) { _addedGolds.Enqueue(gold); + _totalGoldText.text = _addedGolds.Sum().ToString(); ChangeSprite(); } @@ -161,6 +168,7 @@ namespace BlueWater.Tycoons yield return delay; } + _totalGoldText.text = _addedGolds.Sum().ToString(); ChangeSprite(); _isGainGoldCoroutine = false; } diff --git a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs index 76b9788a1..f3b205d61 100644 --- a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs @@ -57,6 +57,8 @@ namespace BlueWater.Tycoons base.Awake(); _originalCocktailGlassMaterial = CocktailGlassImage.material; + CocktailGlassImage.sprite = null; + CocktailGlassImage.enabled = false; } public override void Interaction() @@ -66,8 +68,9 @@ namespace BlueWater.Tycoons { CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(CurrentPickupItem, true); CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + CocktailGlassImage.sprite = null; CocktailGlassImage.enabled = false; - InteractionCanvas.BalloonUi.DiscardItem(); + // InteractionCanvas.BalloonUi.DiscardItem(); CurrentPickupItem = null; OrderedCustomer = null; } @@ -76,7 +79,9 @@ namespace BlueWater.Tycoons { EventManager.InvokePlaceOnServingTable(); CurrentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); - InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + CocktailGlassImage.sprite = CurrentPickupItem.Sprite; + CocktailGlassImage.enabled = true; + // InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); CurrentTycoonPlayer.TycoonPickupHandler.DiscardItem(); CurrentTycoonPlayer.InteractionCanvas.BalloonUi.DiscardItem(); CocktailGlassImage.enabled = true; diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index 8a58e938c..276c767e7 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -125,15 +125,18 @@ namespace BlueWater.Tycoons if (_isPlayerInteracting) { + InteractionCanvas.BalloonUi.PauseTween(); HoldingElapsedTime += Time.deltaTime / _playerHoldingTime; } if (_isCrewInteracting) { + InteractionCanvas.BalloonUi.PauseTween(); HoldingElapsedTime += Time.deltaTime / (_crewHoldingTime - TycoonManager.Instance.TycoonStatus.CleanerCleaningReduction); } if (!_isPlayerInteracting && !_isCrewInteracting) { + InteractionCanvas.BalloonUi.ResumeTween(); if (HoldingElapsedTime > 0f) { HoldingElapsedTime -= Time.deltaTime; @@ -151,14 +154,15 @@ namespace BlueWater.Tycoons UnreserveSeat(); VacateSeat(); CleanTable(); + Food.sprite = null; Food.enabled = false; } public void SetTableNumber(int number) => TableNumber = number; - public void SetFood() + public void SetFood(Sprite cocktailSprite) { - Food.sprite = _fullBeerGlass; + Food.sprite = cocktailSprite; Food.enabled = true; } diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index 6372437c8..fce5d0277 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -82,15 +82,18 @@ namespace BlueWater.Tycoons if (_isPlayerInteracting) { + InteractionCanvas.BalloonUi.PauseTween(); HoldingElapsedTime += Time.deltaTime / _playerHoldingTime; } if (_isCrewInteracting) { + InteractionCanvas.BalloonUi.PauseTween(); HoldingElapsedTime += Time.deltaTime / (_crewHoldingTime - TycoonManager.Instance.TycoonStatus.CleanerCleaningReduction); } if (!_isPlayerInteracting && !_isCrewInteracting) { + InteractionCanvas.BalloonUi.ResumeTween(); if (HoldingElapsedTime > 0f) { HoldingElapsedTime -= Time.deltaTime; diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index cf986cbf9..a0520f17a 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -46,7 +46,10 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 0cf23778fd0b2994c9d608fbbf185468, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidA + k__BackingField: 100 + k__BackingField: 300 - k__BackingField: Cocktail002 k__BackingField: k__BackingField: Cocktail002 @@ -63,7 +66,10 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidB + k__BackingField: 100 + k__BackingField: 300 - k__BackingField: Cocktail003 k__BackingField: k__BackingField: Cocktail003 @@ -80,7 +86,10 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: c55f4b0a55a391d488e54a28dc840509, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidC + k__BackingField: 100 + k__BackingField: 300 - k__BackingField: Cocktail004 k__BackingField: k__BackingField: Cocktail004 @@ -97,7 +106,10 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 576d6ff3856f8ef419586ff12f2742b5, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidD + k__BackingField: 100 + k__BackingField: 300 - k__BackingField: Cocktail005 k__BackingField: k__BackingField: Cocktail005 @@ -114,7 +126,10 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidE + k__BackingField: 100 + k__BackingField: 300 - k__BackingField: Cocktail006 k__BackingField: k__BackingField: Cocktail006 @@ -131,7 +146,13 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 6a4cd8cdf11fe024e8ecac8e3d60e10d, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidA + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: LiquidC + k__BackingField: 50 + k__BackingField: 150 - k__BackingField: Cocktail007 k__BackingField: k__BackingField: Cocktail007 @@ -148,7 +169,13 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: b38089ff4046ac044ba79dfa5116aa1b, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidB + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: LiquidD + k__BackingField: 50 + k__BackingField: 150 - k__BackingField: Cocktail008 k__BackingField: k__BackingField: Cocktail008 @@ -165,7 +192,13 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 71954183dfb02424d835d964c2eb3fc6, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidC + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: LiquidD + k__BackingField: 50 + k__BackingField: 150 - k__BackingField: Cocktail009 k__BackingField: k__BackingField: Cocktail009 @@ -182,7 +215,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: d0748411047fc4a41beb1fb8d551e01e, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidA + k__BackingField: 30 + k__BackingField: 90 + - k__BackingField: LiquidB + k__BackingField: 30 + k__BackingField: 90 + - k__BackingField: LiquidE + k__BackingField: 40 + k__BackingField: 120 - k__BackingField: Cocktail010 k__BackingField: k__BackingField: Cocktail010 @@ -199,7 +241,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 335f1df58cd58914f97fe9ccae7f6c8c, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidC + k__BackingField: 30 + k__BackingField: 90 + - k__BackingField: LiquidD + k__BackingField: 30 + k__BackingField: 90 + - k__BackingField: LiquidE + k__BackingField: 40 + k__BackingField: 120 - k__BackingField: Cocktail011 k__BackingField: k__BackingField: Cocktail011 @@ -216,7 +267,13 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: a2cd1b193f5007c4f8a68b1cdd4ca2c1, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidB + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: Garnish1 + k__BackingField: 50 + k__BackingField: 150 - k__BackingField: Cocktail012 k__BackingField: k__BackingField: Cocktail012 @@ -233,7 +290,13 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: ee344f47787d148448bd3373235281b6, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidD + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: Garnish1 + k__BackingField: 50 + k__BackingField: 150 - k__BackingField: Cocktail013 k__BackingField: k__BackingField: Cocktail013 @@ -250,7 +313,13 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: aef7fd596cbfc854d87f408c14951641, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidA + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: Garnish2 + k__BackingField: 50 + k__BackingField: 150 - k__BackingField: Cocktail014 k__BackingField: k__BackingField: Cocktail014 @@ -267,7 +336,13 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 91d99e534e5f3c04094b14ed920bec04, type: 3} - k__BackingField: [] + k__BackingField: + - k__BackingField: LiquidC + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: Garnish2 + k__BackingField: 50 + k__BackingField: 150 - k__BackingField: Cocktail015 k__BackingField: k__BackingField: Cocktail015 @@ -283,6 +358,12 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: ee344f47787d148448bd3373235281b6, type: 3} - k__BackingField: [] + k__BackingField: {fileID: 21300000, guid: 421763357bbc5dd44b1498798618d7c5, type: 3} + k__BackingField: + - k__BackingField: LiquidE + k__BackingField: 50 + k__BackingField: 150 + - k__BackingField: Garnish1 + k__BackingField: 50 + k__BackingField: 150 k__BackingField: 300 diff --git a/Assets/02.Scripts/ScriptableObject/StageData.asset b/Assets/02.Scripts/ScriptableObject/StageData.asset index 147edde1c..8b6a2f860 100644 --- a/Assets/02.Scripts/ScriptableObject/StageData.asset +++ b/Assets/02.Scripts/ScriptableObject/StageData.asset @@ -20,7 +20,7 @@ MonoBehaviour: k__BackingField: 30 k__BackingField: 3 k__BackingField: 5 - k__BackingField: 10 + k__BackingField: 30 k__BackingField: 2 k__BackingField: 60 k__BackingField: 5 diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index 9b56b6f13..707d0642c 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -1,9 +1,7 @@ using BlueWater.Interfaces; using BlueWater.Items; -using BlueWater.Tycoons; using DG.Tweening; using Sirenix.OdinInspector; -using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; @@ -14,26 +12,40 @@ namespace BlueWater.Uis [Title("컴포넌트")] [SerializeField, Required] private Image _fillImage; - + [SerializeField, Required] private Image _itemImage; [SerializeField] private GameObject _panel; + [Title("색상 변경 연출")] + [SerializeField] + private bool _isChangedColor; + + [SerializeField] + private Color _startColor = Color.green; + + [SerializeField] + private Color _middleColor = Color.yellow; + + [SerializeField] + private Color _endColor = Color.red; + [Title("주문 정보")] [SerializeField, DisableIf("@true")] private bool _isOrdered; [SerializeField, DisableIf("@true")] private bool _isWaitTimeOver; - + [SerializeField, DisableIf("@true")] private bool _isItemReceived; - + private Tween _fillTween; private Tween _colorTween; private CocktailData _orderCocktailData; + private Color _previousColor; private void Awake() { @@ -50,14 +62,15 @@ namespace BlueWater.Uis public void ShowUi() => _panel.SetActive(true); public void HideUi() => _panel.SetActive(false); - + + public void SetItemImage(IPickup item) { if (!item.Sprite) { Debug.LogWarning($"{item.Sprite} 해당 음식의 이미지가 없습니다."); } - + SetItemSprite(item.Sprite); ShowUi(); } @@ -73,7 +86,7 @@ namespace BlueWater.Uis { SetItemSprite(null); } - + public void SetItemSprite(Sprite sprite) { _itemImage.sprite = sprite; @@ -85,7 +98,7 @@ namespace BlueWater.Uis SetEmpty(); } - public void OrderItem(string itemIdx, float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null) + public void OrderItem(string itemIdx, float waitTime, float hurryTime, bool isReverse = false) { _orderCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(itemIdx); _isOrdered = true; @@ -93,42 +106,39 @@ namespace BlueWater.Uis _isItemReceived = false; SetItemImage(_orderCocktailData); - SetTween(waitTime, hurryTime, isReverse, startColor, endColor); + SetTween(waitTime, hurryTime, isReverse); } - - public void OrderItem(Sprite sprite, float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null) + + public void OrderItem(Sprite sprite, float waitTime, float hurryTime, bool isReverse = false) { _isOrdered = true; _isWaitTimeOver = false; _isItemReceived = false; SetItemSprite(sprite); ShowUi(); - - SetTween(waitTime, hurryTime, isReverse, startColor, endColor); + + SetTween(waitTime, hurryTime, isReverse); } - public void SetTween(float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null) + public void SetTween(float waitTime, float hurryTime, bool isReverse = false) { float startValue = isReverse ? 1f : 0f; float endValue = isReverse ? 0f : 1f; - + _fillTween?.Kill(); _fillTween = _fillImage.DOFillAmount(endValue, hurryTime) .From(startValue) .SetEase(Ease.Linear) .SetDelay(waitTime) + .OnUpdate(() => + { + if (_isChangedColor) + { + UpdateFillColor(_fillImage.fillAmount); + } + }) .OnComplete(OnTweenComplete) .SetAutoKill(true); - - if (startColor != null && endColor != null) - { - _colorTween?.Kill(); - _colorTween = _fillImage.DOColor((Color)endColor, hurryTime) - .From((Color)startColor) - .SetEase(Ease.Linear) - .SetDelay(waitTime) - .SetAutoKill(true); - } } public void ResetGauge() @@ -138,26 +148,10 @@ namespace BlueWater.Uis Debug.LogError("BalloonUi 게이지 리셋 오류"); return; } - + _fillTween.Restart(); } - - public void PayMoney(int waitTime, int hurryTime) - { - _isOrdered = true; - _isWaitTimeOver = false; - _isItemReceived = false; - SetItemSprite(DataManager.Instance.SpriteDataSo.Gold01); - ShowUi(); - _fillTween = _fillImage.DOFillAmount(1f, hurryTime) - .From(0f) - .SetEase(Ease.Linear) - .SetDelay(waitTime) - .OnComplete(OnTweenComplete) - .SetAutoKill(false); - } - private void OnTweenComplete() { _isWaitTimeOver = true; @@ -173,5 +167,49 @@ namespace BlueWater.Uis HideUi(); _isItemReceived = true; } + + private void UpdateFillColor(float fillAmount) + { + if (fillAmount > 0.6f) + { + if (_previousColor != _startColor) + { + _fillImage.color = _startColor; + _previousColor = _startColor; + } + } + else if (fillAmount > 0.3f) + { + if (_previousColor != _middleColor) + { + _fillImage.color = _middleColor; + _previousColor = _middleColor; + } + } + else + { + if (_previousColor != _endColor) + { + _fillImage.color = _endColor; + _previousColor = _endColor; + } + } + } + + public void PauseTween() + { + if (_fillTween != null && _fillTween.IsPlaying()) + { + _fillTween.Pause(); + } + } + + public void ResumeTween() + { + if (_fillTween != null && !_fillTween.IsPlaying()) + { + _fillTween.Play(); + } + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/Bill.cs b/Assets/02.Scripts/Ui/Tycoon/Bill.cs index 4b8948786..a2f7bdc20 100644 --- a/Assets/02.Scripts/Ui/Tycoon/Bill.cs +++ b/Assets/02.Scripts/Ui/Tycoon/Bill.cs @@ -44,6 +44,9 @@ namespace BlueWater [SerializeField] private Color _startColor = Color.green; + [SerializeField] + private Color _middleColor = Color.yellow; + [SerializeField] private Color _endColor = Color.red; @@ -53,9 +56,17 @@ namespace BlueWater private Sequence _moveSequence; private Sequence _arrivedSequence; private Vector3 _spawnPosition; + private Color _previousColor; private float _maxDistance; private Action _removeEvent; + + private void OnDestroy() + { + _slider.onValueChanged.RemoveListener(OnSliderValueChanged); + _moveSequence.Kill(); + _arrivedSequence.Kill(); + } public void Initialize(Customer customer, Vector3 spawnPosition, Vector3 billInfoPosition0, Action removeEvent) { @@ -79,23 +90,39 @@ namespace BlueWater public void SetTween(int waitTime, int hurryTime) { - _sliderTween = _slider.DOValue(1f, hurryTime) - .From(0f) + _sliderTween = _slider.DOValue(0f, hurryTime) + .From(1f) .SetEase(Ease.Linear) .SetDelay(waitTime) .SetAutoKill(true); } - private void OnDestroy() - { - _slider.onValueChanged.RemoveListener(OnSliderValueChanged); - _moveSequence.Kill(); - _arrivedSequence.Kill(); - } - private void OnSliderValueChanged(float value) { - _filledImage.color = Color.Lerp(_startColor, _endColor, value); + if (value > 0.6f) + { + if (_previousColor != _startColor) + { + _filledImage.color = _startColor; + _previousColor = _startColor; + } + } + else if (value > 0.3f) + { + if (_previousColor != _middleColor) + { + _filledImage.color = _middleColor; + _previousColor = _middleColor; + } + } + else + { + if (_previousColor != _endColor) + { + _filledImage.color = _endColor; + _previousColor = _endColor; + } + } } public void Move(BillInfo billInfo) diff --git a/Assets/03.Images/Maps/Tycoon/CarpetOff.png.meta b/Assets/03.Images/Maps/Tycoon/CarpetOff.png.meta index bb1b7475d..355e5f1f4 100644 --- a/Assets/03.Images/Maps/Tycoon/CarpetOff.png.meta +++ b/Assets/03.Images/Maps/Tycoon/CarpetOff.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Props/Furniture/BartenderTable.png b/Assets/03.Images/Props/Furniture/BartenderTable.png deleted file mode 100644 index f3cdc212f..000000000 Binary files a/Assets/03.Images/Props/Furniture/BartenderTable.png and /dev/null differ diff --git a/Assets/03.Images/Props/Furniture/BartenderTableOff.png b/Assets/03.Images/Props/Furniture/BartenderTableOff.png new file mode 100644 index 000000000..15a35ea3f Binary files /dev/null and b/Assets/03.Images/Props/Furniture/BartenderTableOff.png differ diff --git a/Assets/03.Images/Props/Furniture/BartenderTableOff.png.meta b/Assets/03.Images/Props/Furniture/BartenderTableOff.png.meta new file mode 100644 index 000000000..c4af2c11c --- /dev/null +++ b/Assets/03.Images/Props/Furniture/BartenderTableOff.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 09c41279e539f704aa177e0278528d69 +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/BartenderTableOn.png b/Assets/03.Images/Props/Furniture/BartenderTableOn.png new file mode 100644 index 000000000..6ba440081 Binary files /dev/null and b/Assets/03.Images/Props/Furniture/BartenderTableOn.png differ diff --git a/Assets/03.Images/Props/Furniture/BartenderTable.png.meta b/Assets/03.Images/Props/Furniture/BartenderTableOn.png.meta similarity index 100% rename from Assets/03.Images/Props/Furniture/BartenderTable.png.meta rename to Assets/03.Images/Props/Furniture/BartenderTableOn.png.meta diff --git a/Assets/03.Images/Props/Furniture/Mushroom.png b/Assets/03.Images/Props/Furniture/Mushroom.png index ba9677e7d..869423e0a 100644 Binary files a/Assets/03.Images/Props/Furniture/Mushroom.png and b/Assets/03.Images/Props/Furniture/Mushroom.png differ diff --git a/Assets/03.Images/Props/Furniture/ServingTable02.png b/Assets/03.Images/Props/Furniture/ServingTable02.png index 3205b1bd2..3c5787585 100644 Binary files a/Assets/03.Images/Props/Furniture/ServingTable02.png and b/Assets/03.Images/Props/Furniture/ServingTable02.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png index e1c8c29ed..e9ec0e1df 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png index 4e3ab2572..e9419711d 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png index 5998a7fa6..aa826e313 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png index 934002d8d..535648932 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png index 0dff0603d..a68846743 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png index 480b56fe5..800c9be45 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png index d9ab8f0c1..47f36fad1 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png index 1578cf2a0..6730df9f9 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png index 2c7c62b6d..0c9e1a89d 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png index 9cc441860..be5d0155f 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png index cf5ce2237..df0983298 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png index 005fe1579..bc4093d80 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png index 2ea1839d2..f2f159579 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png index 92360e59b..9cf81e7b4 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number1.png b/Assets/03.Images/Tycoons/TableNumbers/Number1.png index 65b8af590..0097905dc 100644 Binary files a/Assets/03.Images/Tycoons/TableNumbers/Number1.png and b/Assets/03.Images/Tycoons/TableNumbers/Number1.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number1.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number1.png.meta index a1007ae40..03f6072e0 100644 --- a/Assets/03.Images/Tycoons/TableNumbers/Number1.png.meta +++ b/Assets/03.Images/Tycoons/TableNumbers/Number1.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1024 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number2.png b/Assets/03.Images/Tycoons/TableNumbers/Number2.png index c423c1649..6f101d03e 100644 Binary files a/Assets/03.Images/Tycoons/TableNumbers/Number2.png and b/Assets/03.Images/Tycoons/TableNumbers/Number2.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number2.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number2.png.meta index a5ee5883d..661e3e0aa 100644 --- a/Assets/03.Images/Tycoons/TableNumbers/Number2.png.meta +++ b/Assets/03.Images/Tycoons/TableNumbers/Number2.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1024 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number3.png b/Assets/03.Images/Tycoons/TableNumbers/Number3.png index 5b61aefd1..5675e6359 100644 Binary files a/Assets/03.Images/Tycoons/TableNumbers/Number3.png and b/Assets/03.Images/Tycoons/TableNumbers/Number3.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number3.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number3.png.meta index 9127fe8b1..fdf19167c 100644 --- a/Assets/03.Images/Tycoons/TableNumbers/Number3.png.meta +++ b/Assets/03.Images/Tycoons/TableNumbers/Number3.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1024 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number4.png b/Assets/03.Images/Tycoons/TableNumbers/Number4.png index d85a05b17..513276113 100644 Binary files a/Assets/03.Images/Tycoons/TableNumbers/Number4.png and b/Assets/03.Images/Tycoons/TableNumbers/Number4.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number4.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number4.png.meta index b9903724e..6a16129d6 100644 --- a/Assets/03.Images/Tycoons/TableNumbers/Number4.png.meta +++ b/Assets/03.Images/Tycoons/TableNumbers/Number4.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1024 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number5.png b/Assets/03.Images/Tycoons/TableNumbers/Number5.png index df36f323f..110da6b8b 100644 Binary files a/Assets/03.Images/Tycoons/TableNumbers/Number5.png and b/Assets/03.Images/Tycoons/TableNumbers/Number5.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number5.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number5.png.meta index 3df640ccc..8734eb519 100644 --- a/Assets/03.Images/Tycoons/TableNumbers/Number5.png.meta +++ b/Assets/03.Images/Tycoons/TableNumbers/Number5.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1024 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number6.png b/Assets/03.Images/Tycoons/TableNumbers/Number6.png index 445deecc9..a5ca565f5 100644 Binary files a/Assets/03.Images/Tycoons/TableNumbers/Number6.png and b/Assets/03.Images/Tycoons/TableNumbers/Number6.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number6.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number6.png.meta index c8a15bc7b..bc3d88e85 100644 --- a/Assets/03.Images/Tycoons/TableNumbers/Number6.png.meta +++ b/Assets/03.Images/Tycoons/TableNumbers/Number6.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1024 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number7.png b/Assets/03.Images/Tycoons/TableNumbers/Number7.png index f1cf7ef6f..a9195e108 100644 Binary files a/Assets/03.Images/Tycoons/TableNumbers/Number7.png and b/Assets/03.Images/Tycoons/TableNumbers/Number7.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number7.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number7.png.meta index 7059fec26..3810073e1 100644 --- a/Assets/03.Images/Tycoons/TableNumbers/Number7.png.meta +++ b/Assets/03.Images/Tycoons/TableNumbers/Number7.png.meta @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1024 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Ui/Tycoon/MenuBalloon.png b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png index 0da48e9b6..1f250abdb 100644 Binary files a/Assets/03.Images/Ui/Tycoon/MenuBalloon.png and b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png differ diff --git a/Assets/03.Images/Ui/Tycoon/MenuBalloon.png.meta b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png.meta index 6518aea5c..84420336c 100644 --- a/Assets/03.Images/Ui/Tycoon/MenuBalloon.png.meta +++ b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png index cda7fd62c..58d66d3a7 100644 Binary files a/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png and b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png differ diff --git a/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png.meta b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png.meta index 20d1520c9..9762697a7 100644 --- a/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png.meta +++ b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab index ad1abc069..114eea329 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab @@ -977,10 +977,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2397117528733804567} m_Modifications: - - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Sprite value: @@ -1017,10 +1013,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.y - value: 1.4 - objectReference: {fileID: 0} - target: {fileID: 4119792729305172665, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_IsActive value: 0 @@ -1053,6 +1045,22 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalScale.x value: 0.5 diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab index d669e20dd..9e2378a49 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab @@ -254,7 +254,10 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 0} + - {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2} + - {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2} + - {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2} + - {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1011,14 +1014,6 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: e7b746bc5bff9d64fb1129b9aa8ccf3e, type: 3} - - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.y - value: 1.4 - objectReference: {fileID: 0} - target: {fileID: 4119792729305172665, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_IsActive value: 0 @@ -1079,6 +1074,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab index 8999818a8..a9dcf102d 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -220,7 +220,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2061818348951349792} m_Father: {fileID: 2397117528733804567} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!33 &479823629690914954 @@ -533,6 +534,37 @@ MonoBehaviour: cacheBarkLines: 0 target: {fileID: 0} trigger: 32 +--- !u!1 &7108414716485305360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2061818348951349792} + m_Layer: 14 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2061818348951349792 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7108414716485305360} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.4, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3748026497419659573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7260635347182713621 GameObject: m_ObjectHideFlags: 0 @@ -805,7 +837,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8ed3a2b9a6425d147bc79e8a53a4fea1, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: {fileID: 2397117528733804567} + k__BackingField: {fileID: 2061818348951349792} k__BackingField: {fileID: 5913499722605887790} k__BackingField: {fileID: 3035760932289101816} k__BackingField: {fileID: 2615952973387112450} @@ -813,7 +845,6 @@ MonoBehaviour: k__BackingField: {fileID: 2588384133887034894} k__BackingField: {fileID: 8922295334492411225} k__BackingField: {fileID: 5339802213853544233} - k__BackingField: {fileID: 1469338590548789471} _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} _offset: {x: 0, y: 1.5, z: 0} k__BackingField: {fileID: 5279376384905517670} @@ -854,9 +885,11 @@ MonoBehaviour: k__BackingField: {fileID: 0} k__BackingField: 0 k__BackingField: 0 - k__BackingField: 0 + k__BackingField: 0 k__BackingField: 0 _customerInteractionType: 0 + _succeedServingSfxName: SucceedServing + _failedServingSfxName: FailedServing --- !u!114 &2085349091043731492 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1165,17 +1198,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 9027939020919762395} m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} ---- !u!114 &1469338590548789471 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3593684458396504088, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - m_PrefabInstance: {fileID: 2718897986636601543} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &5339802213853544233 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8043919875794167790, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} diff --git a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab index 1c8baeb36..bf5b51557 100644 --- a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab @@ -584,6 +584,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0.5 k__BackingField: 0 + heartRecoverySfxName: --- !u!114 &3677775080446906429 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index 55297e1e5..706d1c177 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -555,6 +555,10 @@ PrefabInstance: m_TransformParent: {fileID: 2798544366308408093} m_Modifications: - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1538076562463171835, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} @@ -562,10 +566,6 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: e7b746bc5bff9d64fb1129b9aa8ccf3e, type: 3} - - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -596,11 +596,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_SizeDelta.x - value: -0.39999998 + value: -100 objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_SizeDelta.y - value: -0.4 + value: -100 objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x @@ -608,7 +608,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.04999999 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_PresetInfoIsWorld diff --git a/Assets/05.Prefabs/Items/Item.prefab b/Assets/05.Prefabs/Items/Item.prefab index 0d8cf40f0..92d3b5351 100644 --- a/Assets/05.Prefabs/Items/Item.prefab +++ b/Assets/05.Prefabs/Items/Item.prefab @@ -189,6 +189,7 @@ MonoBehaviour: SpriteRenderer: {fileID: 7437393363680573610} k__BackingField: {fileID: 0} k__BackingField: 1 + k__BackingField: 2 UseAutoDestroy: 1 AutoDestroyTime: 30 DrawGizmos: 1 @@ -199,8 +200,9 @@ MonoBehaviour: ItemData: k__BackingField: 0 k__BackingField: - k__BackingField: 0 k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 k__BackingField: diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index 743cdd43e..1af5d3cb8 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -454,7 +454,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7301852646339672205 Transform: m_ObjectHideFlags: 0 @@ -2244,7 +2244,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7384535986647984312 Transform: m_ObjectHideFlags: 0 @@ -2452,7 +2452,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8950647542265260064 Transform: m_ObjectHideFlags: 0 @@ -3598,7 +3598,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &883424104242854010 Transform: m_ObjectHideFlags: 0 @@ -3793,7 +3793,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4758567268842529368 Transform: m_ObjectHideFlags: 0 @@ -5015,7 +5015,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3032648992231042473 Transform: m_ObjectHideFlags: 0 @@ -6077,7 +6077,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2897440906922024409 Transform: m_ObjectHideFlags: 0 @@ -10193,7 +10193,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: -2 + value: -1.95 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -11495,7 +11495,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 4.1 + value: 4.05 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/05.Prefabs/Props/Furniture/Buildable/BuildableCustomerTable01.prefab b/Assets/05.Prefabs/Props/Furniture/Buildable/BuildableCustomerTable01.prefab deleted file mode 100644 index 3c3cefad0..000000000 --- a/Assets/05.Prefabs/Props/Furniture/Buildable/BuildableCustomerTable01.prefab +++ /dev/null @@ -1,141 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6597147455768578164 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -1020311819587236498, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: _buildableObject - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1289663608826275115, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: objectScale.x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1289663608826275115, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: buildableGridObjectTypeSO - value: - objectReference: {fileID: 11400000, guid: db38344e6a3f47245936c7801e21da4a, type: 2} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9144032627093884999, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - propertyPath: m_Name - value: BuildableCustomerTable01 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - insertIndex: -1 - addedObject: {fileID: 8471656957250154750} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} ---- !u!4 &913910610665702239 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3} - m_PrefabInstance: {fileID: 6597147455768578164} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7812007715416691093 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 913910610665702239} - m_Modifications: - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4833254060163934334, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_Name - value: CustomerTable01 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bc2abb0d190003240b86437081f20536, type: 3} ---- !u!4 &8471656957250154750 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - m_PrefabInstance: {fileID: 7812007715416691093} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Buildable/BuildableCustomerTable01.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Buildable/BuildableCustomerTable01.prefab.meta deleted file mode 100644 index d66cfb18f..000000000 --- a/Assets/05.Prefabs/Props/Furniture/Buildable/BuildableCustomerTable01.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 338bb9ee9f2f9b44887786d77efe731d -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab index 69d874b7a..22aeac132 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab @@ -57,7 +57,7 @@ Transform: m_GameObject: {fileID: 6373979881487551315} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.438, z: 0} + m_LocalPosition: {x: 0, y: 0.369, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -70,7 +70,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6373979881487551315} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -107,7 +107,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 6 - m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} + m_Sprite: {fileID: 21300000, guid: a2cd1b193f5007c4f8a68b1cdd4ca2c1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -304,6 +304,8 @@ MonoBehaviour: k__BackingField: IsOpened: 0 CocktailGlassImage: {fileID: 535721072425912087} + _activeSprite: {fileID: 21300000, guid: e9275315ca60c1f479efa8f9393c7627, type: 3} + _inactiveSprite: {fileID: 21300000, guid: 09c41279e539f704aa177e0278528d69, type: 3} --- !u!114 &3330559944751018385 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab index 3255b8a17..ff3c08e6d 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 7986070582027999988} - component: {fileID: 2234961990804426782} + - component: {fileID: 5891094220003351037} m_Layer: 8 m_Name: BaseInteractionFurniture m_TagString: Untagged @@ -56,6 +57,18 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.5} m_Center: {x: 0, y: 0.5, z: 0.25} +--- !u!210 &5891094220003351037 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_SortAtRoot: 0 --- !u!1 &4526462685262723681 GameObject: m_ObjectHideFlags: 0 @@ -97,7 +110,6 @@ GameObject: m_Component: - component: {fileID: 7438534416270888028} - component: {fileID: 3580758810857167321} - - component: {fileID: 1702261025824090784} m_Layer: 8 m_Name: VisualLook m_TagString: Untagged @@ -176,18 +188,6 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!210 &1702261025824090784 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7835622629792856689} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 --- !u!1 &8884531212319162473 GameObject: m_ObjectHideFlags: 0 @@ -315,18 +315,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab index 038f2e2a7..30a97d509 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab @@ -138,13 +138,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352874222752200122} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.265, y: 0.275, z: 0.23} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.27, y: 0.328, z: -0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7272068659984017056} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8752266548893034047 SpriteRenderer: m_ObjectHideFlags: 0 @@ -189,7 +189,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} + m_Sprite: {fileID: 21300000, guid: b38089ff4046ac044ba79dfa5116aa1b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -225,13 +225,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2118957188813578234} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -0.179, y: 0.19, z: 0.16} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.27, y: 0.245, z: -0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1796875075399045521} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4724775134085759924 SpriteRenderer: m_ObjectHideFlags: 0 @@ -276,7 +276,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cf23778fd0b2994c9d608fbbf185468, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -313,8 +313,8 @@ Transform: m_GameObject: {fileID: 3743511312082143294} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.115, z: 0} - m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_LocalPosition: {x: 0, y: 0.19, z: -0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 203741387490724426} @@ -362,7 +362,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: af252e8e96a18af4b8d4658788901bbe, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -432,7 +432,7 @@ MonoBehaviour: k__BackingField: 0.7 k__BackingField: IsOpened: 0 - k__BackingField: {fileID: 2583013143388010830} + k__BackingField: {fileID: 2866461326830348644} _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} _offset: {x: 0, y: 1.5, z: 0} k__BackingField: 0 @@ -511,14 +511,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6493535781353555306} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1796875075399045521} - {fileID: 7272068659984017056} - m_Father: {fileID: 809828747251277026} + m_Father: {fileID: 203741387490724426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7008066670828516977 GameObject: @@ -544,8 +544,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7008066670828516977} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 0.22, y: 0, z: 0.1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.22, y: 0, z: 0.2} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 0 m_Children: [] @@ -606,13 +606,113 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7591088015737457221} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -0.22, y: 0, z: 0.1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.22, y: 0, z: 0.2} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1796875075399045521} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7667305718955164267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 524190737211815696} + - component: {fileID: 7588633447038655794} + - component: {fileID: 1353666483196372346} + m_Layer: 8 + m_Name: Carpet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &524190737211815696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7667305718955164267} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 809828747251277026} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!212 &7588633447038655794 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7667305718955164267} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 939234109, guid: 6fbe25d112354c0499f972a2816e1998, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!210 &1353666483196372346 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7667305718955164267} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_SortAtRoot: 1 --- !u!1 &8514892081840363795 GameObject: m_ObjectHideFlags: 0 @@ -652,6 +752,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 297355777426450409} m_Modifications: + - target: {fileID: 889177932113506934, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: _isChangedColor + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -678,23 +782,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: 400 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: 400 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalScale.x - value: 0.4 + value: 0.40000004 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalScale.y - value: 0.4 + value: 0.39999998 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalScale.z - value: 0.4 + value: 0.39999998 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalPosition.x @@ -714,23 +818,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.2 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.45 + value: 210 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -752,10 +856,38 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.x + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -777,7 +909,7 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} m_PrefabInstance: {fileID: 873700564209760516} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3426758121118452536 +--- !u!1001 &3139371770484874002 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -785,6 +917,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4062855172287724115} m_Modifications: + - target: {fileID: 249317892450259276, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410106872850796187, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 889177932113506934, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: _isChangedColor + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -811,23 +955,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: 400 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: 400 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalScale.x - value: 0.4 + value: 0.40000004 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalScale.y - value: 0.4 + value: 0.39999998 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalScale.z - value: 0.4 + value: 0.39999998 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalPosition.x @@ -839,7 +983,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalRotation.w @@ -847,23 +991,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.2 + value: -90 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.45 + value: 210 objectReference: {fileID: 0} - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -881,28 +1025,76 @@ PrefabInstance: propertyPath: m_Name value: MenuBalloonUi objectReference: {fileID: 0} + - target: {fileID: 2941398232897783445, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3836460704259562449, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_FillAmount + value: 0.295 + objectReference: {fileID: 0} + - target: {fileID: 4609128235759643923, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4609128235759643923, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5580711947596628469, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420120053108935114, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0cf23778fd0b2994c9d608fbbf185468, type: 3} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.x + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8341219880361789620, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} ---- !u!224 &2322969535150520903 stripped +--- !u!224 &2604166743452805741 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} - m_PrefabInstance: {fileID: 3426758121118452536} + m_PrefabInstance: {fileID: 3139371770484874002} m_PrefabAsset: {fileID: 0} ---- !u!114 &2583013143388010830 stripped +--- !u!114 &2866461326830348644 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 889177932113506934, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} - m_PrefabInstance: {fileID: 3426758121118452536} + m_PrefabInstance: {fileID: 3139371770484874002} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -980,43 +1172,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.25 + value: 90 objectReference: {fileID: 0} - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_SizeDelta.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_SizeDelta.y - value: 1 + value: 350 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalPosition.x @@ -1026,37 +1186,17 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalRotation.w - value: 0.9396927 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalRotation.x - value: 0.3420201 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -1070,11 +1210,27 @@ PrefabInstance: propertyPath: m_Name value: InteractionCanvas objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - insertIndex: 1 + insertIndex: -1 addedObject: {fileID: 257426657215236219} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} @@ -1128,7 +1284,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Center.z - value: 0.15 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x @@ -1170,6 +1326,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 1.5 @@ -1225,7 +1385,7 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} + objectReference: {fileID: 21300000, guid: bc4b1b16bd2ea7e4eb17eaf33c65951a, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -1238,10 +1398,13 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 - addedObject: {fileID: 659765495160113802} + addedObject: {fileID: 524190737211815696} - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 6689230217850552328} + - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 659765495160113802} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -1255,6 +1418,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} +--- !u!1 &672328621937310823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!4 &809828747251277026 stripped Transform: m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -1277,10 +1445,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3} m_Name: m_EditorClassIdentifier: + _collider: {fileID: 8857736056138880520} + _visualLookObject: {fileID: 672328621937310823} + _carpetRenderer: {fileID: 7588633447038655794} _tableSeats: - {fileID: 6383913593085221228} - {fileID: 6277647266874368514} _tableNumber: 0 + _carpetOnSprite: {fileID: 939234109, guid: 6fbe25d112354c0499f972a2816e1998, type: 3} + _carpetOffSprite: {fileID: 1981829358, guid: 881e14fb05ecca444b56b327bd18e2de, type: 3} --- !u!210 &5695615210136494061 SortingGroup: m_ObjectHideFlags: 0 @@ -1293,6 +1466,11 @@ SortingGroup: m_SortingLayer: 0 m_SortingOrder: 5 m_SortAtRoot: 0 +--- !u!65 &8857736056138880520 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8710013924293209931 PrefabInstance: m_ObjectHideFlags: 0 @@ -1361,45 +1539,17 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.6666667 objectReference: {fileID: 0} + - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.25 + value: -90 objectReference: {fileID: 0} - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_SizeDelta.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_SizeDelta.y - value: 1 + value: 350 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalPosition.x @@ -1409,37 +1559,17 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalRotation.w - value: 0.9396927 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalRotation.x - value: 0.3420201 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -1453,12 +1583,32 @@ PrefabInstance: propertyPath: m_Name value: InteractionCanvas objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5640860986811951834, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - insertIndex: 1 - addedObject: {fileID: 2322969535150520903} + insertIndex: -1 + addedObject: {fileID: 2604166743452805741} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} --- !u!114 &1675779991655778469 stripped diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab index 4ac245bcc..5dc6fc9f8 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8666890926474269071 +--- !u!1 &8088965734519108650 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 630232741387001819} - - component: {fileID: 2009489192189582172} - - component: {fileID: 8716460605447754239} + - component: {fileID: 3446327395843908361} + - component: {fileID: 3349926588638594490} + - component: {fileID: 7103883662070814397} m_Layer: 0 m_Name: GoldCountText m_TagString: Untagged @@ -18,40 +18,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &630232741387001819 +--- !u!224 &3446327395843908361 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8666890926474269071} + m_GameObject: {fileID: 8088965734519108650} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 8469578238684922817} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.20000029, y: 0.8999999} - m_SizeDelta: {x: 2.5, y: 1} + m_AnchoredPosition: {x: -76, y: 360} + m_SizeDelta: {x: 100, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2009489192189582172 +--- !u!222 &3349926588638594490 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8666890926474269071} + m_GameObject: {fileID: 8088965734519108650} m_CullTransparentMesh: 1 ---- !u!114 &8716460605447754239 +--- !u!114 &7103883662070814397 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8666890926474269071} + m_GameObject: {fileID: 8088965734519108650} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 1000000 + m_text: 1000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2} @@ -92,12 +92,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0.6 + m_fontSize: 40 m_fontSizeBase: 0.1 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 0.05 - m_fontSizeMax: 1 + m_fontSizeMin: 10 + m_fontSizeMax: 40 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -156,6 +156,18 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: -30.300003 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 14.849999 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.08000183 + objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Size.y value: 0.8 @@ -190,7 +202,7 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 3da5d6eace330f04397ef9c546a69ced, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SortingOrder - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned @@ -204,6 +216,10 @@ PrefabInstance: propertyPath: m_Name value: MoneyCounter objectReference: {fileID: 0} + - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 1 @@ -240,14 +256,34 @@ PrefabInstance: propertyPath: m_FillOrigin value: 2 objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + 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: 194 + objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 objectReference: {fileID: 0} + - target: {fileID: 7555773783659772986, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7934990094814782445, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -317,7 +353,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 - addedObject: {fileID: 630232741387001819} + addedObject: {fileID: 3446327395843908361} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -352,6 +388,7 @@ MonoBehaviour: k__BackingField: 0.8 k__BackingField: IsOpened: 0 + _totalGoldText: {fileID: 7103883662070814397} _playerHoldingTime: 1 _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} _offset: {x: 0, y: 1.5, z: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab index 1c1928e90..4419429c6 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab @@ -16,6 +16,22 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsTrigger value: 1 @@ -60,10 +76,6 @@ PrefabInstance: 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: @@ -105,12 +117,12 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 + propertyPath: m_LocalPosition.z + value: -0 objectReference: {fileID: 0} - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: 2 + value: 750 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab index 560f07e9a..55288b1b7 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab @@ -84,7 +84,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: 0.3 + value: 100 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.15 + value: -50 objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -160,7 +160,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: 0.35 + value: 85.48 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -172,11 +172,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.3 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.15 + value: -50 objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite @@ -216,7 +216,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6069594819010820018, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: -0.35000002 + value: -14.519989 objectReference: {fileID: 0} - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite @@ -350,10 +350,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab index 67607d010..2690c9f9f 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab @@ -84,7 +84,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: 0.3 + value: 100 objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -94,9 +94,13 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.15 + value: -50 objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -156,7 +160,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: 0.35 + value: 85.48 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -168,11 +172,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.3 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.15 + value: -50 objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite @@ -212,7 +216,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6069594819010820018, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SizeDelta.x - value: -0.35000002 + value: -14.519989 objectReference: {fileID: 0} - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite @@ -254,13 +258,9 @@ PrefabInstance: 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: 0.8 + value: 200 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -330,10 +330,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab index 066ddcb23..4126866f8 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.62, z: -0} + m_LocalPosition: {x: 0, y: 0.437, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -39,7 +39,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6373979881487551315} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -76,7 +76,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 6 - m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} + m_Sprite: {fileID: 21300000, guid: 335f1df58cd58914f97fe9ccae7f6c8c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -116,9 +116,29 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Center.z + propertyPath: m_Size.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.y + value: 0.5 + 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_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -177,15 +197,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 @@ -230,7 +250,7 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} + objectReference: {fileID: 21300000, guid: 2c91f9927b2422c4382675d00e294834, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index ff0e4c27c..564533218 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -297,9 +297,11 @@ MonoBehaviour: k__BackingField: IsOpened: 0 _spineController: {fileID: 8118547606801377584} - _playerHoldingTime: 1 + _discardHoldingTime: 0.5 + _randomChangeHoldingTime: 1 _canRandomChange: 0 - _randomBoxSprite: {fileID: 21300000, guid: 3484bcfbb75f8d54bb1f209c301f86ee, type: 3} + _isChanged: 0 + _discardSfxName: DiscardCocktail --- !u!114 &8118547606801377584 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab index 6170b7687..91e3485b0 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab @@ -20,6 +20,22 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsTrigger value: 1 @@ -60,9 +76,13 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5891094220003351037, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite @@ -92,13 +112,9 @@ PrefabInstance: 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: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1 + value: 350 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalRotation.w @@ -217,6 +233,7 @@ MonoBehaviour: _offset: {x: 0, y: 1.5, z: 0} _playerHoldingTime: 3 _crewHoldingTime: 9 + _cleaningSfxName: CleaningFloor --- !u!114 &1488784826241318952 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Uis/BalloonUi.prefab b/Assets/05.Prefabs/Uis/BalloonUi.prefab index 9f61f1d31..1b3178202 100644 --- a/Assets/05.Prefabs/Uis/BalloonUi.prefab +++ b/Assets/05.Prefabs/Uis/BalloonUi.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.2, y: 1.5} - m_SizeDelta: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 500} + m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2829248495233098512 MonoBehaviour: @@ -52,6 +52,10 @@ MonoBehaviour: _fillImage: {fileID: 2173167918881327799} _itemImage: {fileID: 8218406547424483500} _panel: {fileID: 1505211282054036597} + _isChangedColor: 0 + _startColor: {r: 0, g: 1, b: 0, a: 1} + _middleColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _endColor: {r: 1, g: 0, b: 0, a: 1} _isOrdered: 0 _isWaitTimeOver: 0 _isItemReceived: 0 @@ -70,7 +74,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &674323407039969650 RectTransform: m_ObjectHideFlags: 0 @@ -202,8 +206,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.08} - m_SizeDelta: {x: -0.6, y: -0.59999996} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: -120, y: -120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7693093380867172793 CanvasRenderer: diff --git a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab index 55d0a9435..677946721 100644 --- a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab +++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 8764364725249863370} - component: {fileID: 5028824454365225125} - component: {fileID: 8043919875794167790} - m_Layer: 19 + m_Layer: 0 m_Name: InteractionCanvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -29,7 +29,7 @@ RectTransform: m_GameObject: {fileID: 5611097802189151736} m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.0025, y: 0.0025, z: 0.0025} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3619548578334970641} @@ -39,7 +39,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 1} + m_SizeDelta: {x: 800, y: 800} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &5297442833789713246 Canvas: @@ -61,8 +61,8 @@ Canvas: m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 6 + m_SortingLayerID: -403788685 + m_SortingOrder: 5 m_TargetDisplay: 0 --- !u!114 &8764364725249863370 MonoBehaviour: @@ -86,7 +86,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &5028824454365225125 MonoBehaviour: m_ObjectHideFlags: 0 @@ -130,6 +130,18 @@ PrefabInstance: propertyPath: m_Name value: BalloonUi objectReference: {fileID: 0} + - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -150,6 +162,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2909533541407981610, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3361235759547244541, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7379103909061988499, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -205,7 +229,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.15 + value: -0.15000153 objectReference: {fileID: 0} - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} propertyPath: m_AnchorMax.y @@ -229,11 +253,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.3 + value: 0.30000305 objectReference: {fileID: 0} - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.15 + value: -0.15000153 + objectReference: {fileID: 0} + - target: {fileID: 3534664589947693860, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3736260048439958039, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710095542977623793, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} + propertyPath: m_Layer + value: 0 objectReference: {fileID: 0} - target: {fileID: 4710095542977623793, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} propertyPath: m_IsActive @@ -243,6 +279,10 @@ PrefabInstance: propertyPath: m_Name value: UnlockUi objectReference: {fileID: 0} + - target: {fileID: 6231439677206584695, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6693939832226345974, guid: a38bd422f81b28443a68b80c17e540fb, type: 3} propertyPath: m_SizeDelta.x value: -0.35000002 diff --git a/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab index ddcbe1978..b446f4a1e 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab @@ -233,8 +233,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8549903804392921738} - {fileID: 4417059956531144164} + - {fileID: 8549903804392921738} - {fileID: 8341219880361789620} m_Father: {fileID: 1131127152402510207} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -277,8 +277,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000000009313226, y: 0} - m_SizeDelta: {x: 0.099999964, y: 0.10000001} + m_AnchoredPosition: {x: 0.0000000037252903, y: 0} + m_SizeDelta: {x: 0.000000007450581, y: 0.000000026077032} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8438734531649324286 CanvasRenderer: @@ -301,7 +301,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 1, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/05.Prefabs/Uis/UnlockUi.prefab b/Assets/05.Prefabs/Uis/UnlockUi.prefab index 78ebc8746..d887de110 100644 --- a/Assets/05.Prefabs/Uis/UnlockUi.prefab +++ b/Assets/05.Prefabs/Uis/UnlockUi.prefab @@ -32,10 +32,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6693939832226345974} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.3, y: -0.15} - m_SizeDelta: {x: 0.35, y: 0.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1923530767285064634 CanvasRenderer: @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0.2 - m_fontSizeBase: 0.2 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 0.1 @@ -169,10 +169,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6693939832226345974} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -0.15} - m_SizeDelta: {x: 0.3, y: 0.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!222 &844177666738102044 CanvasRenderer: @@ -227,8 +227,8 @@ MonoBehaviour: m_IgnoreLayout: 0 m_MinWidth: -1 m_MinHeight: -1 - m_PreferredWidth: 0.3 - m_PreferredHeight: 0.3 + m_PreferredWidth: 100 + m_PreferredHeight: 100 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -249,7 +249,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6693939832226345974 RectTransform: m_ObjectHideFlags: 0 @@ -269,7 +269,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.35000002, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7735130997828345425 MonoBehaviour: @@ -345,8 +345,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 1} - m_SizeDelta: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 170} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1432317353405285171 MonoBehaviour: