diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 469b1ad27..812b369e5 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -8417,6 +8417,7 @@ MonoBehaviour: m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: + - {fileID: 1355183327} - {fileID: 1985878519} m_RendererIndex: -1 m_VolumeLayerMask: @@ -8500,7 +8501,7 @@ Camera: m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 2147614711 + m_Bits: 2147614679 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -8524,7 +8525,8 @@ Transform: m_LocalPosition: {x: 0.04, y: 5.499513, z: -12.052313} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1355183324} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0} --- !u!114 &873223993 @@ -8541,6 +8543,7 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: {fileID: 873223991} + k__BackingField: {fileID: 0} k__BackingField: {fileID: 1985878519} cameraLocation: {fileID: 1634548838} k__BackingField: {fileID: 545850352} @@ -9699,7 +9702,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 1 - m_Camera: {fileID: 873223991} + m_Camera: {fileID: 1355183327} m_PlaneDistance: 5 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -10349,6 +10352,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101945424} m_CullTransparentMesh: 1 +--- !u!1 &1103501548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1103501549} + - component: {fileID: 1103501551} + - component: {fileID: 1103501550} + m_Layer: 5 + m_Name: FillImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1103501549 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103501548} + 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: [] + m_Father: {fileID: 1540383231} + 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} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1103501550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103501548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1103501551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103501548} + m_CullTransparentMesh: 1 --- !u!1001 &1106965575 PrefabInstance: m_ObjectHideFlags: 0 @@ -13213,6 +13291,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1350109858} m_CullTransparentMesh: 1 +--- !u!1 &1355183323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1355183324} + - component: {fileID: 1355183327} + - component: {fileID: 1355183325} + m_Layer: 0 + m_Name: UiCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1355183324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355183323} + serializedVersion: 2 + 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: [] + m_Father: {fileID: 873223992} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1355183325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355183323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 1 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!20 &1355183327 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355183323} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 300 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &1356312470 GameObject: m_ObjectHideFlags: 0 @@ -15430,6 +15636,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1103501549} - {fileID: 242229610} m_Father: {fileID: 1983229438} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15459,7 +15666,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17002,7 +17209,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9dd1d4a57e5f2dc4ba2346bf6359f094, type: 3} m_Name: m_EditorClassIdentifier: - _stageDataSo: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2} + k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2} _dailyCustomerVisitInfos: [] --- !u!114 &1665075873 MonoBehaviour: @@ -22258,6 +22465,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _panel: {fileID: 1983229437} + _fillImage: {fileID: 1103501550} _keyText: {fileID: 242229611} _interactionText: {fileID: 1728335879} --- !u!114 &2041095998 stripped diff --git a/Assets/01.Scenes/02.Combat/GlobalVolume.asset b/Assets/01.Scenes/02.Combat/GlobalVolume.asset index 202a49350..772d0a9ce 100644 --- a/Assets/01.Scenes/02.Combat/GlobalVolume.asset +++ b/Assets/01.Scenes/02.Combat/GlobalVolume.asset @@ -108,7 +108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} m_Name: Vignette m_EditorClassIdentifier: - active: 0 + active: 1 color: m_OverrideState: 1 m_Value: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/CheckOut.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/CheckOut.cs index 400b622a0..79489a3df 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/CheckOut.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/CheckOut.cs @@ -18,8 +18,9 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - _customer.CheckOut(); + if (!_customer.AIMovement.HasReachedDestination()) return TaskStatus.Running; + _customer.CheckOut(); return TaskStatus.Success; } } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/EatCocktail.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/EatCocktail.cs index 8ad986fcc..ec7473163 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/EatCocktail.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/EatCocktail.cs @@ -25,7 +25,7 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - if (_elapsedTime <= _customer.LevelData.EatingTime) + if (_elapsedTime <= _customer.CurrentLevelData.EatingTime) { _elapsedTime += Time.deltaTime; return TaskStatus.Running; diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs new file mode 100644 index 000000000..b14d234b4 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs @@ -0,0 +1,26 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Customers; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Customer")] + [Serializable] + public class MoveSpawnPosition : Action + { + private Customer _customer; + + public override void OnAwake() + { + _customer = GetComponent(); + } + + public override TaskStatus OnUpdate() + { + _customer.MoveSpawnPosition(); + + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs.meta new file mode 100644 index 000000000..45f51a1d2 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b1b5275d0abcbf741b2a877f08306227 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs index 846cc6912..060afec87 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs @@ -19,8 +19,8 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { _customer.SetTableSeatPositionAndDirection(); - _customer.TableSeat.OccupySeat(); - _customer.TableSeat.UnreserveSeat(); + _customer.CurrentTableSeat.OccupySeat(); + _customer.CurrentTableSeat.UnreserveSeat(); return TaskStatus.Success; } } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs new file mode 100644 index 000000000..396ed1370 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs @@ -0,0 +1,45 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Customers; +using BlueWater.Tycoons; +using UnityEngine; +using Action = BehaviorDesigner.Runtime.Tasks.Action; +using Random = UnityEngine.Random; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Customer")] + [Serializable] + public class Vomit : Action + { + private Customer _customer; + private bool _isVomit; + private Vector3 _vomitingPosition; + + public override void OnAwake() + { + _customer = GetComponent(); + } + + public override void OnStart() + { + var random = Random.Range(0f, 100f); + if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingPercent) + { + _isVomit = true; + _vomitingPosition = _customer.AIMovement.SetRandomPoint(); + _customer.AIMovement.Move(_vomitingPosition); + } + } + + public override TaskStatus OnUpdate() + { + if (!_isVomit) return TaskStatus.Success; + + if (!_customer.AIMovement.HasReachedDestination()) return TaskStatus.Running; + + _customer.Vomit(); + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs.meta new file mode 100644 index 000000000..33b87f27e --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7d3787d4363729e44bfe68a6d3320dfb diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs index e94d65293..6d66b28a5 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs @@ -15,12 +15,6 @@ namespace BlueWater.BehaviorTrees.Actions public class OrderCocktail : Conditional { private Customer _customer; - private LevelData _levelData; - private BalloonUi _customerBalloonUi; - private CocktailData _orderedCocktail; - - private bool _isReceived; - private bool _isSucceed; public override void OnAwake() { @@ -29,56 +23,22 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - _levelData = _customer.LevelData; - _customerBalloonUi = _customer.BalloonUi; - - _orderedCocktail = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); - Debug.Log($"_orderedCocktail : {_orderedCocktail.Idx}"); - _customerBalloonUi.OrderItem(_orderedCocktail.Idx, _levelData.WaitTime, _levelData.HurryTime); - _customer.OnInteraction += HandleCocktailInteraction; - _customer.RegisterPlayerInteraction(); - // _customer.Bark("OrderBeverage", BarkOrder.FirstValid); + _customer.OrderCocktail(); } public override TaskStatus OnUpdate() { - if (_customerBalloonUi.IsWaitTimeOver()) + if (_customer.IsWaitTimeOver()) { - _customer.OnInteraction -= HandleCocktailInteraction; _customer.UnregisterPlayerInteraction(); return TaskStatus.Failure; } - if (!_isReceived) return TaskStatus.Running; + if (!_customer.IsReceivedItem) return TaskStatus.Running; - _customer.OnInteraction -= HandleCocktailInteraction; - if (_isSucceed) - { - _customer.UnregisterPlayerInteraction(); - return TaskStatus.Success; - } - else - { - return TaskStatus.Failure; - } - } - - private void HandleCocktailInteraction() - { - var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); - if (currentPickupItem == null) - { - Debug.Log("플레이어가 가지고 있는 음식의 데이터가 없습니다."); - return; - } - - var servedCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(currentPickupItem.Idx); - EventManager.OnCocktailServedToCustomer?.Invoke(servedCocktailData); - _customer.ServedItem(servedCocktailData); - _customerBalloonUi.ReceiveFood(servedCocktailData); - _isSucceed = currentPickupItem.Idx == _orderedCocktail.Idx; - - _isReceived = true; + _customer.UnregisterPlayerInteraction(); + + return _customer.IsOrderedSucceed ? TaskStatus.Success : TaskStatus.Failure; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/AiMovement.cs b/Assets/02.Scripts/Character/AiMovement.cs index b164a4eb6..2b14cca13 100644 --- a/Assets/02.Scripts/Character/AiMovement.cs +++ b/Assets/02.Scripts/Character/AiMovement.cs @@ -1,6 +1,8 @@ using System; +using BlueWater.Players.Tycoons; using Pathfinding; using UnityEngine; +using Random = UnityEngine.Random; namespace BlueWater.Enemies { @@ -73,6 +75,14 @@ namespace BlueWater.Enemies Move(target.transform.position); } + public Vector3 SetRandomPoint() + { + if (_iAstarAi == null) throw new Exception("AstarAi 오류"); + + var randomFactor = Random.Range(0.2f, 0.8f); + return Vector3.Lerp(_iAstarAi.position, _iAstarAi.destination, randomFactor); + } + public void Teleport(Vector3 position) { _iAstarAi?.Teleport(position); diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index d1ed08e92..bde9b3ddf 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -10,6 +10,7 @@ using Pathfinding; using PixelCrushers.DialogueSystem; using Sirenix.OdinInspector; using UnityEngine; +using Random = UnityEngine.Random; namespace BlueWater.Npcs.Customers { @@ -18,6 +19,12 @@ namespace BlueWater.Npcs.Customers public const string Idle = "Idle"; public const string Walk = "Run"; } + + public enum CustomerInteractionType + { + None = 0, + OrderCocktail + } public class Customer : MonoBehaviour, IPlayerInteraction { @@ -71,14 +78,31 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public float InteractionRadius { get; private set; } = 2f; - - public string InteractionMessage { get; private set; } - - private IAstarAI _astarAi; - public LevelData LevelData { get; private set; } - public TableSeat TableSeat { get; private set; } - public CocktailData CocktailData { get; private set; } + [field: SerializeField] + public string InteractionMessage { get; set; } + + [SerializeField] + private Vomiting _vomiting; + + [field: Title("실시간 데이터")] + [field: SerializeField] + public LevelData CurrentLevelData { get; private set; } + + [field: SerializeField] + public TableSeat CurrentTableSeat { get; private set; } + + [field: SerializeField] + public CocktailData OrderedCocktailData { get; private set; } + + [field: SerializeField] + public bool IsReceivedItem { get; set; } + + [field: SerializeField] + public bool IsOrderedSucceed { get; set; } + + [SerializeField] + private CustomerInteractionType _customerInteractionType; // private int _happyPoint; // public int HappyPoint @@ -101,8 +125,8 @@ namespace BlueWater.Npcs.Customers _isMoving = value; SpineController.PlayAnimation(_isMoving - ? CustomerSpineAnimation.Walk.ToString() - : CustomerSpineAnimation.Idle.ToString(), true); + ? CustomerSpineAnimation.Walk + : CustomerSpineAnimation.Idle, true); } } @@ -118,13 +142,14 @@ namespace BlueWater.Npcs.Customers _currentDirection = value; } } - + + private IAstarAI _astarAi; + private Transform _spawnTransform; private int _paidAmount; private int _foodPrice; private int _tipAmount; private bool _isQuitting; - public Action OnInteraction; #endregion @@ -173,8 +198,8 @@ namespace BlueWater.Npcs.Customers BarkTrigger = transform.Find("DialogueSystem").GetComponent(); PayMoneyParticle = transform.Find("PayMoneyParticle").GetComponent(); InteractionCanvas = transform.GetComponentInChildren(); - BalloonUi = InteractionCanvas.transform.Find("FoodBalloonUi").GetComponent(); - PayMoneyUi = InteractionCanvas.transform.Find("PayMoneyUi").GetComponent(); + BalloonUi = InteractionCanvas.transform.GetComponentInChildren(); + PayMoneyUi = InteractionCanvas.transform.GetComponentInChildren(); SpineController = GetComponent(); AIMovement = GetComponent(); @@ -182,9 +207,10 @@ namespace BlueWater.Npcs.Customers _astarAi = GetComponent(); } - public void Initialize(LevelData levelData) + public void Initialize(LevelData levelData, Transform spawnTransform) { - LevelData = levelData; + CurrentLevelData = levelData; + _spawnTransform = spawnTransform; //CustomerData = CustomerManager.Instance.GetRandomCustomerData(); //AIMovement.SetMoveSpeed(CustomerData.MoveSpeed); //HappyPoint = CustomerData.BaseHappyPoint; @@ -223,32 +249,59 @@ namespace BlueWater.Npcs.Customers public void SetTableSeat(TableSeat tableSeat) { - TableSeat = tableSeat; - BalloonUi.Initialize(TableSeat); + CurrentTableSeat = tableSeat; + BalloonUi.Initialize(CurrentTableSeat); } public void SetCurrentDirection(Vector3 normalDirection) => CurrentDirection = normalDirection; public void SetTableSeatPositionAndDirection() { - transform.position = TableSeat.SeatTransform.position; - SetCurrentDirection(TableSeat.TableDirection); + transform.position = CurrentTableSeat.SeatTransform.position; + SetCurrentDirection(CurrentTableSeat.TableDirection); } public void ServedItem(CocktailData cocktailData) { - CocktailData = cocktailData; - TableSeat.SetFood(CocktailData.Sprite); + OrderedCocktailData = cocktailData; + CurrentTableSeat.SetFood(OrderedCocktailData.Sprite); } public void Interaction() { - OnInteraction?.Invoke(); + switch (_customerInteractionType) + { + case CustomerInteractionType.None: + break; + case CustomerInteractionType.OrderCocktail: + var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); + var servedCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(currentPickupItem.Idx); + ServedItem(servedCocktailData); + BalloonUi.ReceiveItem(servedCocktailData); + EventManager.OnCocktailServedToCustomer?.Invoke(servedCocktailData); + IsOrderedSucceed = currentPickupItem.Idx == OrderedCocktailData.Idx; + IsReceivedItem = true; + break; + default: + throw new ArgumentOutOfRangeException(); + } } public virtual void CancelInteraction() { } - public bool CanInteraction() => true; + public bool CanInteraction() + { + switch (_customerInteractionType) + { + case CustomerInteractionType.None: + return false; + case CustomerInteractionType.OrderCocktail: + var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); + return currentPickupItem != null; + default: + throw new ArgumentOutOfRangeException(); + } + } public virtual void ShowInteractionUi() { @@ -276,6 +329,8 @@ namespace BlueWater.Npcs.Customers { GameManager.Instance.CurrentTycoonPlayer.TycoonInput.UnregisterPlayerInteraction(this); } + + _customerInteractionType = CustomerInteractionType.None; } //public void AddHappyPoint(int value) => HappyPoint += value; @@ -288,12 +343,28 @@ namespace BlueWater.Npcs.Customers BarkTrigger.conversation = conversation; BarkTrigger.OnUse(); } + + public bool IsWaitTimeOver() + { + return BalloonUi.IsWaitTimeOver(); + } public void PayMoney() { - PayMoneyParticle.gameObject.SetActive(true); + var random = Random.Range(0f, 100f); + if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTablePercent) + { + CurrentTableSeat.DirtyTable(); + } + else + { + CurrentTableSeat.CleanTable(); + } + PayMoneyParticle.Play(); - PayMoneyUi.PayMoney(LevelData.Gold); + PayMoneyUi.PayMoney(CurrentLevelData.Gold); + TycoonManager.Instance.TycoonStatus.CurrentExp += CurrentLevelData.Exp; + TycoonManager.Instance.TycoonStatus.CurrentGold += CurrentLevelData.Gold; } // public void PayMoney(int foodPrice, int tipAmount) @@ -307,13 +378,40 @@ namespace BlueWater.Npcs.Customers // PayMoneyUi.PayMoney(_paidAmount); // } + public void Vomit() + { + AIMovement.StopMove(); + var spawnPosition = transform.position + new Vector3(0f, 0f, 0.1f); + Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation); + } + public void CheckOut() { //var customerVisitInfo = new CustomerVisitInfo(HappyPoint, _foodPrice, _tipAmount, _paidAmount); //TycoonManager.Instance.TycoonStageController.RegisterCustomerVisitInfo(customerVisitInfo); + AIMovement.StopMove(); Destroy(gameObject); } + + // 상호작용 메서드 + public void OrderCocktail() + { + IsReceivedItem = false; + IsOrderedSucceed = false; + InteractionMessage = "칵테일 전달"; + OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); + BalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, CurrentLevelData.HurryTime); + + _customerInteractionType = CustomerInteractionType.OrderCocktail; + RegisterPlayerInteraction(); + } + + public void MoveSpawnPosition() + { + CurrentTableSeat.VacateSeat(); + AIMovement.Move(_spawnTransform.position); + } #endregion } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index fc9e9d143..f35617b1d 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -1,4 +1,3 @@ -using BlueWater.Interfaces; using BlueWater.Uis; using Sirenix.OdinInspector; using Spine.Unity; @@ -41,6 +40,9 @@ namespace BlueWater.Players.Tycoons [field: SerializeField] public InteractionCanvas InteractionCanvas { get; private set; } + [field: SerializeField] + public SpineController SpineController { get; private set; } + [field: SerializeField] public PlayerHealthPoint PlayerHealthPoint { get; private set; } @@ -94,6 +96,7 @@ namespace BlueWater.Players.Tycoons SkeletonAnimation = VisualLook.GetComponent(); InteractionCanvas = transform.GetComponentInChildren(); + SpineController = GetComponent(); PlayerHealthPoint = GetComponent(); TycoonInput = GetComponent(); TycoonMovement = GetComponent(); @@ -119,12 +122,12 @@ namespace BlueWater.Players.Tycoons // Input TycoonInput.OnMoveInputReceived += TycoonMovement.HandleInputMovement; + EventManager.OnDead += Die; var balloonUi = InteractionCanvas.BalloonUi; - // EventManager.OnLiquidRegionEntered += balloonUi.EnterLiquidRegion; - // EventManager.OnLiquidRegionExited += balloonUi.ExitLiquidRegion; EventManager.OnCocktailStarted += balloonUi.PickupUnfinishedCocktail; EventManager.OnCocktailCompleted += balloonUi.SetItemImage; EventManager.OnCocktailDiscarded += balloonUi.DiscardItem; + EventManager.OnCocktailServedToCustomer += balloonUi.GiveItem; } private void UnSubscribeEvents() @@ -132,12 +135,17 @@ namespace BlueWater.Players.Tycoons // Input TycoonInput.OnMoveInputReceived -= TycoonMovement.HandleInputMovement; + EventManager.OnDead -= Die; var balloonUi = InteractionCanvas.BalloonUi; - // EventManager.OnLiquidRegionEntered -= balloonUi.EnterLiquidRegion; - // EventManager.OnLiquidRegionExited -= balloonUi.ExitLiquidRegion; EventManager.OnCocktailStarted -= balloonUi.PickupUnfinishedCocktail; EventManager.OnCocktailCompleted -= balloonUi.SetItemImage; EventManager.OnCocktailDiscarded -= balloonUi.DiscardItem; + EventManager.OnCocktailServedToCustomer -= balloonUi.GiveItem; + } + + private void Die() + { + VisualFeedbackManager.Instance.SetBaseTimeScale(0f); } #endregion diff --git a/Assets/02.Scripts/DataManager.cs b/Assets/02.Scripts/DataManager.cs index 798dcb613..654ced3c2 100644 --- a/Assets/02.Scripts/DataManager.cs +++ b/Assets/02.Scripts/DataManager.cs @@ -31,16 +31,6 @@ namespace BlueWater [field: Title("타이쿤 데이터")] [field: SerializeField] public TycoonData TycoonData { get; private set; } - - [field: Title("실시간 데이터")] - public int Gold { get; set; } - - public event Action OnChangeGold; - - private void Start() - { - GetMoney(5000); - } public void TestData() { @@ -69,11 +59,5 @@ namespace BlueWater TycoonData.AddDrinkRecipe("Drink002"); TycoonData.AddDrinkRecipe("Ice001"); } - - public void GetMoney(int money) - { - Gold += money; - OnChangeGold?.Invoke(Gold); - } } } \ No newline at end of file diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 6f98899ea..60401bf78 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -1,5 +1,4 @@ using System; -using BlueWater.Interfaces; using BlueWater.Items; using UnityEngine; @@ -29,6 +28,8 @@ namespace BlueWater // 플레이어 public static Action OnLevelUp; + public static Action OnChangeGold; + public static Action OnChangeExp; // Npc public static Action OnCreateCustomer; @@ -40,9 +41,6 @@ namespace BlueWater public static Action OnTycoonGameStarted; public static Action OnTycoonGameOvered; - // public static Action OnLiquidRegionEntered; - // public static Action OnLiquidRegionExited; - public static Action OnCocktailStarted; public static Action OnCocktailCompleted; public static Action OnCocktailDiscarded; @@ -52,6 +50,8 @@ namespace BlueWater public static Action OnCocktailServedToCustomer; + public static Action OnInteracting; + // 요리 //public static Action OnFoodRecipeAcquired; diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index c4c4c7bc6..089aca1d1 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Items; +using BlueWater.Players.Tycoons; using Sirenix.OdinInspector; using UnityEngine; @@ -58,12 +59,14 @@ namespace BlueWater.Tycoons public override void Interaction() { OnBarrelInteracted?.Invoke(this); + GameManager.Instance.CurrentTycoonPlayer.SpineController.PlayAnimation(TycoonPlayerSpineAnimation.MakeCocktail, true); //_liquidController.ActiveIsPouring(this); } public override void CancelInteraction() { OnBarrelCancelInteracted?.Invoke(); + GameManager.Instance.CurrentTycoonPlayer.SpineController.PlayAnimation(TycoonPlayerSpineAnimation.Idle, true); //_liquidController.InActiveIsPouring(); } diff --git a/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs index 4e2ff1eac..92f874bd2 100644 --- a/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -6,46 +6,26 @@ using Random = System.Random; namespace BlueWater.Tycoons { - public class CustomerTable : InteractionFurniture + public class CustomerTable : MonoBehaviour { [SerializeField] private List _tableSeats; - private TycoonManager _tycoonManager; private TableSeat _tableSeat; private Random _random = new(); - private bool _isCleaning; - - protected override void OnEnable() - { - base.OnEnable(); + private TycoonManager _tycoonManager; + private void OnEnable() + { _tycoonManager = TycoonManager.Instance; _tycoonManager.CustomerTableController.RegisterTable(this); } - protected override void OnDisable() + private void OnDisable() { - base.OnDisable(); - _tycoonManager.CustomerTableController.UnregisterTable(this); } - public override void Interaction() - { - StartCoroutine(CleanUpTable(_tableSeat)); - } - - public override bool CanInteraction() - { - if (_isCleaning) return false; - - _tableSeat = _tableSeats.Find(table => !table.IsOccupied && !table.IsCleaned); - if (_tableSeat == null) return false; - - return true; - } - public TableSeat FindEmptySeat() { var seatCount = _tableSeats.Count; @@ -65,23 +45,5 @@ namespace BlueWater.Tycoons } return null; } - - private IEnumerator CleanUpTable(TableSeat tableSeat) - { - // TODO : n초간 테이블 청소 애니메이션 (청소 중에 키 작동 금지) - _isCleaning = true; - PlayerInputKeyManager.Instance.DisableCurrentPlayerInput(); - - var elapsedTime = 0f; - while (elapsedTime <= 2f) - { - elapsedTime += Time.deltaTime; - yield return null; - } - - tableSeat.CleanUpFood(); - PlayerInputKeyManager.Instance.EnableCurrentPlayerInput(); - _isCleaning = false; - } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index 8f107ccbe..664238aad 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -104,7 +104,10 @@ namespace BlueWater.Tycoons public virtual void HideInteractionUi() { - VisualLook.material = OriginalMaterial; + if (VisualLook) + { + VisualLook.material = OriginalMaterial; + } EventManager.OnHideInteractionUi?.Invoke(); } diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index 55a6bfbac..75bf88716 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -1,10 +1,11 @@ using System; +using BlueWater.Interfaces; using UnityEngine; namespace BlueWater.Tycoons { [Serializable] - public class TableSeat + public class TableSeat : InteractionFurniture { [field: SerializeField] public bool IsOccupied { get; private set; } @@ -23,26 +24,99 @@ namespace BlueWater.Tycoons [field: SerializeField] public Vector3 TableDirection; - - public void ReserveSeat() => IsReserved = true; - public void UnreserveSeat() => IsReserved = false; - public void OccupySeat() => IsOccupied = true; - public void VacateSeat() => IsOccupied = false; - - public void CleanTable() => IsCleaned = true; - public void DirtyTable() => IsCleaned = false; + [SerializeField] + private Sprite _foodImage; + + [SerializeField] + private Sprite _dirtyImage; + + private bool _isInteracting; + private float _elapsedTime; + + protected override void OnEnable() + { + base.OnEnable(); + + Initialize(); + } + + private void Update() + { + if (_isInteracting) + { + if (InteractionCanvas.BalloonUi.IsWaitTimeOver()) + { + var damageable = GameManager.Instance.CurrentTycoonPlayer.GetComponent(); + damageable?.TakeDamage(1); + CleanTable(); + } + + var clamp = Mathf.Clamp(_elapsedTime / 3f, 0f, 1f); + EventManager.OnInteracting?.Invoke(clamp); + if (_elapsedTime > 3f) + { + CleanTable(); + } + + _elapsedTime += Time.deltaTime; + } + } + + public void Initialize() + { + UnreserveSeat(); + VacateSeat(); + CleanTable(); + Food.enabled = false; + InteractionMessage = "치우기"; + } public void SetFood(Sprite sprite) { - Food.sprite = sprite; - DirtyTable(); + Food.sprite = _foodImage; + Food.enabled = true; } - public void CleanUpFood() + public override void Interaction() + { + _elapsedTime = 0f; + EventManager.OnInteracting?.Invoke(_elapsedTime); + _isInteracting = true; + } + + public override void CancelInteraction() + { + _elapsedTime = 0f; + EventManager.OnInteracting?.Invoke(_elapsedTime); + _isInteracting = false; + } + + public override bool CanInteraction() + { + return !GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpCocktail() && !IsCleaned; + } + + public void ReserveSeat() => IsReserved = true; + public void UnreserveSeat() => IsReserved = false; + public void OccupySeat() => IsOccupied = true; + public void VacateSeat() => IsOccupied = false; + + public void CleanTable() { Food.sprite = null; - CleanTable(); + Food.enabled = false; + IsCleaned = true; + _isInteracting = false; + InteractionCanvas.BalloonUi.HideUi(); + } + + public void DirtyTable() + { + Food.sprite = _dirtyImage; + Food.enabled = true; + InteractionCanvas.BalloonUi.OrderItem(_dirtyImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTableWaitTime); + IsCleaned = false; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs new file mode 100644 index 000000000..58b0e77c6 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -0,0 +1,78 @@ +using System; +using BlueWater.Interfaces; +using BlueWater.Players.Tycoons; +using UnityEngine; + +namespace BlueWater.Tycoons +{ + [Serializable] + public class Vomiting : InteractionFurniture + { + private Sprite vomitingImage; + private bool _isInteracting; + private float _elapsedTime; + + protected override void OnEnable() + { + base.OnEnable(); + + Initialize(); + } + + private void Update() + { + if (_isInteracting) + { + if (InteractionCanvas.BalloonUi.IsWaitTimeOver()) + { + var damageable = GameManager.Instance.CurrentTycoonPlayer.GetComponent(); + damageable?.TakeDamage(1); + Destroy(); + } + + var clamp = Mathf.Clamp(_elapsedTime / 3f, 0f, 1f); + EventManager.OnInteracting?.Invoke(clamp); + if (_elapsedTime > 3f) + { + Destroy(); + } + + _elapsedTime += Time.deltaTime; + } + } + + public void Initialize() + { + InteractionMessage = "치우기"; + vomitingImage = VisualLook.GetComponent().sprite; + InteractionCanvas.BalloonUi.OrderItem(vomitingImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime); + } + + public override void Interaction() + { + _elapsedTime = 0f; + EventManager.OnInteracting?.Invoke(_elapsedTime); + GameManager.Instance.CurrentTycoonPlayer.SpineController.PlayAnimation(TycoonPlayerSpineAnimation.Cleaning, true); + _isInteracting = true; + } + + public override void CancelInteraction() + { + _elapsedTime = 0f; + EventManager.OnInteracting?.Invoke(_elapsedTime); + GameManager.Instance.CurrentTycoonPlayer.SpineController.PlayAnimation(TycoonPlayerSpineAnimation.Idle, true); + _isInteracting = false; + } + + public override bool CanInteraction() + { + return !GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpCocktail(); + } + + private void Destroy() + { + GameManager.Instance.CurrentTycoonPlayer.SpineController.PlayAnimation(TycoonPlayerSpineAnimation.Idle, true); + Destroy(gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs.meta b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs.meta new file mode 100644 index 000000000..c63e24dbd --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: be934bb7ffdbf164a91f2932a3ca12d0 diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index 65dd5cbc9..372423ed9 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -44,7 +44,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 06a07650d842ee94390ca2505955e94d, type: 3} + k__BackingField: {fileID: 21300000, guid: 0cf23778fd0b2994c9d608fbbf185468, type: 3} - k__BackingField: Cocktail002 k__BackingField: k__BackingField: Cocktail002 @@ -60,7 +60,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 19df9fcd0ddf5754890f7ea9c127b905, type: 3} + k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} - k__BackingField: Cocktail003 k__BackingField: k__BackingField: Cocktail003 @@ -76,7 +76,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: a51b37c5e512c7e488e80f986f5f8aac, type: 3} + k__BackingField: {fileID: 21300000, guid: c55f4b0a55a391d488e54a28dc840509, type: 3} - k__BackingField: Cocktail004 k__BackingField: k__BackingField: Cocktail004 @@ -92,7 +92,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: d74e702a3e490a54e8a159128222f175, type: 3} + k__BackingField: {fileID: 21300000, guid: 576d6ff3856f8ef419586ff12f2742b5, type: 3} - k__BackingField: Cocktail005 k__BackingField: k__BackingField: Cocktail005 @@ -108,7 +108,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: bff0ff1345b7ae446b330a01e6ef7bd3, type: 3} + k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} - k__BackingField: Cocktail006 k__BackingField: k__BackingField: Cocktail006 @@ -124,7 +124,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 006a36cba2a146247a1d25b9e246faaa, type: 3} + k__BackingField: {fileID: 21300000, guid: 6a4cd8cdf11fe024e8ecac8e3d60e10d, type: 3} - k__BackingField: Cocktail007 k__BackingField: k__BackingField: Cocktail007 @@ -140,7 +140,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 31d7e535d499d5f43ab64731acc3eec3, type: 3} + k__BackingField: {fileID: 21300000, guid: b38089ff4046ac044ba79dfa5116aa1b, type: 3} - k__BackingField: Cocktail008 k__BackingField: k__BackingField: Cocktail008 @@ -156,7 +156,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 997d0aea13894a9428bf9d9f7fb66762, type: 3} + k__BackingField: {fileID: 21300000, guid: 71954183dfb02424d835d964c2eb3fc6, type: 3} - k__BackingField: Cocktail009 k__BackingField: k__BackingField: Cocktail009 @@ -172,7 +172,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 3d04bfa220b9ebe40a4ae3f0a68c0911, type: 3} + k__BackingField: {fileID: 21300000, guid: d0748411047fc4a41beb1fb8d551e01e, type: 3} - k__BackingField: Cocktail010 k__BackingField: k__BackingField: Cocktail010 @@ -188,7 +188,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 09168d6395b3e9b41b195a2aa8ae0a82, type: 3} + k__BackingField: {fileID: 21300000, guid: 335f1df58cd58914f97fe9ccae7f6c8c, type: 3} - k__BackingField: Cocktail011 k__BackingField: k__BackingField: Cocktail011 @@ -204,7 +204,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} - k__BackingField: Cocktail012 k__BackingField: k__BackingField: Cocktail012 @@ -220,7 +220,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: ee344f47787d148448bd3373235281b6, type: 3} - k__BackingField: Cocktail013 k__BackingField: k__BackingField: Cocktail013 @@ -236,7 +236,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: aef7fd596cbfc854d87f408c14951641, type: 3} - k__BackingField: Cocktail014 k__BackingField: k__BackingField: Cocktail014 @@ -252,7 +252,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 91d99e534e5f3c04094b14ed920bec04, type: 3} - k__BackingField: Cocktail015 k__BackingField: k__BackingField: Cocktail015 @@ -268,4 +268,4 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/StageData.asset b/Assets/02.Scripts/ScriptableObject/StageData.asset index cf343eacf..2989841a2 100644 --- a/Assets/02.Scripts/ScriptableObject/StageData.asset +++ b/Assets/02.Scripts/ScriptableObject/StageData.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: add43bc825f942044b87c758a6832b68, type: 3} m_Name: StageData m_EditorClassIdentifier: - k__BackingField: 0c00000012000000180000001e00000024000000 - WaitTimeInStarted: 5 - CustomerEntryInterval: 15 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 30 diff --git a/Assets/02.Scripts/Tycoon/CustomerManager.cs b/Assets/02.Scripts/Tycoon/CustomerManager.cs index ec28a5fe7..d631d2a3f 100644 --- a/Assets/02.Scripts/Tycoon/CustomerManager.cs +++ b/Assets/02.Scripts/Tycoon/CustomerManager.cs @@ -51,7 +51,7 @@ namespace BlueWater.Tycoons { var currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); var newCustomer = Instantiate(_customerPrefab, _customerSpawnTransform.position, Quaternion.identity); - newCustomer.Initialize(currentLevelData); + newCustomer.Initialize(currentLevelData, _customerSpawnTransform); RegisterCustomer(newCustomer); return newCustomer; diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index 99809dd3c..c47ff22f5 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -146,10 +146,9 @@ namespace BlueWater private void Start() { - //EventManager.OnLiquidRegionEntered += ShowPanel; - //EventManager.OnLiquidRegionExited += HidePanel; EventManager.OnCocktailDiscarded += ReleaseAllObject; EventManager.OnPlaceOnServingTable += ReleaseAllObject; + EventManager.OnCocktailServedToCustomer += ReleaseAllObject; LiquidIngredient.OnReachedTarget += OnTargetReached; Barrel.OnBarrelInteracted += HandleBarrelInteraction; Barrel.OnBarrelCancelInteracted += HandleBarrelCancelInteraction; @@ -235,11 +234,9 @@ namespace BlueWater private void OnDestroy() { - //EventManager.OnLiquidRegionEntered -= ShowPanel; - //EventManager.OnLiquidRegionExited -= HidePanel; EventManager.OnCocktailDiscarded -= ReleaseAllObject; EventManager.OnPlaceOnServingTable -= ReleaseAllObject; - + EventManager.OnCocktailServedToCustomer -= ReleaseAllObject; LiquidIngredient.OnReachedTarget -= OnTargetReached; Barrel.OnBarrelInteracted -= HandleBarrelInteraction; Barrel.OnBarrelCancelInteracted -= HandleBarrelCancelInteraction; @@ -330,6 +327,22 @@ namespace BlueWater HidePanel(); } + public void ReleaseAllObject(CocktailData cocktailData) + { + // 리스트 삭제는 뒤에서부터 해야 오류가 없음 + for (var i = _activeLiquidDatas.Count - 1; i >= 0; i--) + { + _activeLiquidDatas[i].Destroy(); + } + + _liquidDataCounts.Clear(); + _isCompleted = false; + _instanceLiquidCount = 0; + _instanceMaterial.SetFloat(LiquidAmountHash, 0f); + SetCurrentAmount(0f); + HidePanel(); + } + public void HandleBarrelInteraction(Barrel barrel) { _currentBarrel = barrel; diff --git a/Assets/02.Scripts/Tycoon/StageDataSo.cs b/Assets/02.Scripts/Tycoon/StageDataSo.cs index 6d3527937..17353fdb6 100644 --- a/Assets/02.Scripts/Tycoon/StageDataSo.cs +++ b/Assets/02.Scripts/Tycoon/StageDataSo.cs @@ -6,6 +6,18 @@ namespace BlueWater.Tycoons public class StageDataSo : ScriptableObject { [field: SerializeField] - public float WaitTimeInStarted = 3f; + public float WaitTimeInStarted { get; private set; } = 5f; + + [field: SerializeField] + public float VomitingPercent { get; private set; } = 10f; + + [field: SerializeField] + public int VomitingWaitTime { get; private set; } = 30; + + [field: SerializeField] + public float DirtyTablePercent { get; private set; } = 20f; + + [field: SerializeField] + public int DirtyTableWaitTime { get; private set; } = 30; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index b2ee8d7e6..583009a8e 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -10,8 +10,8 @@ namespace BlueWater.Tycoons { public class TycoonStageController : MonoBehaviour { - [SerializeField, Required] - private StageDataSo _stageDataSo; + [field: SerializeField, Required] + public StageDataSo StageDataSo { get; private set; } [SerializeField] private List _dailyCustomerVisitInfos; @@ -44,7 +44,7 @@ namespace BlueWater.Tycoons private IEnumerator StartStageCoroutine() { - yield return new WaitForSeconds(_stageDataSo.WaitTimeInStarted); + yield return new WaitForSeconds(StageDataSo.WaitTimeInStarted); while (true) { diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs index 98bb0026a..600c27b15 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStatus.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -75,6 +75,7 @@ namespace BlueWater.Tycoons get => _currentExp; set { + EventManager.OnChangeExp?.Invoke(value); var maxExp = TycoonManager.Instance.LevelDataSo.GetDataByIdx(_currentLevel.ToString()).RequiredExp; if (value >= maxExp) { @@ -85,6 +86,7 @@ namespace BlueWater.Tycoons { _currentExp = value; } + } } @@ -94,7 +96,11 @@ namespace BlueWater.Tycoons public int CurrentGold { get => _currentGold; - set => _currentGold = value; + set + { + EventManager.OnChangeGold?.Invoke(value); + _currentGold = value; + } } [Title("원액")] @@ -213,11 +219,6 @@ namespace BlueWater.Tycoons public void Initialize() { - CurrentLevel = 1; - MaxPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.MaxHealthPoint; - CurrentPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.CurrentHealthPoint; - PlayerMoveSpeedMultiplier = GameManager.Instance.CurrentTycoonPlayer.TycoonMovement.MoveSpeedMultiplier; - var ingredientController = TycoonManager.Instance.TycoonIngredientController; ingredientController.LiquidBarrelA.OnAmountChanged += UpdateLiquidA; ingredientController.LiquidBarrelB.OnAmountChanged += UpdateLiquidB; @@ -226,12 +227,18 @@ namespace BlueWater.Tycoons ingredientController.LiquidBarrelE.OnAmountChanged += UpdateLiquidE; ingredientController.GarnishBarrel1.OnAmountChanged += UpdateGarnish1; ingredientController.GarnishBarrel2.OnAmountChanged += UpdateGarnish2; + + CurrentLevel = 1; + CurrentGold = 0; + CurrentExp = 0; + MaxPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.MaxHealthPoint; + CurrentPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.CurrentHealthPoint; + PlayerMoveSpeedMultiplier = GameManager.Instance.CurrentTycoonPlayer.TycoonMovement.MoveSpeedMultiplier; } private void OnDestroy() { var ingredientController = TycoonManager.Instance.TycoonIngredientController; - if (ingredientController != null) { ingredientController.LiquidBarrelA.OnAmountChanged -= UpdateLiquidA; @@ -244,13 +251,13 @@ namespace BlueWater.Tycoons } } - private void UpdateLiquidA(int amount) => CurrentLiquidAmountA = amount; - private void UpdateLiquidB(int amount) => CurrentLiquidAmountB = amount; - private void UpdateLiquidC(int amount) => CurrentLiquidAmountC = amount; - private void UpdateLiquidD(int amount) => CurrentLiquidAmountD = amount; - private void UpdateLiquidE(int amount) => CurrentLiquidAmountE = amount; - private void UpdateGarnish1(int amount) => CurrentGarnishAmount1 = amount; - private void UpdateGarnish2(int amount) => CurrentGarnishAmount2 = amount; + private void UpdateLiquidA(int amount) => CurrentLiquidAmountA += amount; + private void UpdateLiquidB(int amount) => CurrentLiquidAmountB += amount; + private void UpdateLiquidC(int amount) => CurrentLiquidAmountC += amount; + private void UpdateLiquidD(int amount) => CurrentLiquidAmountD += amount; + private void UpdateLiquidE(int amount) => CurrentLiquidAmountE += amount; + private void UpdateGarnish1(int amount) => CurrentGarnishAmount1 += amount; + private void UpdateGarnish2(int amount) => CurrentGarnishAmount2 += amount; private void LevelUp() { diff --git a/Assets/02.Scripts/TycoonCameraManager.cs b/Assets/02.Scripts/TycoonCameraManager.cs index bd82632cf..b0ed14d1e 100644 --- a/Assets/02.Scripts/TycoonCameraManager.cs +++ b/Assets/02.Scripts/TycoonCameraManager.cs @@ -21,6 +21,9 @@ namespace BlueWater [field: SerializeField] public Camera MainCamera { get; private set; } + [field: SerializeField] + public Camera UiCamera { get; private set; } + [field: SerializeField] public Camera LiquidOverlayCamera { get; private set; } @@ -75,6 +78,8 @@ namespace BlueWater cameraLocation = GameObject.Find("CinemachineCameras").transform; MainCamera = GetComponent(); + UiCamera = MainCamera.transform.Find("UiCamera").GetComponent(); + LiquidOverlayCamera = GameObject.Find("LiquidOverlayCamera").GetComponent(); _cinemachineBrain = GetComponent(); BaseCamera = cameraLocation.Find("BaseCamera").GetComponent(); diff --git a/Assets/02.Scripts/Ui/InteractionUi.cs b/Assets/02.Scripts/Ui/InteractionUi.cs index 5b1561e77..7c0e7d461 100644 --- a/Assets/02.Scripts/Ui/InteractionUi.cs +++ b/Assets/02.Scripts/Ui/InteractionUi.cs @@ -1,29 +1,36 @@ +using Sirenix.OdinInspector; using TMPro; using UnityEngine; +using UnityEngine.UI; namespace BlueWater.Uis { public class InteractionUi : MonoBehaviour { - [SerializeField] + [SerializeField, Required] private GameObject _panel; - + [SerializeField] + private Image _fillImage; + + [SerializeField, Required] private TMP_Text _keyText; - [SerializeField] + [SerializeField, Required] private TMP_Text _interactionText; private void Start() { EventManager.OnShowInteractionUi += ShowUi; EventManager.OnHideInteractionUi += HideUi; + EventManager.OnInteracting += A; } private void OnDestroy() { EventManager.OnShowInteractionUi -= ShowUi; EventManager.OnHideInteractionUi -= HideUi; + EventManager.OnInteracting -= A; } public void ShowUi(string message) @@ -36,5 +43,10 @@ namespace BlueWater.Uis { _panel.SetActive(false); } + + private void A(float fillAmount) + { + _fillImage.fillAmount = fillAmount; + } } } diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index ca2abd1d1..8fc858d34 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -67,24 +67,6 @@ namespace BlueWater.Uis _isUnfinishedCocktailPickedUp = true; } - public void EnterLiquidRegion() - { - if (_isUnfinishedCocktailPickedUp) - { - HideUi(); - SetItemSprite(null); - } - } - - public void ExitLiquidRegion() - { - if (_isUnfinishedCocktailPickedUp) - { - SetItemSprite(DataManager.Instance.SpriteDataSo.UnfinishedCocktail); - ShowUi(); - } - } - public void SetItemImage(IPickup item) { //_orderItemData = ItemManager.Instance.GetItemDataByIdx(foodIdx); @@ -120,6 +102,13 @@ namespace BlueWater.Uis HideUi(); SetEmpty(); } + + public void GiveItem(IPickup item) + { + _isUnfinishedCocktailPickedUp = false; + HideUi(); + SetEmpty(); + } public void OrderItem(string itemIdx, int waitTime, int hurryTime) { @@ -128,6 +117,21 @@ namespace BlueWater.Uis _isWaitTimeOver = false; _isItemReceived = false; SetItemImage(_orderCocktailData); + + _tween = _fillImage.DOFillAmount(1f, hurryTime) + .From(0f) + .SetEase(Ease.Linear) + .SetDelay(waitTime) + .OnComplete(OnTweenComplete) + .SetAutoKill(false); + } + + public void OrderItem(Sprite sprite, int waitTime, int hurryTime) + { + _isOrdered = true; + _isWaitTimeOver = false; + _isItemReceived = false; + SetItemSprite(sprite); ShowUi(); _tween = _fillImage.DOFillAmount(1f, hurryTime) @@ -136,7 +140,6 @@ namespace BlueWater.Uis .SetDelay(waitTime) .OnComplete(OnTweenComplete) .SetAutoKill(false); - _tween.Restart(); } public void PayMoney(int waitTime, int hurryTime) @@ -153,7 +156,6 @@ namespace BlueWater.Uis .SetDelay(waitTime) .OnComplete(OnTweenComplete) .SetAutoKill(false); - _tween.Restart(); } private void OnTweenComplete() @@ -170,7 +172,7 @@ namespace BlueWater.Uis _tableSeat.VacateSeat(); } - public void ReceiveFood(IPickup pickupItem) + public void ReceiveItem(IPickup pickupItem) { _tween.Kill(); HideUi(); diff --git a/Assets/02.Scripts/Ui/Tycoon/GoldUi.cs b/Assets/02.Scripts/Ui/Tycoon/GoldUi.cs index 58fd66d9c..f163c162d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/GoldUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/GoldUi.cs @@ -23,7 +23,7 @@ namespace BlueWater.Uis private void OnEnable() { - DataManager.Instance.OnChangeGold += ChangeGold; + EventManager.OnChangeGold += ChangeGold; } private void Update() @@ -35,7 +35,7 @@ namespace BlueWater.Uis { if (_isQuitting) return; - DataManager.Instance.OnChangeGold -= ChangeGold; + EventManager.OnChangeGold -= ChangeGold; } private void OnApplicationQuit() diff --git a/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs b/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs index c4098440d..13f709217 100644 --- a/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs @@ -9,6 +9,9 @@ namespace BlueWater.Uis { [SerializeField, Required] private DOTweenAnimation _moveAnimation; + + [SerializeField, Required] + private GameObject _panel; [SerializeField, Required] private TMP_Text _goldText; @@ -20,10 +23,12 @@ namespace BlueWater.Uis public void PayMoney(int gold) { - gameObject.SetActive(true); - _moveAnimation.DORestart(); - _goldText.text = gold.ToString("N0"); + ShowUi(); + _moveAnimation.DORestart(); } + + public void ShowUi() => _panel.SetActive(true); + public void HideUi() => _panel.SetActive(false); } } \ No newline at end of file diff --git a/Assets/03.Images/Props/Environment/Ice.png b/Assets/03.Images/Props/Environment/Ice.png deleted file mode 100644 index c71d61284..000000000 Binary files a/Assets/03.Images/Props/Environment/Ice.png and /dev/null differ diff --git a/Assets/03.Images/Props/Environment/Vomiting.png b/Assets/03.Images/Props/Environment/Vomiting.png new file mode 100644 index 000000000..4dd13db93 Binary files /dev/null and b/Assets/03.Images/Props/Environment/Vomiting.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta b/Assets/03.Images/Props/Environment/Vomiting.png.meta similarity index 96% rename from Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta rename to Assets/03.Images/Props/Environment/Vomiting.png.meta index 719cefd20..4e6f79f3a 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta +++ b/Assets/03.Images/Props/Environment/Vomiting.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bff0ff1345b7ae446b330a01e6ef7bd3 +guid: ca9bef724b43e0b489043b7f18d4eddb TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -47,8 +47,8 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 0.5, y: 0.08} - spritePixelsToUnits: 256 + spritePivot: {x: 0.5, y: 0.3} + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -127,7 +127,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png new file mode 100644 index 000000000..e8372bcb4 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png.meta similarity index 97% rename from Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta rename to Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png.meta index 41ff6023f..9a93c1b3a 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a51b37c5e512c7e488e80f986f5f8aac +guid: 0cf23778fd0b2994c9d608fbbf185468 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png new file mode 100644 index 000000000..5ff5282bb Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png.meta similarity index 97% rename from Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta rename to Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png.meta index d44ebfa94..80a4c91e5 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06a07650d842ee94390ca2505955e94d +guid: aef7fd596cbfc854d87f408c14951641 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png new file mode 100644 index 000000000..758f1570a Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png.meta new file mode 100644 index 000000000..f12bafb7b --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: d0748411047fc4a41beb1fb8d551e01e +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/Ac.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png new file mode 100644 index 000000000..151ca19f3 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png.meta new file mode 100644 index 000000000..bb6c84351 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 6a4cd8cdf11fe024e8ecac8e3d60e10d +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/Acd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png new file mode 100644 index 000000000..c3f512136 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png.meta new file mode 100644 index 000000000..1b07f72ca --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 78afb2f9950251046a96a297f6d61c89 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/B.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png new file mode 100644 index 000000000..d5fb2d232 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png.meta new file mode 100644 index 000000000..fa96da66d --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 600806d36167cb140aa40eb51cf58afa +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/B1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png new file mode 100644 index 000000000..2629df95f Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png.meta new file mode 100644 index 000000000..8205260c4 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a2cd1b193f5007c4f8a68b1cdd4ca2c1 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/Bd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png new file mode 100644 index 000000000..f62d7d396 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png.meta new file mode 100644 index 000000000..b8e786031 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: b38089ff4046ac044ba79dfa5116aa1b +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/C.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png new file mode 100644 index 000000000..7d3a8a166 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png.meta new file mode 100644 index 000000000..ad8cf0653 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: c55f4b0a55a391d488e54a28dc840509 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/C2.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png new file mode 100644 index 000000000..f032c1062 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png.meta new file mode 100644 index 000000000..ccf5824d5 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 91d99e534e5f3c04094b14ed920bec04 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/Cd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png new file mode 100644 index 000000000..046234b28 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png.meta new file mode 100644 index 000000000..b1efe9678 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 71954183dfb02424d835d964c2eb3fc6 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/Cde.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png new file mode 100644 index 000000000..502d6006e Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png.meta new file mode 100644 index 000000000..67aebbf91 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 335f1df58cd58914f97fe9ccae7f6c8c +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png deleted file mode 100644 index a4cc25571..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png deleted file mode 100644 index d29302a3f..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png deleted file mode 100644 index 1e0fffedf..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png deleted file mode 100644 index b7f85b203..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta deleted file mode 100644 index 5cf7436f1..000000000 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: d74e702a3e490a54e8a159128222f175 -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: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 - 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/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png deleted file mode 100644 index 5f09a091b..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png deleted file mode 100644 index 37004b0c3..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta deleted file mode 100644 index 1cee2478f..000000000 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 006a36cba2a146247a1d25b9e246faaa -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: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 - 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/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png deleted file mode 100644 index c458b7a43..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta deleted file mode 100644 index 62958f942..000000000 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 31d7e535d499d5f43ab64731acc3eec3 -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: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 - 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/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png deleted file mode 100644 index 26155b3ae..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta deleted file mode 100644 index 68d9b4d83..000000000 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 997d0aea13894a9428bf9d9f7fb66762 -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: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 - 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/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png deleted file mode 100644 index 2f3cdd1ed..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta deleted file mode 100644 index f77ad4377..000000000 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 3d04bfa220b9ebe40a4ae3f0a68c0911 -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: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 - 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/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png deleted file mode 100644 index 951dfc5d9..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta deleted file mode 100644 index f5b18f2c4..000000000 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 09168d6395b3e9b41b195a2aa8ae0a82 -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: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 - 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/Tycoons/Cocktails/FinishedCocktails/D.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png new file mode 100644 index 000000000..ebdabed0c Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png.meta new file mode 100644 index 000000000..b7e4cb54a --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 576d6ff3856f8ef419586ff12f2742b5 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/D1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png new file mode 100644 index 000000000..e8bb7e591 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png.meta new file mode 100644 index 000000000..7a4d545c3 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: ee344f47787d148448bd3373235281b6 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/E.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png new file mode 100644 index 000000000..56a9c8fc5 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png.meta new file mode 100644 index 000000000..5d9dcd82f --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 527440f24542af142a67219f2bcbeec4 +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: 1024 + 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/Tycoons/Cocktails/FinishedCocktails/E1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png new file mode 100644 index 000000000..46135cd00 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png.meta new file mode 100644 index 000000000..a30305d5d --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 421763357bbc5dd44b1498798618d7c5 +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: 1024 + 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/Tycoons/Cocktails/Garnishes/Garnish1.png b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png index 9436010b7..98df6bac3 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png and b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png.meta b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png.meta index ac00ee784..b784d3b03 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.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: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png index de6557383..7d9e2e053 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png and b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta index a29d8896d..9784072be 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.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: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png index 55281860c..67a139559 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta index 6d1e6be0f..bc063e8b9 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.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: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png index 1231da7e0..0cb3d0fac 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta index da86660cf..3e7feca61 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.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: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png index ca18f08dc..5937bbe5c 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta index f53870caa..68ef15aff 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.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: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png index 0d442e922..85c7b5110 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta index ffbe81da8..e9275e856 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.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: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png index 43c474372..96ff1af9b 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta index 7eb75fd1a..f5be772a5 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.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: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Ui/Tycoon/Box.png b/Assets/03.Images/Ui/Tycoon/CenterBalloon.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Box.png rename to Assets/03.Images/Ui/Tycoon/CenterBalloon.png diff --git a/Assets/03.Images/Ui/Tycoon/Box.png.meta b/Assets/03.Images/Ui/Tycoon/CenterBalloon.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Box.png.meta rename to Assets/03.Images/Ui/Tycoon/CenterBalloon.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png b/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png new file mode 100644 index 000000000..ca65f3e42 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta b/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png.meta similarity index 98% rename from Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta rename to Assets/03.Images/Ui/Tycoon/CustomerBalloon.png.meta index 5c0f6d53c..0d199c635 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta +++ b/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19df9fcd0ddf5754890f7ea9c127b905 +guid: fe306df97c6ccf34599e403eb74474fe TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png b/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png new file mode 100644 index 000000000..6ea12ee9c Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png differ diff --git a/Assets/03.Images/Props/Environment/Ice.png.meta b/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png.meta similarity index 98% rename from Assets/03.Images/Props/Environment/Ice.png.meta rename to Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png.meta index 34f19de50..2d086d896 100644 --- a/Assets/03.Images/Props/Environment/Ice.png.meta +++ b/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5317214c6c3a1d74c97c68e6ba525593 +guid: 252c4a717c0f082459089793566b412f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 512 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/04.Materials/CustomerOutLine.mat b/Assets/04.Materials/CustomerOutLineUnlit.mat similarity index 85% rename from Assets/04.Materials/CustomerOutLine.mat rename to Assets/04.Materials/CustomerOutLineUnlit.mat index b7d902c78..bae51ca1b 100644 --- a/Assets/04.Materials/CustomerOutLine.mat +++ b/Assets/04.Materials/CustomerOutLineUnlit.mat @@ -7,8 +7,8 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CustomerOutLine - m_Shader: {fileID: -6465566751694194690, guid: 194503740b92c724a96f32a7b2b9714f, type: 3} + m_Name: CustomerOutLineUnlit + m_Shader: {fileID: -6465566751694194690, guid: 8daa1b13f763ae74f8630c7a631dd327, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d49a506b374bf85428c0a5d6f3c0315b, type: 3} + m_Texture: {fileID: 2800000, guid: 1a4f3c20594f16b49ba571734aa21edd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -103,9 +103,14 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _ISCORNER: 0 - - _IsCorner: 1 + - _IsCorner: 0 - _Metallic: 0 - _OcclusionStrength: 1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 - _Parallax: 0.005 - _QueueControl: 0 - _QueueOffset: 0 @@ -115,14 +120,20 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 + - _StencilComp: 8 + - _StencilRef: 1 - _Surface: 0 - _Thickness: 0.01 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/04.Materials/CustomerOutLine.mat.meta b/Assets/04.Materials/CustomerOutLineUnlit.mat.meta similarity index 100% rename from Assets/04.Materials/CustomerOutLine.mat.meta rename to Assets/04.Materials/CustomerOutLineUnlit.mat.meta diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab index a7145e0fa..77295c192 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -545,18 +545,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4474176736289550761} - 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_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 4797239585124274237} + m_Father: {fileID: 2253494483373869651} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -45, y: 0} - m_SizeDelta: {x: 90, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1, y: 0} + m_SizeDelta: {x: 2, y: 0} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &1471674300321268583 CanvasRenderer: m_ObjectHideFlags: 0 @@ -612,12 +612,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 + m_fontSize: 0.65 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 34 + m_fontSizeMin: 0.1 + m_fontSizeMax: 10 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -673,7 +673,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4797239585124274237 RectTransform: m_ObjectHideFlags: 0 @@ -683,17 +683,16 @@ RectTransform: m_GameObject: {fileID: 5201084102013748843} 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_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 3323121370063268586} - - {fileID: 1132331773129038564} + - {fileID: 2253494483373869651} m_Father: {fileID: 7293985954889289183} 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: 150} - m_SizeDelta: {x: 150, y: 60} + m_AnchoredPosition: {x: 0, y: 1.2} + m_SizeDelta: {x: 3, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5023560089133695211 MonoBehaviour: @@ -731,10 +730,10 @@ MonoBehaviour: onComplete: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5201084102013748843} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1188822424991952652} + m_TargetAssemblyTypeName: BlueWater.Uis.PayMoneyUi, Assembly-CSharp + m_MethodName: HideUi + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -796,7 +795,7 @@ MonoBehaviour: autoPlay: 0 useTargetAsV3: 0 endValueFloat: 0 - endValueV3: {x: 0, y: 220, z: 0} + endValueV3: {x: 0, y: 1.5, z: 0} endValueV2: {x: 0, y: 0} endValueColor: {r: 1, g: 1, b: 1, a: 1} endValueString: @@ -828,6 +827,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _moveAnimation: {fileID: 5023560089133695211} + _panel: {fileID: 8635185869177028421} _goldText: {fileID: 3349212535167819167} --- !u!1 &7260635347182713621 GameObject: @@ -1070,7 +1070,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: k__BackingField: {fileID: 2961986041977982893} - _originalMaterial: {fileID: 2100000, guid: 678f2c946dedcdd4f9f8211872befbc0, type: 2} + _originalMaterial: {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2} _replacementMaterial: {fileID: 2100000, guid: 288a49bf884b6fc4bbb57fe5d2f4da06, type: 2} _initialSkinName: 02 _isRandomSkin: 1 @@ -1106,14 +1106,45 @@ MonoBehaviour: k__BackingField: {fileID: 3748026497419659573} k__BackingField: {fileID: 2588384133887034894} k__BackingField: {fileID: 8922295334492411225} - k__BackingField: {fileID: 7800018367225963417} + k__BackingField: {fileID: 5339802213853544233} k__BackingField: {fileID: 6080095273351670320} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1469338590548789471} k__BackingField: {fileID: 1188822424991952652} k__BackingField: {fileID: 5279376384905517670} k__BackingField: {fileID: 17978457728262906} k__BackingField: 1 - k__BackingField: 2 + k__BackingField: 1 + k__BackingField: + _vomiting: {fileID: 7264946127367919962, guid: d02f28b2bb526af478050f2f027be8e9, type: 3} + k__BackingField: + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: + k__BackingField: + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _customerInteractionType: 0 --- !u!1 &7812544424410854405 GameObject: m_ObjectHideFlags: 0 @@ -1263,6 +1294,43 @@ SortingGroup: m_SortingLayer: 0 m_SortingOrder: 6 m_SortAtRoot: 0 +--- !u!1 &8635185869177028421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2253494483373869651} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2253494483373869651 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8635185869177028421} + 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: 1 + m_Children: + - {fileID: 3323121370063268586} + - {fileID: 1132331773129038564} + m_Father: {fileID: 4797239585124274237} + 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} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9114641952602576849 GameObject: m_ObjectHideFlags: 0 @@ -1288,18 +1356,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9114641952602576849} - 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: [] - m_Father: {fileID: 4797239585124274237} + m_Father: {fileID: 2253494483373869651} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: 0} - m_SizeDelta: {x: 60, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 0} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &1980321908532173225 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1346,42 +1414,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2397117528733804567} m_Modifications: - - target: {fileID: 4119792729305172665, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_IsActive value: 0 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 + - target: {fileID: 4119792729305172665, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_SizeDelta.x - value: 800 - objectReference: {fileID: 0} - - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - propertyPath: m_SizeDelta.y - value: 600 - objectReference: {fileID: 0} - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1390,34 +1430,6 @@ 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 - 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 @@ -1465,9 +1477,6 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - insertIndex: -1 - addedObject: {fileID: 8432469322612575415} - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} insertIndex: -1 addedObject: {fileID: 4797239585124274237} @@ -1479,6 +1488,28 @@ 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} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7522674838449308991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7293985954889289183 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} @@ -1521,11 +1552,6 @@ MonoBehaviour: cancelWaitUntilSequenceEndsIfReplacingBark: 0 waitForContinueButton: 0 textDisplaySetting: 0 ---- !u!223 &7800018367225963417 stripped -Canvas: - m_CorrespondingSourceObject: {fileID: 5297442833789713246, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} - m_PrefabInstance: {fileID: 2718897986636601543} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5609554484774491156 PrefabInstance: m_ObjectHideFlags: 0 @@ -1540,7 +1566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 566939879778710709, guid: 3e8a6ee872b4e7e4fa263e0623657598, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1853779330485108260, guid: 3e8a6ee872b4e7e4fa263e0623657598, type: 3} propertyPath: playOnAwake @@ -1548,11 +1574,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8836230403992314849, guid: 3e8a6ee872b4e7e4fa263e0623657598, type: 3} propertyPath: m_LocalPosition.y - value: 0.921 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8836230403992314849, guid: 3e8a6ee872b4e7e4fa263e0623657598, type: 3} propertyPath: m_LocalPosition.z - value: 0.801 + value: 1.078 objectReference: {fileID: 0} - target: {fileID: 8836230403992314849, guid: 3e8a6ee872b4e7e4fa263e0623657598, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1581,121 +1607,3 @@ ParticleSystem: m_CorrespondingSourceObject: {fileID: 1853779330485108260, guid: 3e8a6ee872b4e7e4fa263e0623657598, type: 3} m_PrefabInstance: {fileID: 5609554484774491156} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5882202591468924078 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7293985954889289183} - m_Modifications: - - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_Name - value: FoodBalloonUi - objectReference: {fileID: 0} - - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalPosition.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_AnchoredPosition.x - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 130 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} ---- !u!224 &8432469322612575415 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} - m_PrefabInstance: {fileID: 5882202591468924078} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Particles/Npcs/PayMoneyParticle.prefab b/Assets/05.Prefabs/Particles/Npcs/PayMoneyParticle.prefab index 06d492598..131fa0e49 100644 --- a/Assets/05.Prefabs/Particles/Npcs/PayMoneyParticle.prefab +++ b/Assets/05.Prefabs/Particles/Npcs/PayMoneyParticle.prefab @@ -287,8 +287,8 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 0.4 - minScalar: 0.3 + scalar: 0.2 + minScalar: 0.15 maxCurve: serializedVersion: 2 m_Curve: @@ -672,7 +672,7 @@ ParticleSystem: donutRadius: 0.2 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1.5, y: 0.5, z: 1} + m_Scale: {x: 1, y: 0.5, z: 1} placementMode: 0 m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab index f961fdb4d..9547ecbee 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7272068659984017056} + - component: {fileID: 6277647266874368514} m_Layer: 8 m_Name: TableSeat02 m_TagString: Untagged @@ -31,8 +32,37 @@ Transform: m_Children: - {fileID: 3939857914763977653} - {fileID: 5719776441150710028} + - {fileID: 297355777426450409} m_Father: {fileID: 659765495160113802} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6277647266874368514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321954324799972663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2680665f39463b4aa942cfae231132c, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 8297147087732080609} + k__BackingField: {fileID: 8752266548893034047} + k__BackingField: {fileID: 3099553823688037663} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: + IsOpened: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: {fileID: 3939857914763977653} + k__BackingField: {fileID: 8752266548893034047} + TableDirection: {x: -1, y: 0, z: 0} + _foodImage: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + _dirtyImage: {fileID: 21300000, guid: ca9bef724b43e0b489043b7f18d4eddb, type: 3} --- !u!1 &1352874222752200122 GameObject: m_ObjectHideFlags: 0 @@ -44,7 +74,7 @@ GameObject: - component: {fileID: 5719776441150710028} - component: {fileID: 8752266548893034047} m_Layer: 8 - m_Name: Food02 + m_Name: VisualLook m_TagString: Untagged m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 @@ -59,10 +89,11 @@ Transform: m_GameObject: {fileID: 1352874222752200122} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.22, y: 0.21, z: -0.028000005} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_LocalPosition: {x: 0.22, y: 0.312, z: 0.058} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 8297147087732080609} m_Father: {fileID: 7272068659984017056} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!212 &8752266548893034047 @@ -108,16 +139,16 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 0} + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.40234375, y: 0.28271484} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &2118957188813578234 @@ -131,7 +162,7 @@ GameObject: - component: {fileID: 2866185542151069841} - component: {fileID: 4724775134085759924} m_Layer: 8 - m_Name: Food01 + m_Name: VisualLook m_TagString: Untagged m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 @@ -146,10 +177,11 @@ Transform: m_GameObject: {fileID: 2118957188813578234} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -0.22, y: 0.21, z: -0.028} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_LocalPosition: {x: -0.22, y: 0.31199998, z: 0.058000024} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 7139724635869576632} m_Father: {fileID: 1796875075399045521} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!212 &4724775134085759924 @@ -195,49 +227,18 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 0} + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.40234375, y: 0.28271484} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2919105202182231386 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2405604042841780691} - m_Layer: 8 - m_Name: Center - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2405604042841780691 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2919105202182231386} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.2, z: 0.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 809828747251277026} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5899113663160612507 GameObject: m_ObjectHideFlags: 0 @@ -247,6 +248,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1796875075399045521} + - component: {fileID: 6383913593085221228} m_Layer: 8 m_Name: TableSeat01 m_TagString: Untagged @@ -269,8 +271,37 @@ Transform: m_Children: - {fileID: 1356178426752869258} - {fileID: 2866185542151069841} + - {fileID: 4062855172287724115} m_Father: {fileID: 659765495160113802} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6383913593085221228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5899113663160612507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2680665f39463b4aa942cfae231132c, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 7139724635869576632} + k__BackingField: {fileID: 4724775134085759924} + k__BackingField: {fileID: 1675779991655778469} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: + IsOpened: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: {fileID: 1356178426752869258} + k__BackingField: {fileID: 4724775134085759924} + TableDirection: {x: 1, y: 0, z: 0} + _foodImage: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + _dirtyImage: {fileID: 21300000, guid: ca9bef724b43e0b489043b7f18d4eddb, type: 3} --- !u!1 &6493535781353555306 GameObject: m_ObjectHideFlags: 0 @@ -304,6 +335,37 @@ Transform: - {fileID: 7272068659984017056} m_Father: {fileID: 809828747251277026} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7008066670828516977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8297147087732080609} + m_Layer: 8 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8297147087732080609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008066670828516977} + serializedVersion: 2 + 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: [] + m_Father: {fileID: 5719776441150710028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7021050209712576239 GameObject: m_ObjectHideFlags: 0 @@ -335,6 +397,37 @@ Transform: m_Children: [] m_Father: {fileID: 1796875075399045521} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7591088015737457221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7139724635869576632} + m_Layer: 8 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7139724635869576632 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7591088015737457221} + serializedVersion: 2 + 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: [] + m_Father: {fileID: 2866185542151069841} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8514892081840363795 GameObject: m_ObjectHideFlags: 0 @@ -366,6 +459,131 @@ Transform: m_Children: [] m_Father: {fileID: 7272068659984017056} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4945635487706215153 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7272068659984017056} + m_Modifications: + - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - 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 + 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 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + 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 + 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 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Name + value: InteractionCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} +--- !u!224 &297355777426450409 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 4945635487706215153} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3099553823688037663 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8043919875794167790, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 4945635487706215153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7343451337687172630 PrefabInstance: m_ObjectHideFlags: 0 @@ -380,7 +598,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Size.x @@ -434,6 +652,10 @@ PrefabInstance: propertyPath: m_Name value: CustomerTable3 objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 3 @@ -494,19 +716,22 @@ PrefabInstance: propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedComponents: + - {fileID: 1702261025824090784, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_RemovedGameObjects: + - {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + - {fileID: 4526462685262723681, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - insertIndex: 1 + insertIndex: -1 addedObject: {fileID: 659765495160113802} - - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - insertIndex: 2 - addedObject: {fileID: 2405604042841780691} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 9182593229863186613} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 3389074959205472123} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} --- !u!4 &809828747251277026 stripped Transform: @@ -530,34 +755,143 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: {fileID: 2405604042841780691} - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 8975593228546502023} - k__BackingField: {fileID: 8793236136028073839} - k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} - k__BackingField: 1 - k__BackingField: 1.2 - IsOpened: 0 _tableSeats: - - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 1 - k__BackingField: {fileID: 1356178426752869258} - k__BackingField: {fileID: 4724775134085759924} - TableDirection: {x: 1, y: 0, z: 0} - - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 1 - k__BackingField: {fileID: 3939857914763977653} - k__BackingField: {fileID: 8752266548893034047} - TableDirection: {x: -1, y: 0, z: 0} ---- !u!224 &8793236136028073839 stripped + - {fileID: 6383913593085221228} + - {fileID: 6277647266874368514} +--- !u!210 &3389074959205472123 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_SortAtRoot: 0 +--- !u!1001 &8710013924293209931 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1796875075399045521} + m_Modifications: + - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.5 + 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 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + 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 + 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 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Name + value: InteractionCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} +--- !u!114 &1675779991655778469 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8043919875794167790, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 8710013924293209931} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &4062855172287724115 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} ---- !u!223 &8975593228546502023 stripped -Canvas: - m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} + m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 8710013924293209931} m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab index f5069cfc1..9a2d7eea7 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab @@ -201,7 +201,7 @@ Transform: m_GameObject: {fileID: 6581422458203868687} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.279, z: 0} + m_LocalPosition: {x: -0.01, y: 0.18, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -576,6 +576,7 @@ MonoBehaviour: k__BackingField: {fileID: 0} k__BackingField: {r: 0, g: 0, b: 0, a: 0} k__BackingField: 0 + k__BackingField: 0 --- !u!4 &5927803667513949971 stripped Transform: m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index fe725fa99..2753a390c 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -132,7 +132,6 @@ MonoBehaviour: k__BackingField: {fileID: 5927803667513949971} k__BackingField: {fileID: 6077686033771388879} k__BackingField: {fileID: 8975593228546502023} - k__BackingField: {fileID: 8793236136028073839} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 k__BackingField: 0.7 @@ -148,11 +147,6 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} ---- !u!224 &8793236136028073839 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} --- !u!223 &8975593228546502023 stripped Canvas: m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab new file mode 100644 index 000000000..821f29cc4 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab @@ -0,0 +1,186 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ca9bef724b43e0b489043b7f18d4eddb, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: Vomiting + objectReference: {fileID: 0} + - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ca9bef724b43e0b489043b7f18d4eddb, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1702261025824090784, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7264946127367919962} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7264946127367919962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be934bb7ffdbf164a91f2932a3ca12d0, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: 1 + k__BackingField: 0.5 + k__BackingField: "\uCE58\uC6B0\uAE30" + IsOpened: 0 +--- !u!4 &5927803667513949971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!212 &6077686033771388879 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab.meta new file mode 100644 index 000000000..5a22141e5 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d02f28b2bb526af478050f2f027be8e9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat index b1fa47ca1..cec4e1194 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat @@ -14,7 +14,8 @@ Material: m_ValidKeywords: - _RECEIVE_SHADOWS - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -34,14 +35,23 @@ Material: - _Cutoff: 0.1 - _DoubleSidedLighting: 0 - _LightAffectsAdditive: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 - _ReceiveShadows: 1 - _StencilComp: 8 - _StencilRef: 1 - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 - _TintBlack: 0 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _ZWrite: 0 m_Colors: - _Black: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/11.BehaviorTree/Customer.asset b/Assets/11.BehaviorTree/Customer.asset index d39b0f4df..e4e6a0105 100644 --- a/Assets/11.BehaviorTree/Customer.asset +++ b/Assets/11.BehaviorTree/Customer.asset @@ -31,11 +31,12 @@ MonoBehaviour: Success Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderCocktail","NodeData":{"Offset":"(-56.47064,150)"},"ID":9,"Name":"Order Cocktail","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.EatCocktail","NodeData":{"Offset":"(73.52937,150)"},"ID":10,"Name":"Eat Cocktail","Instant":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(286.363831,152.272583)"},"ID":11,"Name":"Order - Failure Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderFail","NodeData":{"Offset":"(-143.288757,151.373474)"},"ID":12,"Name":"Order - Fail","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-0.441589355,149.5423)","Comment":"\uc785\uad6c\ub85c - \ub418\ub3cc\uc544\uac04\ub2e4"},"ID":13,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(3.5,0,-16.5)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BlueWater.BehaviorTrees.Actions.CheckOut","NodeData":{"Offset":"(170,150)"},"ID":14,"Name":"Check - Out","Instant":true}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(742.794,147.214279)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":15,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-145.702881,148.345764)"},"ID":16,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(2.761672,146.545288)","Comment":"\uc785\uad6c\ub85c - \ub418\ub3cc\uc544\uac04\ub2e4"},"ID":17,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(3.5,0,-16.5)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BlueWater.BehaviorTrees.Actions.CheckOut","NodeData":{"Offset":"(170,150)"},"ID":18,"Name":"Check + Failure Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderFail","NodeData":{"Offset":"(-171.836426,139.17836)"},"ID":12,"Name":"Order + Fail","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.MoveSpawnPosition","NodeData":{"Offset":"(-3.28204346,144.4049)"},"ID":13,"Name":"Move + Spawn Position","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.CheckOut","NodeData":{"Offset":"(152.261658,140)"},"ID":14,"Name":"Check + Out","Instant":true}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(742.794,147.214279)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":15,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.MoveSpawnPosition","NodeData":{"Offset":"(-298.843353,152.3807)"},"ID":16,"Name":"Move + Spawn Position","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.Vomit","NodeData":{"Offset":"(-134.094391,154.430084)"},"ID":17,"Name":"Vomit","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-2.775899,148.649414)"},"ID":18,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Actions.MoveSpawnPosition","NodeData":{"Offset":"(140.7489,148.095245)"},"ID":19,"Name":"Move + Spawn Position","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.CheckOut","NodeData":{"Offset":"(290.7482,150)"},"ID":20,"Name":"Check Out","Instant":true}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' fieldSerializationData: typeName: [] diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e466166fc..8245e18f5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.0.2 + bundleVersion: 0.3.0.6 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} metroInputSource: 0