iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.0.6 업데이트

Browse Source
This commit is contained in:
Nam Tae Gun 2024-10-07 08:41:09 +09:00
parent aa425699c1
commit 4764097f6a
116 changed files with 3557 additions and 1438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
Assets/01.Scenes/01.Tycoon.unity
View File

@ -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
<MainCamera>k__BackingField: {fileID: 873223991}
<UiCamera>k__BackingField: {fileID: 0}
<LiquidOverlayCamera>k__BackingField: {fileID: 1985878519}
cameraLocation: {fileID: 1634548838}
<BaseCamera>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}
<StageDataSo>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

2
Assets/01.Scenes/02.Combat/GlobalVolume.asset
View File

@ -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}

3
Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/CheckOut.cs
View File

@ -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;
}
}

2
Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/EatCocktail.cs
View File

@ -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;

26
Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs Normal file
View File

@ -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<Customer>();
}
public override TaskStatus OnUpdate()
{
_customer.MoveSpawnPosition();
return TaskStatus.Success;
}
}
}

2
Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/MoveSpawnPosition.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: b1b5275d0abcbf741b2a877f08306227

4
Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs
View File

@ -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;
}
}

45
Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs Normal file
View File

@ -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<Customer>();
}
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;
}
}
}

2
Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 7d3787d4363729e44bfe68a6d3320dfb

52
Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs
View File

@ -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;
}
}
}

10
Assets/02.Scripts/Character/AiMovement.cs
View File

@ -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);

148
Assets/02.Scripts/Character/Npc/Customer.cs
View File

@ -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<BarkTrigger>();
PayMoneyParticle = transform.Find("PayMoneyParticle").GetComponent<ParticleSystem>();
InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();
BalloonUi = InteractionCanvas.transform.Find("FoodBalloonUi").GetComponent<BalloonUi>();
PayMoneyUi = InteractionCanvas.transform.Find("PayMoneyUi").GetComponent<PayMoneyUi>();
BalloonUi = InteractionCanvas.transform.GetComponentInChildren<BalloonUi>();
PayMoneyUi = InteractionCanvas.transform.GetComponentInChildren<PayMoneyUi>();
SpineController = GetComponent<SpineController>();
AIMovement = GetComponent<AiMovement>();
@ -182,9 +207,10 @@ namespace BlueWater.Npcs.Customers
_astarAi = GetComponent<IAstarAI>();
}
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
}

18
Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
View File

@ -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<SkeletonAnimation>();
InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();
SpineController = GetComponent<SpineController>();
PlayerHealthPoint = GetComponent<PlayerHealthPoint>();
TycoonInput = GetComponent<TycoonInput>();
TycoonMovement = GetComponent<TycoonMovement>();
@ -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

16
Assets/02.Scripts/DataManager.cs
View File

@ -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<int> 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);
}
}
}

8
Assets/02.Scripts/EventManager.cs
View File

@ -1,5 +1,4 @@
using System;
using BlueWater.Interfaces;
using BlueWater.Items;
using UnityEngine;
@ -29,6 +28,8 @@ namespace BlueWater
// 플레이어
public static Action<LevelData> OnLevelUp;
public static Action<int> OnChangeGold;
public static Action<int> 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<CocktailData> OnCocktailCompleted;
public static Action OnCocktailDiscarded;
@ -52,6 +50,8 @@ namespace BlueWater
public static Action<CocktailData> OnCocktailServedToCustomer;
public static Action<float> OnInteracting;
// 요리
//public static Action<string> OnFoodRecipeAcquired;

3
Assets/02.Scripts/Prop/Tycoon/Barrel.cs
View File

@ -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();
}

50
Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs
View File

@ -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<TableSeat> _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;
}
}
}

5
Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs
View File

@ -104,7 +104,10 @@ namespace BlueWater.Tycoons
public virtual void HideInteractionUi()
{
VisualLook.material = OriginalMaterial;
if (VisualLook)
{
VisualLook.material = OriginalMaterial;
}
EventManager.OnHideInteractionUi?.Invoke();
}

100
Assets/02.Scripts/Prop/Tycoon/TableSeat.cs
View File

@ -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<IDamageable>();
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;
}
}
}

78
Assets/02.Scripts/Prop/Tycoon/Vomiting.cs Normal file
View File

@ -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<IDamageable>();
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<SpriteRenderer>().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);
}
}
}

2
Assets/02.Scripts/Prop/Tycoon/Vomiting.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: be934bb7ffdbf164a91f2932a3ca12d0

30
Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset
View File

@ -44,7 +44,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 06a07650d842ee94390ca2505955e94d, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: 0cf23778fd0b2994c9d608fbbf185468, type: 3}
- <Key>k__BackingField: Cocktail002
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail002
@ -60,7 +60,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 19df9fcd0ddf5754890f7ea9c127b905, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3}
- <Key>k__BackingField: Cocktail003
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail003
@ -76,7 +76,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: a51b37c5e512c7e488e80f986f5f8aac, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: c55f4b0a55a391d488e54a28dc840509, type: 3}
- <Key>k__BackingField: Cocktail004
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail004
@ -92,7 +92,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: d74e702a3e490a54e8a159128222f175, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: 576d6ff3856f8ef419586ff12f2742b5, type: 3}
- <Key>k__BackingField: Cocktail005
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail005
@ -108,7 +108,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: bff0ff1345b7ae446b330a01e6ef7bd3, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3}
- <Key>k__BackingField: Cocktail006
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail006
@ -124,7 +124,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 006a36cba2a146247a1d25b9e246faaa, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: 6a4cd8cdf11fe024e8ecac8e3d60e10d, type: 3}
- <Key>k__BackingField: Cocktail007
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail007
@ -140,7 +140,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 31d7e535d499d5f43ab64731acc3eec3, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: b38089ff4046ac044ba79dfa5116aa1b, type: 3}
- <Key>k__BackingField: Cocktail008
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail008
@ -156,7 +156,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 997d0aea13894a9428bf9d9f7fb66762, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: 71954183dfb02424d835d964c2eb3fc6, type: 3}
- <Key>k__BackingField: Cocktail009
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail009
@ -172,7 +172,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 3d04bfa220b9ebe40a4ae3f0a68c0911, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: d0748411047fc4a41beb1fb8d551e01e, type: 3}
- <Key>k__BackingField: Cocktail010
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail010
@ -188,7 +188,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 09168d6395b3e9b41b195a2aa8ae0a82, type: 3}
<Sprite>k__BackingField: {fileID: 21300000, guid: 335f1df58cd58914f97fe9ccae7f6c8c, type: 3}
- <Key>k__BackingField: Cocktail011
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail011
@ -204,7 +204,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3}
- <Key>k__BackingField: Cocktail012
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail012
@ -220,7 +220,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: ee344f47787d148448bd3373235281b6, type: 3}
- <Key>k__BackingField: Cocktail013
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail013
@ -236,7 +236,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: aef7fd596cbfc854d87f408c14951641, type: 3}
- <Key>k__BackingField: Cocktail014
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail014
@ -252,7 +252,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 91d99e534e5f3c04094b14ed920bec04, type: 3}
- <Key>k__BackingField: Cocktail015
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail015
@ -268,4 +268,4 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3}

7
Assets/02.Scripts/ScriptableObject/StageData.asset
View File

@ -12,6 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: add43bc825f942044b87c758a6832b68, type: 3}
m_Name: StageData
m_EditorClassIdentifier:
<MaxCustomersByRating>k__BackingField: 0c00000012000000180000001e00000024000000
WaitTimeInStarted: 5
CustomerEntryInterval: 15
<WaitTimeInStarted>k__BackingField: 5
<VomitingPercent>k__BackingField: 100
<DirtyTablePercent>k__BackingField: 100
<DirtyTableWaitTime>k__BackingField: 30

2
Assets/02.Scripts/Tycoon/CustomerManager.cs
View File

@ -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;

23
Assets/02.Scripts/Tycoon/LiquidController.cs
View File

@ -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;

14
Assets/02.Scripts/Tycoon/StageDataSo.cs
View File

@ -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;
}
}

6
Assets/02.Scripts/Tycoon/TycoonStageController.cs
View File

@ -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<CustomerVisitInfo> _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)
{

35
Assets/02.Scripts/Tycoon/TycoonStatus.cs
View File

@ -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()
{

5
Assets/02.Scripts/TycoonCameraManager.cs
View File

@ -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<Camera>();
UiCamera = MainCamera.transform.Find("UiCamera").GetComponent<Camera>();
LiquidOverlayCamera = GameObject.Find("LiquidOverlayCamera").GetComponent<Camera>();
_cinemachineBrain = GetComponent<CinemachineBrain>();
BaseCamera = cameraLocation.Find("BaseCamera").GetComponent<CinemachineCamera>();

18
Assets/02.Scripts/Ui/InteractionUi.cs
View File

@ -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;
}
}
}

44
Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs
View File

@ -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();

4
Assets/02.Scripts/Ui/Tycoon/GoldUi.cs
View File

@ -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()

11
Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs
View File

@ -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);
}
}

BIN
Assets/03.Images/Props/Environment/Ice.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
Assets/03.Images/Props/Environment/Vomiting.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 KiB

8
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta → Assets/03.Images/Props/Environment/Vomiting.png.meta
View File

@ -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: []

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 KiB

6
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta → Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png.meta
View File

@ -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

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 256 KiB

6
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta → Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png.meta
View File

@ -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

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 515 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 484 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 247 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 270 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 238 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 333 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 238 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 250 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 501 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 504 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png.meta Normal file
View File

@ -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:

BIN
Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 442 KiB

2
Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png.meta
View File

@ -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}

BIN
Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 KiB

After

Width:  |  Height:  |  Size: 751 KiB

2
Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta
View File

@ -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}

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 217 KiB

2
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta
View File

@ -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}

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 221 KiB

2
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta
View File

@ -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}

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 243 KiB

2
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta
View File

@ -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}

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 242 KiB

2
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta
View File

@ -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}

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 236 KiB

2
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta
View File

@ -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}

0
Assets/03.Images/Ui/Tycoon/Box.png → Assets/03.Images/Ui/Tycoon/CenterBalloon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
Assets/03.Images/Ui/Tycoon/Box.png.meta → Assets/03.Images/Ui/Tycoon/CenterBalloon.png.meta
View File

Some files were not shown because too many files have changed in this diff Show More