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

타이쿤 기능 붙이는 중

Browse Source
This commit is contained in:
Nam Tae Gun 2024-09-23 11:00:21 +09:00
parent b325dc5304
commit a4637e74ba
79 changed files with 8205 additions and 1031 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4112,6 +4112,17 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 393212792}
m_CullTransparentMesh: 1
--- !u!114 &405502709 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 182135209563034965, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
m_PrefabInstance: {fileID: 7827484746149782377}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &414363377
GameObject:
m_ObjectHideFlags: 0
@ -4736,6 +4747,17 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 444009244}
m_CullTransparentMesh: 1
--- !u!114 &455003948 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8972014786941749689, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
m_PrefabInstance: {fileID: 7827484746149782377}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &510358306
GameObject:
m_ObjectHideFlags: 0
@ -5185,8 +5207,7 @@ Transform:
m_LocalPosition: {x: -4.78, y: 9.641813, z: -16.250668}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2105041733}
m_Children: []
m_Father: {fileID: 1634548838}
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
--- !u!114 &545850349
@ -6193,6 +6214,17 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_IsOn: 1
--- !u!114 &620853359 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2407405612995933340, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
m_PrefabInstance: {fileID: 7827484746149782377}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &626632725
GameObject:
m_ObjectHideFlags: 0
@ -13918,8 +13950,8 @@ Transform:
m_GameObject: {fileID: 1400792457}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10.25, y: 0, z: -1.52}
m_LocalScale: {x: 10, y: 2, z: 5}
m_LocalPosition: {x: -10.46, y: 0, z: -1.52}
m_LocalScale: {x: 9, y: 2, z: 5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1006730365}
@ -15695,6 +15727,17 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1604407184}
m_CullTransparentMesh: 1
--- !u!114 &1605879905 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8131739000100095639, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
m_PrefabInstance: {fileID: 7827484746149782377}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1617241974
GameObject:
m_ObjectHideFlags: 0
@ -16550,6 +16593,7 @@ GameObject:
- component: {fileID: 1665075869}
- component: {fileID: 1665075870}
- component: {fileID: 1665075872}
- component: {fileID: 1665075873}
m_Layer: 0
m_Name: TycoonManager
m_TagString: Untagged
@ -16585,20 +16629,23 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_persistent: 0
<MaxHeart>k__BackingField: 3
CurrentHeart: 0
Invincibility: 0
<Chracter_Speed>k__BackingField: 1
<LiquidA>k__BackingField: 1000
<LiquidB>k__BackingField: 1000
<LiquidC>k__BackingField: 1000
<LiquidD>k__BackingField: 1000
<LiquidE>k__BackingField: 1000
<GarnishA>k__BackingField: 1000
<GarnishB>k__BackingField: 1000
<CustomerTableController>k__BackingField: {fileID: 1665075870}
<TycoonStageController>k__BackingField: {fileID: 1665075872}
<TycoonIngredientController>k__BackingField: {fileID: 0}
_dailyBgm: TycoonDailyBgm1
<TycoonStatus>k__BackingField:
_maxPlayerHealth: 0
_currentPlayerHealth: 0
_playerMoveSpeedMultiplier: 0
_currentExp: 0
_currentGold: 0
_currentLiquidAmountA: 0
_currentLiquidAmountB: 0
_currentLiquidAmountC: 0
_currentLiquidAmountD: 0
_currentLiquidAmountE: 0
_currentGarnishAmount1: 0
_currentGarnishAmount2: 0
<LevelDataSo>k__BackingField: {fileID: 11400000, guid: 702b1ed0ce71d1b4aa1ddbce67e475a1, type: 2}
<CardDataSo>k__BackingField: {fileID: 11400000, guid: 4607b374e49ab734da548949f9e10fed, type: 2}
--- !u!114 &1665075870
@ -16628,6 +16675,25 @@ MonoBehaviour:
m_EditorClassIdentifier:
_stageDataSo: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2}
_dailyCustomerVisitInfos: []
--- !u!114 &1665075873
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1665075867}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72638ccfaf7778d42808e233d2eb6e8c, type: 3}
m_Name:
m_EditorClassIdentifier:
<LiquidBarrelA>k__BackingField: {fileID: 455003948}
<LiquidBarrelB>k__BackingField: {fileID: 1605879905}
<LiquidBarrelC>k__BackingField: {fileID: 405502709}
<LiquidBarrelD>k__BackingField: {fileID: 1950956315}
<LiquidBarrelE>k__BackingField: {fileID: 620853359}
<GarnishBarrel1>k__BackingField: {fileID: 0}
<GarnishBarrel2>k__BackingField: {fileID: 0}
--- !u!1 &1670140492
GameObject:
m_ObjectHideFlags: 0
@ -17327,7 +17393,7 @@ MonoBehaviour:
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 2148007935
m_Bits: 2147745791
--- !u!114 &1730992469
MonoBehaviour:
m_ObjectHideFlags: 0
@ -20550,6 +20616,17 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 2
m_SpriteSortPoint: 0
--- !u!114 &1950956315 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3218250623459008295, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
m_PrefabInstance: {fileID: 7827484746149782377}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1957839369
PrefabInstance:
m_ObjectHideFlags: 0
@ -21926,7 +22003,7 @@ GameObject:
- component: {fileID: 2105041735}
- component: {fileID: 2105041734}
- component: {fileID: 2105041736}
m_Layer: 18
m_Layer: 0
m_Name: LiquidRenderTexture
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -21941,13 +22018,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2105041732}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.35, y: 0.02, z: 5}
m_LocalScale: {x: 2.56, y: 2.56, z: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -250, y: 0, z: 0}
m_LocalScale: {x: 100, y: 100, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 545850348}
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2105041734
MeshRenderer:
m_ObjectHideFlags: 0
@ -24756,6 +24833,7 @@ SceneRoots:
- {fileID: 873223992}
- {fileID: 1985878520}
- {fileID: 1774013120}
- {fileID: 2105041733}
- {fileID: 1634548838}
- {fileID: 1425009442}
- {fileID: 1222632321}

8
Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs
View File

@ -38,7 +38,7 @@ namespace BlueWater.Players.Combat
[field: SerializeField, Range(1f, 10f), Tooltip("이동 속도")]
public float MoveSpeed { get; private set; } = 7f;
public float MoveSpeedCoefficient { get; private set; } = 1f;
public float MoveSpeedMultiplier { get; private set; } = 1f;
public bool IsMoveEnabled { get; private set; } = true;
@ -191,8 +191,8 @@ namespace BlueWater.Players.Combat
_inputDirection = new Vector3(movementInput.x, 0, movementInput.y).normalized;
}
public void SetMoveSpeedCoefficient(float value) => MoveSpeedCoefficient = value;
public void ResetMoveSpeedCoefficient() => MoveSpeedCoefficient = 1f;
public void SetMoveSpeedMultiplier(float value) => MoveSpeedMultiplier = value;
public void ResetMoveSpeedMultiplier() => MoveSpeedMultiplier = 1f;
public void SetCurrentDirection(Vector3 normalDirection) => CurrentDirection = normalDirection;
// Methods
@ -251,7 +251,7 @@ namespace BlueWater.Players.Combat
}
IsMoving = velocityDirection != Vector3.zero;
_finalVelocity = velocityDirection * (MoveSpeed * MoveSpeedCoefficient);
_finalVelocity = velocityDirection * (MoveSpeed * MoveSpeedMultiplier);
var pushVelocity = PushDirection * PushPower;
_finalVelocity += pushVelocity;
if (!Rigidbody.isKinematic)

4
Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs
View File

@ -118,7 +118,7 @@ namespace BlueWater.Players.Combat
CombatInput.OnActivateMainSkillInputReceived += CombatSkillController.TryActivateSkill;
// PlayerHealthPoint
PlayerHealthPoint.OnDead += Die;
EventManager.OnDead += Die;
}
private void UnSubscribeEvents()
@ -130,7 +130,7 @@ namespace BlueWater.Players.Combat
CombatInput.OnActivateMainSkillInputReceived -= CombatSkillController.TryActivateSkill;
// PlayerHealthPoint
PlayerHealthPoint.OnDead -= Die;
EventManager.OnDead -= Die;
}
private void Die()

4
Assets/02.Scripts/Character/Player/Combat/CombatStatus.cs
View File

@ -123,7 +123,7 @@ namespace BlueWater.Players.Combat
public void SlowMoveSpeed(float duration, float moveSpeedCoefficient)
{
_spriteRenderer.material.SetColor(_colorHash, _slowEffectColor);
_physicMovable?.SetMoveSpeedCoefficient(moveSpeedCoefficient);
_physicMovable?.SetMoveSpeedMultiplier(moveSpeedCoefficient);
IsSlowedMoveSpeed = true;
Utils.StartUniqueCoroutine(this, ref _slowMoveSpeedCoolDownCoroutine, Utils.CoolDownCoroutine(duration, EndSlowMoveSpeed));
@ -141,7 +141,7 @@ namespace BlueWater.Players.Combat
IsSlowedMoveSpeed = false;
_spriteRenderer.material.SetColor(_colorHash, Color.white);
_physicMovable?.ResetMoveSpeedCoefficient();
_physicMovable?.ResetMoveSpeedMultiplier();
Utils.EndUniqueCoroutine(this, ref _slowMoveSpeedCoolDownCoroutine);
}

43
Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs
View File

@ -33,15 +33,9 @@ namespace BlueWater.Players
private WaitForSeconds _flashWhiteWaitTime;
private Coroutine _flashWhiteCoroutine;
private Coroutine _damageIntervalCoroutine;
private PlayerHealthPointUi _playerHealthPointUi;
private bool _isQuitting;
// Hashes
private static readonly int _isHitHash = Shader.PropertyToID("_IsHit");
// Events
public event Action<int> OnHealthChanged;
public event Action OnDead;
private static readonly int IsHitHash = Shader.PropertyToID("_IsHit");
// Unity events
private void Awake()
@ -51,27 +45,9 @@ namespace BlueWater.Players
private void Start()
{
_playerHealthPointUi = FindAnyObjectByType<PlayerHealthPointUi>();
if (_playerHealthPointUi)
{
OnHealthChanged += _playerHealthPointUi.SetCurrentHealthPoint;
}
_flashWhiteWaitTime = new WaitForSeconds(InvincibilityDuration * 0.1f);
SetCurrentHealthPoint(MaxHealthPoint);
}
private void OnApplicationQuit()
{
_isQuitting = true;
}
private void OnDestroy()
{
if (_isQuitting || !_playerHealthPointUi) return;
OnHealthChanged -= _playerHealthPointUi.SetCurrentHealthPoint;
}
// Initialize methods
[Button("컴포넌트 초기화")]
@ -84,11 +60,18 @@ namespace BlueWater.Players
}
// Methods
public void SetMaxHealthPoint(int changedHealthPoint)
{
var newChangedHealthPoint = Mathf.Clamp(changedHealthPoint, 0, 10);
MaxHealthPoint = newChangedHealthPoint;
EventManager.OnMaxHealthChanged?.Invoke(newChangedHealthPoint);
}
public void SetCurrentHealthPoint(int changedHealthPoint)
{
var newChangedHealthPoint = Mathf.Clamp(changedHealthPoint, 0, MaxHealthPoint);
CurrentHealthPoint = newChangedHealthPoint;
OnHealthChanged?.Invoke(newChangedHealthPoint);
EventManager.OnHealthChanged?.Invoke(newChangedHealthPoint);
if (CurrentHealthPoint <= 2)
{
@ -124,7 +107,7 @@ namespace BlueWater.Players
return;
}
if (_spriteRenderer.material.HasInt(_isHitHash))
if (_spriteRenderer.material.HasInt(IsHitHash))
{
Utils.StartUniqueCoroutine(this, ref _flashWhiteCoroutine, FlashWhiteCoroutine());
}
@ -140,16 +123,16 @@ namespace BlueWater.Players
public void Die()
{
OnDead?.Invoke();
EventManager.OnDead?.Invoke();
}
private IEnumerator FlashWhiteCoroutine()
{
for (var i = 0; i < 5; i++)
{
_spriteRenderer.material.SetInt(_isHitHash, 1);
_spriteRenderer.material.SetInt(IsHitHash, 1);
yield return _flashWhiteWaitTime;
_spriteRenderer.material.SetInt(_isHitHash, 0);
_spriteRenderer.material.SetInt(IsHitHash, 0);
yield return _flashWhiteWaitTime;
}

6
Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs
View File

@ -18,7 +18,7 @@ namespace BlueWater.Players.Tycoons
[field: SerializeField, Range(1f, 20f), Tooltip("이동 속도")]
public float MoveSpeed { get; private set; } = 7f;
public float MoveSpeedCoefficient { get; private set; } = 1f;
public float MoveSpeedMultiplier { get; private set; } = 1f;
public bool IsMoveEnabled { get; private set; } = true;
@ -113,8 +113,8 @@ namespace BlueWater.Players.Tycoons
_inputDirection = new Vector3(movementInput.x, 0, movementInput.y).normalized;
}
public void SetMoveSpeedCoefficient(float value) => MoveSpeedCoefficient = value;
public void ResetMoveSpeedCoefficient() => MoveSpeedCoefficient = 1f;
public void SetMoveSpeedMultiplier(float value) => MoveSpeedMultiplier = value;
public void ResetMoveSpeedMultiplier() => MoveSpeedMultiplier = 1f;
public void EnableMove() => IsMoveEnabled = true;
public void DisableMove() => IsMoveEnabled = false;
public void SetCurrentDirection(Vector3 normalDirection) => CurrentDirection = normalDirection;

29
Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs
View File

@ -9,6 +9,9 @@ namespace BlueWater.Players.Tycoons
[SerializeField]
private SpriteRenderer _itemRenderer;
[SerializeField]
private bool _isUnfinishedCocktailPickedUp;
[SerializeField]
private bool _isPickedUpItem;
@ -21,12 +24,14 @@ namespace BlueWater.Players.Tycoons
private void Start()
{
EventManager.OnCocktailStarted += PickupUnfinishedCocktail;
EventManager.OnCocktailCompleted += PickupItem;
EventManager.OnCocktailDiscarded += DiscardItem;
}
private void OnDestroy()
{
EventManager.OnCocktailStarted -= PickupUnfinishedCocktail;
EventManager.OnCocktailCompleted -= PickupItem;
EventManager.OnCocktailDiscarded -= DiscardItem;
}
@ -37,6 +42,11 @@ namespace BlueWater.Players.Tycoons
_itemRenderer = transform.Find("VisualLook/Item").GetComponent<SpriteRenderer>();
}
private void PickupUnfinishedCocktail()
{
_isUnfinishedCocktailPickedUp = true;
}
public void PickupItem(IPickup item)
{
if (_isPickedUpItem)
@ -45,6 +55,7 @@ namespace BlueWater.Players.Tycoons
return;
}
_isUnfinishedCocktailPickedUp = false;
_currentPickupItem = item;
_itemRenderer.enabled = false;
//_itemRenderer.sprite = item.Sprite;
@ -66,18 +77,30 @@ namespace BlueWater.Players.Tycoons
public void DiscardItem()
{
if (!_isPickedUpItem || _currentPickupItem == null)
if (!_isPickedUpItem && !_isUnfinishedCocktailPickedUp)
{
Debug.Log("들고있는 아이템이 없거나, 현재 아이템 데이터가 비어있습니다.");
Debug.Log("들고있는 아이템이 없습니다.");
return;
}
_isUnfinishedCocktailPickedUp = false;
_currentPickupItem = null;
_itemRenderer.sprite = null;
_isPickedUpItem = false;
}
public IPickup GetCurrentPickupItem() => _currentPickupItem;
public bool IsServablePickupItem() => _isPickedUpItem && _currentPickupItem.Idx != "Cocktail000";
/// <summary>
/// 완성된 아이템이 있는 경우
/// </summary>
public bool IsPickedUpItem() => _isPickedUpItem;
/// <summary>
/// 제조중인 칵테일이 있거나, 아이템이 있는 경우
/// </summary>
public bool IsPickedUpCocktail() => _isPickedUpItem || _isUnfinishedCocktailPickedUp;
}
}

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

@ -45,6 +45,9 @@ namespace BlueWater.Players.Tycoons
[field: SerializeField]
public BalloonUi BalloonUi { get; private set; }
[field: SerializeField]
public PlayerHealthPoint PlayerHealthPoint { get; private set; }
[field: SerializeField]
public TycoonInput TycoonInput { get; private set; }
@ -95,6 +98,7 @@ namespace BlueWater.Players.Tycoons
SkeletonAnimation = VisualLook.GetComponent<SkeletonAnimation>();
BalloonUi = transform.Find("Canvas/BalloonUi").GetComponent<BalloonUi>();
PlayerHealthPoint = GetComponent<PlayerHealthPoint>();
TycoonInput = GetComponent<TycoonInput>();
TycoonMovement = GetComponent<TycoonMovement>();
TycoonPickupHandler = GetComponent<TycoonPickupHandler>();
@ -114,17 +118,29 @@ namespace BlueWater.Players.Tycoons
{
// Input
TycoonInput.OnMoveInputReceived += TycoonMovement.HandleInputMovement;
EventManager.OnLiquidRegionEntered += BalloonUi.EnterLiquidRegion;
EventManager.OnLiquidRegionExited += BalloonUi.ExitLiquidRegion;
EventManager.OnCocktailStarted += BalloonUi.PickupUnfinishedCocktail;
EventManager.OnCocktailCompleted += BalloonUi.SetItemImage;
EventManager.OnCocktailDiscarded += BalloonUi.DiscardItem;
}
private void UnSubscribeEvents()
{
// Input
TycoonInput.OnMoveInputReceived -= TycoonMovement.HandleInputMovement;
EventManager.OnLiquidRegionEntered -= BalloonUi.EnterLiquidRegion;
EventManager.OnLiquidRegionExited -= BalloonUi.ExitLiquidRegion;
EventManager.OnCocktailStarted -= BalloonUi.PickupUnfinishedCocktail;
EventManager.OnCocktailCompleted -= BalloonUi.SetItemImage;
EventManager.OnCocktailDiscarded -= BalloonUi.DiscardItem;
}
// Wrapping
public void GetMoney(int money) => DataManager.Instance.GetMoney(money);
public bool IsCarriedItem() => TycoonPickupHandler.IsPickedUpItem();
// public bool IsPickedUpItem() => TycoonPickupHandler.IsPickedUpItem();
// public void CarryItem(IPickup item)
// {

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

@ -10,6 +10,9 @@ namespace BlueWater
#region Global events
public static Action<float, float, Color?, float> FadeInOut;
public static Action<int> OnMaxHealthChanged;
public static Action<int> OnHealthChanged;
public static Action OnDead;
#endregion
@ -19,13 +22,19 @@ namespace BlueWater
// 음료
// public static Action<string> OnDrinkRecipeAcquired;
// public static Action<LiquidData> OnDrinkRecipeSelected;
public static Action OnTycoonOpenedEvent;
public static Action OnTycoonClosedEvent;
public static Action OnLiquidRegionEntered;
public static Action OnLiquidRegionExited;
public static Action OnCocktailStarted;
public static Action<CocktailData> OnCocktailCompleted;
public static Action OnCocktailDiscarded;
public static Action OnPlaceOnServingTable;
public static Action OnTakeFromServingTable;
// 요리
//public static Action<string> OnFoodRecipeAcquired;

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

@ -28,8 +28,8 @@ namespace BlueWater
private void Start()
{
TycoonManager.Instance.OnTycoonOpenedEvent += OnTycoonOpened;
TycoonManager.Instance.OnTycoonClosedEvent += OnTycoonClosed;
EventManager.OnTycoonOpenedEvent += OnTycoonOpened;
EventManager.OnTycoonClosedEvent += OnTycoonClosed;
_timeIncrementPerMinutes = _gameTimeDataSo.TimeIncrementPerMinutes;
}
@ -51,8 +51,8 @@ namespace BlueWater
{
if (Quitting) return;
TycoonManager.Instance.OnTycoonOpenedEvent -= OnTycoonOpened;
TycoonManager.Instance.OnTycoonClosedEvent -= OnTycoonClosed;
EventManager.OnTycoonOpenedEvent -= OnTycoonOpened;
EventManager.OnTycoonClosedEvent -= OnTycoonClosed;
}
public void PauseGameTime()

6
Assets/02.Scripts/Interface/IPhysicMovable.cs
View File

@ -6,7 +6,7 @@ namespace BlueWater.Interfaces
{
Rigidbody Rigidbody { get; }
float MoveSpeed { get; }
float MoveSpeedCoefficient { get; }
float MoveSpeedMultiplier { get; }
bool IsMoveEnabled { get; }
bool IsMoving { get; }
Vector3 CurrentDirection { get; }
@ -14,8 +14,8 @@ namespace BlueWater.Interfaces
float PushPower { get; }
float PushPowerReduction { get; }
void SetMoveSpeedCoefficient(float value);
void ResetMoveSpeedCoefficient();
void SetMoveSpeedMultiplier(float value);
void ResetMoveSpeedMultiplier();
void SetCurrentDirection(Vector3 normalDirection);
bool CanMove();
void Move();

55
Assets/02.Scripts/LiquidController.cs
View File

@ -100,9 +100,8 @@ namespace BlueWater
private Color _targetColor;
// Hashes
private static readonly int _liquidAmountHash = Shader.PropertyToID("_LiquidAmount");
private static readonly int _liquidColorHash = Shader.PropertyToID("_LiquidColor");
private static readonly int _renderTextureColorHash = Shader.PropertyToID("_Color");
private static readonly int LiquidAmountHash = Shader.PropertyToID("_LiquidAmount");
private static readonly int LiquidColorHash = Shader.PropertyToID("_LiquidColor");
#endregion
@ -116,7 +115,7 @@ namespace BlueWater
_hideTween = _liquidPanel.transform.DOMoveX(-150f, _moveDuration).Pause()
.SetAutoKill(false);
_showTween = _liquidPanel.transform.DOMoveX(-249f, _moveDuration).Pause()
_showTween = _liquidPanel.transform.DOMoveX(-250f, _moveDuration).Pause()
.SetAutoKill(false);
}
@ -124,11 +123,13 @@ namespace BlueWater
{
EventManager.OnLiquidRegionEntered += ShowPanel;
EventManager.OnLiquidRegionExited += HidePanel;
EventManager.OnCocktailDiscarded += ReleaseAllObject;
EventManager.OnPlaceOnServingTable += ReleaseAllObject;
_instanceMaterial = Instantiate(_liquidRenderer.material);
_liquidRenderer.material = _instanceMaterial;
_instanceMaterial.SetFloat(_liquidAmountHash, 0f);
_instanceMaterial.SetFloat(LiquidAmountHash, 0f);
_timeInterval = 1f / _liquidsPerSecond;
_shaker.SetActive(true);
_amountText.enabled = true;
@ -173,7 +174,7 @@ namespace BlueWater
if (_liquidReachedTime + _colorLerpSpeed >= Time.time)
{
_currentMixedColor = Color.Lerp(_currentMixedColor, _targetColor, _colorLerpSpeed * Time.deltaTime);
_instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity);
_instanceMaterial.SetColor(LiquidColorHash, _currentMixedColor * _colorIntensity);
}
}
@ -181,6 +182,8 @@ namespace BlueWater
{
EventManager.OnLiquidRegionEntered -= ShowPanel;
EventManager.OnLiquidRegionExited -= HidePanel;
EventManager.OnCocktailDiscarded -= ReleaseAllObject;
EventManager.OnPlaceOnServingTable -= ReleaseAllObject;
}
#endregion
@ -203,10 +206,6 @@ namespace BlueWater
_instanceLiquidCount++;
var liquidColor = _currentBarrel.GetLiquidData().Color;
liquid.Initialize(this, _reachedCollider, liquidColor, _pushDirection.normalized * _pushPower);
if (_renderTexture && _renderTexture.material.GetColor(_renderTextureColorHash) != liquidColor)
{
_renderTexture.material.SetColor(_renderTextureColorHash, liquidColor);
}
_activeLiquids.Add(liquid);
}
@ -226,7 +225,7 @@ namespace BlueWater
// Custom methods
#region Custom methods
/// <summary>
/// 술 제조 과정 초기화 함수
/// </summary>
@ -237,32 +236,27 @@ namespace BlueWater
{
_activeLiquids[i].Destroy();
}
_liquidDataCounts.Clear();
_instanceLiquidCount = 0;
_instanceMaterial.SetFloat(LiquidAmountHash, 0f);
SetCurrentAmount(0f);
_instanceMaterial.SetFloat(_liquidAmountHash, 0f);
HidePanel();
}
/// <summary>
/// 현재 상호작용 중인 Barrel 연동
/// </summary>
/// <param name="barrel"></param>
public void SetBarrel(Barrel barrel)
public void ActiveIsPouring(Barrel barrel)
{
_currentBarrel = barrel;
}
public void ActiveIsPouring()
{
if (_instanceLiquidCount == 0)
{
ShowPanelFast();
_shaker.SetActive(true);
_amountText.enabled = true;
_completeCocktailImage.enabled = false;
_completeText.enabled = false;
_currentMixedColor = _currentBarrel.GetLiquidData().Color;
_instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity);
_instanceMaterial.SetColor(LiquidColorHash, _currentMixedColor * _colorIntensity);
EventManager.OnCocktailStarted?.Invoke();
}
_startTime = Time.time;
@ -416,7 +410,7 @@ namespace BlueWater
_liquidReachedTime = Time.time;
SetCurrentAmount(++_currentLiquidAmount);
var liquidAmount = Mathf.Clamp(_currentLiquidAmount / _maxLiquidCount, 0f, 1f);
_instanceMaterial.SetFloat(_liquidAmountHash, liquidAmount);
_instanceMaterial.SetFloat(LiquidAmountHash, liquidAmount);
_targetColor = MixColorsByTime();
if (liquidAmount >= 1f)
@ -425,9 +419,20 @@ namespace BlueWater
}
}
public void ShowPanel()
public void ShowPanelFast()
{
if (_isShowingPanel) return;
_liquidPanel.transform.position = new Vector3(-250f, 0f, 0f);
_liquidPanel.SetActive(true);
_isShowingPanel = true;
_hideTween.Pause();
_showTween.Pause();
}
public void ShowPanel()
{
if (_isShowingPanel || _instanceLiquidCount <= 0) return;
_isShowingPanel = true;
_hideTween.Pause();

26
Assets/02.Scripts/LiquidInteractionRegion.cs
View File

@ -1,18 +1,40 @@
using System;
using BlueWater.Players.Tycoons;
using UnityEngine;
namespace BlueWater
{
public class LiquidInteractionRegion : MonoBehaviour
{
private void OnTriggerEnter(Collider other)
private TycoonPlayer _tycoonPlayer;
private bool _isEntered;
private void Start()
{
if (GameManager.Instance.CurrentTycoonPlayer.IsCarriedItem()) return;
_tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer;
}
private void Update()
{
if (!_isEntered) return;
if (_tycoonPlayer.TycoonPickupHandler.IsPickedUpItem()) return;
EventManager.OnLiquidRegionEntered?.Invoke();
}
private void OnTriggerEnter(Collider other)
{
if (!other.CompareTag("Player")) return;
_isEntered = true;
}
private void OnTriggerExit(Collider other)
{
if (!other.CompareTag("Player")) return;
_isEntered = false;
EventManager.OnLiquidRegionExited?.Invoke();
}
}

4
Assets/02.Scripts/Prop/Tycoon/Bar.cs
View File

@ -14,12 +14,12 @@ namespace BlueWater.Tycoons
public void ActiveIsPouring()
{
_liquidController.ActiveIsPouring();
//_liquidController.ActiveIsPouring();
}
public void InActiveIsPouring()
{
_liquidController.InActiveIsPouring();
//_liquidController.InActiveIsPouring();
}
}
}

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

@ -1,39 +1,60 @@
using System;
using BlueWater.Items;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Tycoons
{
public class Barrel : InteractionFurniture
{
[SerializeField, Required]
private SpriteRenderer _liquidImage;
[SerializeField, Required]
private SpriteRenderer _fill;
[SerializeField, Range(1f, 5f), Tooltip("목표 색상 * 밝기")]
private float _colorIntensity = 2f;
[SerializeField]
private string _idx;
[SerializeField]
private LiquidData _liquidData;
[SerializeField]
private int _currentAmount;
[field: SerializeField]
public int CurrentAmount { get; private set; }
private LiquidController _liquidController;
private Material _instanceMaterial;
public event Action<int> OnAmountChanged;
// Hashes
private static readonly int LiquidAmountHash = Shader.PropertyToID("_LiquidAmount");
private static readonly int LiquidColorHash = Shader.PropertyToID("_LiquidColor");
protected override void Awake()
{
base.Awake();
_liquidController = FindAnyObjectByType<LiquidController>();
_instanceMaterial = Instantiate(_fill.material);
_fill.material = _instanceMaterial;
}
private void Start()
{
_liquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(_idx);
_currentAmount = _liquidData.GetMaxAmount();
_liquidImage.sprite = _liquidData.Sprite;
_instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity);
SetCurrentAmount(_liquidData.GetMaxAmount());
}
public override void Interaction()
{
_liquidController.SetBarrel(this);
_liquidController.ActiveIsPouring();
_liquidController.ActiveIsPouring(this);
}
public override void CancelInteraction()
@ -46,22 +67,23 @@ namespace BlueWater.Tycoons
/// </summary>
public override bool CanInteraction()
{
return !CurrentTycoonPlayer.IsCarriedItem();
return !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem();
}
public bool CanConsume(int amount)
{
return _currentAmount - amount > 0;
return CurrentAmount - amount > 0;
}
public void Consume(int amount)
{
if (_currentAmount == int.MaxValue)
if (CurrentAmount == int.MaxValue)
{
return;
}
_currentAmount -= amount;
var consumeAmount = CurrentAmount - amount;
SetCurrentAmount(consumeAmount);
}
public bool TryConsume(int amount)
@ -73,5 +95,22 @@ namespace BlueWater.Tycoons
}
public LiquidData GetLiquidData() => _liquidData;
public void SetCurrentAmount(int amount, bool isFromAction = false)
{
if (CurrentAmount == amount || CurrentAmount == int.MaxValue)
{
return;
}
CurrentAmount = amount;
var liquidAmount = CurrentAmount / 4000f;
_instanceMaterial.SetFloat(LiquidAmountHash, liquidAmount);
if (!isFromAction)
{
OnAmountChanged?.Invoke(CurrentAmount);
}
}
}
}

6
Assets/02.Scripts/Prop/Tycoon/Cookware.cs
View File

@ -46,7 +46,7 @@ namespace BlueWater.Tycoons
protected override void OnEnable()
{
TycoonManager.Instance.OnTycoonOpenedEvent += OpenTycoonSwitch;
EventManager.OnTycoonOpenedEvent += OpenTycoonSwitch;
base.OnEnable();
}
@ -116,7 +116,7 @@ namespace BlueWater.Tycoons
public override void Interaction()
{
if (CurrentTycoonPlayer.IsCarriedItem())
if (CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem())
{
var carriedItemData = CurrentTycoonPlayer.GetCurrentItemData();
if (carriedItemData.Idx == FireWoodIdx)
@ -134,7 +134,7 @@ namespace BlueWater.Tycoons
public override bool CanInteraction()
{
var isCarriedItem = CurrentTycoonPlayer.IsCarriedItem();
var isCarriedItem = CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem();
var isFullFireWood = _currentFireWoodCount >= CookwareDataSo.MaxFireWoodQuantity;
var isEmptyFoodData = CurrentDailyFoodUi is null or { FoodData : null };
var isEmptyFinishedFood = _cookedFoodDatas is null or { Count : <= 0 };

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

@ -54,8 +54,8 @@ namespace BlueWater.Tycoons
protected virtual void OnEnable()
{
TycoonManager.Instance.OnTycoonOpenedEvent += OpenTycoonSwitch;
TycoonManager.Instance.OnTycoonClosedEvent += ClosedTycoonSwitch;
EventManager.OnTycoonOpenedEvent += OpenTycoonSwitch;
EventManager.OnTycoonClosedEvent += ClosedTycoonSwitch;
RegisterPlayerInteraction();
}
@ -64,8 +64,8 @@ namespace BlueWater.Tycoons
{
if (IsQuitting) return;
TycoonManager.Instance.OnTycoonOpenedEvent -= OpenTycoonSwitch;
TycoonManager.Instance.OnTycoonClosedEvent -= ClosedTycoonSwitch;
EventManager.OnTycoonOpenedEvent -= OpenTycoonSwitch;
EventManager.OnTycoonClosedEvent -= ClosedTycoonSwitch;
UnregisterPlayerInteraction();
}

2
Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs
View File

@ -11,7 +11,7 @@ namespace BlueWater.Tycoons
public override void Interaction()
{
TycoonManager.Instance.OnTycoonOpenedEvent?.Invoke();
EventManager.OnTycoonOpenedEvent?.Invoke();
}
public override bool CanInteraction()

73
Assets/02.Scripts/Prop/Tycoon/ServingTable.cs Normal file
View File

@ -0,0 +1,73 @@
using BlueWater.Interfaces;
using BlueWater.Uis;
using UnityEngine;
namespace BlueWater.Tycoons
{
public class ServingTable : InteractionFurniture
{
[SerializeField]
private SpriteRenderer _cocktailGlassImage;
[SerializeField]
private BalloonUi _balloonUi;
private IPickup _currentPickupItem;
private Material _originalCocktailGlassMaterial;
protected override void Awake()
{
base.Awake();
_originalCocktailGlassMaterial = _cocktailGlassImage.material;
}
public override void Interaction()
{
// 테이블의 칵테일을 가져가는 경우
if (_currentPickupItem != null)
{
EventManager.OnTakeFromServingTable?.Invoke();
CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(_currentPickupItem);
CurrentTycoonPlayer.BalloonUi.SetItemImage(_currentPickupItem);
_cocktailGlassImage.enabled = false;
_balloonUi.DiscardItem();
_currentPickupItem = null;
}
// 테이블에 칵테일을 놓는 경우
else
{
EventManager.OnPlaceOnServingTable?.Invoke();
_currentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem();
CurrentTycoonPlayer.TycoonPickupHandler.GiveItem();
CurrentTycoonPlayer.BalloonUi.DiscardItem();
_balloonUi.SetItemImage(_currentPickupItem);
_cocktailGlassImage.enabled = true;
}
}
public override bool CanInteraction()
{
// 1. 테이블에 칵테일이 있고, 플레이어가 칵테일을 들고 있지 않은 경우
// 2. 테이블에 칵테일이 없고, 플레이어가 칵테일을 들고 있는 경우 (정상적인 칵테일만)
return (_currentPickupItem != null && !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpCocktail())||
(_currentPickupItem == null && CurrentTycoonPlayer.TycoonPickupHandler.IsServablePickupItem());
}
public override void ShowInteractionUi()
{
if (!InteractionCanvas) return;
VisualLook.material = OutlineMaterial;
_cocktailGlassImage.material = OutlineMaterial;
}
public override void HideInteractionUi()
{
if (!InteractionCanvas) return;
VisualLook.material = OriginalMaterial;
_cocktailGlassImage.material = _originalCocktailGlassMaterial;
}
}
}

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

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 2260638226a46a7449ce75e44fbc33f0

2
Assets/02.Scripts/Prop/Tycoon/TrashCan.cs
View File

@ -10,7 +10,7 @@ namespace BlueWater.Tycoons
public override bool CanInteraction()
{
return CurrentTycoonPlayer.IsCarriedItem();
return CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpCocktail();
}
}
}

14
Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset
View File

@ -18,47 +18,47 @@ MonoBehaviour:
<Idx>k__BackingField: LiquidA
<Name>k__BackingField: "\uC220 \uC6D0\uC561A"
<Amount>k__BackingField: 99999
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3}
<Color>k__BackingField: {r: 1, g: 0, b: 0, a: 1}
- <Key>k__BackingField: LiquidB
<Value>k__BackingField:
<Idx>k__BackingField: LiquidB
<Name>k__BackingField: "\uC220 \uC6D0\uC561B"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3}
<Color>k__BackingField: {r: 1, g: 0.5019608, b: 0, a: 1}
- <Key>k__BackingField: LiquidC
<Value>k__BackingField:
<Idx>k__BackingField: LiquidC
<Name>k__BackingField: "\uC220 \uC6D0\uC561C"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3}
<Color>k__BackingField: {r: 1, g: 1, b: 0, a: 1}
- <Key>k__BackingField: LiquidD
<Value>k__BackingField:
<Idx>k__BackingField: LiquidD
<Name>k__BackingField: "\uC220 \uC6D0\uC561D"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3}
<Color>k__BackingField: {r: 0, g: 1, b: 0, a: 1}
- <Key>k__BackingField: LiquidE
<Value>k__BackingField:
<Idx>k__BackingField: LiquidE
<Name>k__BackingField: "\uC220 \uC6D0\uC561E"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3}
<Color>k__BackingField: {r: 0, g: 0, b: 1, a: 1}
- <Key>k__BackingField: Garnish1
<Value>k__BackingField:
<Idx>k__BackingField: Garnish1
<Name>k__BackingField: "\uAC00\uB098\uC26C1"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}
- <Key>k__BackingField: Garnish2
<Value>k__BackingField:
<Idx>k__BackingField: Garnish2
<Name>k__BackingField: "\uAC00\uB098\uC26C2"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}

3
Assets/02.Scripts/SpriteDataSo.cs
View File

@ -7,5 +7,8 @@ namespace BlueWater
{
[field: SerializeField]
public Sprite Gold { get; private set; }
[field: SerializeField]
public Sprite UnfinishedCocktail { get; private set; }
}
}

28
Assets/02.Scripts/Tycoon/TycoonIngredientController.cs Normal file
View File

@ -0,0 +1,28 @@
using UnityEngine;
namespace BlueWater.Tycoons
{
public class TycoonIngredientController: MonoBehaviour
{
[field: SerializeField]
public Barrel LiquidBarrelA { get; private set; }
[field: SerializeField]
public Barrel LiquidBarrelB { get; private set; }
[field: SerializeField]
public Barrel LiquidBarrelC { get; private set; }
[field: SerializeField]
public Barrel LiquidBarrelD { get; private set; }
[field: SerializeField]
public Barrel LiquidBarrelE { get; private set; }
[field: SerializeField]
public Barrel GarnishBarrel1 { get; private set; }
[field: SerializeField]
public Barrel GarnishBarrel2 { get; private set; }
}
}

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

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 72638ccfaf7778d42808e233d2eb6e8c

21
Assets/02.Scripts/Tycoon/TycoonManager.cs
View File

@ -1,11 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BlueWater.Audios;
using UnityEngine;
using Sirenix.OdinInspector;
namespace BlueWater.Tycoons
{
public class TycoonManager : Singleton<TycoonManager>
@ -16,21 +12,24 @@ namespace BlueWater.Tycoons
[field: SerializeField]
public TycoonStageController TycoonStageController { get; private set; }
[field: SerializeField]
public TycoonIngredientController TycoonIngredientController { get; private set; }
[SerializeField]
private string _dailyBgm;
[field: Title("타이쿤 플레이어 스탯")]
[field: SerializeField]
public TycoonStatus TycoonStatus { get; private set; }
[field: Title("So 데이터")]
[field: SerializeField, Required]
public LevelDataSo LevelDataSo { get; private set; }
[field: SerializeField, Required]
public CardDataSo CardDataSo { get; private set; }
public Action OnTycoonOpenedEvent;
public Action OnTycoonClosedEvent;
protected override void OnAwake()
{
InitializeComponents();
@ -42,6 +41,8 @@ namespace BlueWater.Tycoons
{
AudioManager.Instance.PlayBgm(_dailyBgm);
}
TycoonStatus.Initialize();
}
[Button("컴포넌트 초기화")]
@ -49,7 +50,7 @@ namespace BlueWater.Tycoons
{
CustomerTableController = GetComponent<CustomerTableController>();
TycoonStageController = GetComponent<TycoonStageController>();
TycoonIngredientController = GetComponent<TycoonIngredientController>();
}
}
}

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

@ -32,12 +32,12 @@ namespace BlueWater.Tycoons
var maxCount = _stageDataSo.MaxCustomersByRating.Length;
_dailyCustomerVisitInfos = new List<CustomerVisitInfo>(maxCount - 1);
_tycoonManager.OnTycoonOpenedEvent += StartStage;
EventManager.OnTycoonOpenedEvent += StartStage;
}
private void OnDestroy()
{
_tycoonManager.OnTycoonOpenedEvent -= StartStage;
EventManager.OnTycoonOpenedEvent -= StartStage;
}
private void StartStage()
@ -75,7 +75,7 @@ namespace BlueWater.Tycoons
yield return null;
}
_tycoonManager.OnTycoonClosedEvent?.Invoke();
EventManager.OnTycoonClosedEvent?.Invoke();
_startStageCoroutineInstance = null;
}

225
Assets/02.Scripts/Tycoon/TycoonStatus.cs Normal file
View File

@ -0,0 +1,225 @@
using System;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Tycoons
{
[Serializable]
public class TycoonStatus
{
[SerializeField]
private int _maxPlayerHealth;
public int MaxPlayerHealth
{
get
{
_maxPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.MaxHealthPoint;
return _maxPlayerHealth;
}
set
{
_maxPlayerHealth = value;
GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.SetMaxHealthPoint(value);
}
}
[SerializeField]
private int _currentPlayerHealth;
public int CurrentPlayerHealth
{
get
{
_currentPlayerHealth = GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.CurrentHealthPoint;
return _currentPlayerHealth;
}
set
{
_currentPlayerHealth = value;
GameManager.Instance.CurrentTycoonPlayer.PlayerHealthPoint.SetCurrentHealthPoint(value);
}
}
[SerializeField]
private float _playerMoveSpeedMultiplier;
public float PlayerMoveSpeedMultiplier
{
get
{
_playerMoveSpeedMultiplier = GameManager.Instance.CurrentTycoonPlayer.TycoonMovement.MoveSpeedMultiplier;
return _playerMoveSpeedMultiplier;
}
set
{
_playerMoveSpeedMultiplier = value;
GameManager.Instance.CurrentTycoonPlayer.TycoonMovement.SetMoveSpeedMultiplier(value);
}
}
// 보류
[SerializeField]
private int _currentExp;
public int CurrentExp
{
get
{
return _currentExp;
}
set
{
_currentExp = value;
}
}
// 보류
[SerializeField]
private int _currentGold;
[Title("원액")]
[SerializeField]
private int _currentLiquidAmountA;
public int CurrentLiquidAmountA
{
get
{
_currentLiquidAmountA = TycoonManager.Instance.TycoonIngredientController.LiquidBarrelA.CurrentAmount;
return _currentLiquidAmountA;
}
set
{
_currentLiquidAmountA = value;
TycoonManager.Instance.TycoonIngredientController.LiquidBarrelA.SetCurrentAmount(value, true);
}
}
[SerializeField]
private int _currentLiquidAmountB;
public int CurrentLiquidAmountB
{
get
{
_currentLiquidAmountB = TycoonManager.Instance.TycoonIngredientController.LiquidBarrelB.CurrentAmount;
return _currentLiquidAmountB;
}
set
{
_currentLiquidAmountB = value;
TycoonManager.Instance.TycoonIngredientController.LiquidBarrelB.SetCurrentAmount(value, true);
}
}
[SerializeField]
private int _currentLiquidAmountC;
public int CurrentLiquidAmountC
{
get
{
_currentLiquidAmountC = TycoonManager.Instance.TycoonIngredientController.LiquidBarrelC.CurrentAmount;
return _currentLiquidAmountC;
}
set
{
_currentLiquidAmountC = value;
TycoonManager.Instance.TycoonIngredientController.LiquidBarrelC.SetCurrentAmount(value, true);
}
}
[SerializeField]
private int _currentLiquidAmountD;
public int CurrentLiquidAmountD
{
get
{
_currentLiquidAmountD = TycoonManager.Instance.TycoonIngredientController.LiquidBarrelD.CurrentAmount;
return _currentLiquidAmountD;
}
set
{
_currentLiquidAmountD = value;
TycoonManager.Instance.TycoonIngredientController.LiquidBarrelD.SetCurrentAmount(value, true);
}
}
[SerializeField]
private int _currentLiquidAmountE;
public int CurrentLiquidAmountE
{
get
{
_currentLiquidAmountE = TycoonManager.Instance.TycoonIngredientController.LiquidBarrelE.CurrentAmount;
return _currentLiquidAmountE;
}
set
{
_currentLiquidAmountE = value;
TycoonManager.Instance.TycoonIngredientController.LiquidBarrelE.SetCurrentAmount(value, true);
}
}
[Title("가니쉬")]
[SerializeField]
private int _currentGarnishAmount1;
public int CurrentGarnishAmount1
{
get
{
_currentGarnishAmount1 = TycoonManager.Instance.TycoonIngredientController.GarnishBarrel1.CurrentAmount;
return _currentGarnishAmount1;
}
set
{
_currentGarnishAmount1 = value;
TycoonManager.Instance.TycoonIngredientController.GarnishBarrel1.SetCurrentAmount(value, true);
}
}
[SerializeField]
private int _currentGarnishAmount2;
public int CurrentGarnishAmount2
{
get
{
_currentGarnishAmount2 = TycoonManager.Instance.TycoonIngredientController.GarnishBarrel2.CurrentAmount;
return _currentGarnishAmount2;
}
set
{
_currentGarnishAmount2 = value;
TycoonManager.Instance.TycoonIngredientController.GarnishBarrel2.SetCurrentAmount(value, true);
}
}
public void Initialize()
{
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;
ingredientController.LiquidBarrelC.OnAmountChanged += UpdateLiquidC;
ingredientController.LiquidBarrelD.OnAmountChanged += UpdateLiquidD;
ingredientController.LiquidBarrelE.OnAmountChanged += UpdateLiquidE;
}
private void OnDestroy()
{
var ingredientController = TycoonManager.Instance.TycoonIngredientController;
if (ingredientController != null)
{
ingredientController.LiquidBarrelA.OnAmountChanged -= UpdateLiquidA;
ingredientController.LiquidBarrelB.OnAmountChanged -= UpdateLiquidB;
ingredientController.LiquidBarrelC.OnAmountChanged -= UpdateLiquidC;
ingredientController.LiquidBarrelD.OnAmountChanged -= UpdateLiquidD;
ingredientController.LiquidBarrelE.OnAmountChanged -= UpdateLiquidE;
}
}
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;
}
}

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

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 6bf507622ae51214eb39bd387c8f6dbe

19
Assets/02.Scripts/Ui/Combat/PlayerHealthPointUi.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
@ -35,6 +36,18 @@ namespace BlueWater.Uis
InitializeHealthPoint();
}
private void Start()
{
EventManager.OnMaxHealthChanged += SetMaxHealthPoint;
EventManager.OnHealthChanged += SetCurrentHealthPoint;
}
private void OnDestroy()
{
EventManager.OnMaxHealthChanged -= SetMaxHealthPoint;
EventManager.OnHealthChanged -= SetCurrentHealthPoint;
}
[Button("컴포넌트 초기화")]
private void InitializeComponents()
{
@ -57,6 +70,12 @@ namespace BlueWater.Uis
}
}
public void SetMaxHealthPoint(int changedMaxHealthPoint)
{
_maxHeartCount = changedMaxHealthPoint;
InitializeHealthPoint();
}
public void SetCurrentHealthPoint(int changedHealthPoint)
{
var fullHearts = changedHealthPoint / 2;

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

@ -33,22 +33,15 @@ namespace BlueWater.Uis
private Tween _tween;
private TableSeat _tableSeat;
private ItemData _orderItemData;
private bool _isUnfinishedCocktailPickedUp;
private void Awake()
{
InitializeComponents();
}
private void Start()
{
EventManager.OnCocktailCompleted += SetItemImage;
EventManager.OnCocktailDiscarded += DiscardItem;
}
private void OnDestroy()
{
EventManager.OnCocktailCompleted -= SetItemImage;
EventManager.OnCocktailDiscarded -= DiscardItem;
_tween.Kill();
}
@ -69,6 +62,29 @@ namespace BlueWater.Uis
public void ShowUi() => _panel.SetActive(true);
public void HideUi() => _panel.SetActive(false);
public void PickupUnfinishedCocktail()
{
_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);
@ -83,9 +99,15 @@ namespace BlueWater.Uis
Debug.LogWarning($"{item.Sprite} 해당 음식의 이미지가 없습니다.");
}
_isUnfinishedCocktailPickedUp = false;
SetItemSprite(item.Sprite);
ShowUi();
}
public void SetEmpty()
{
SetItemSprite(null);
}
public void SetItemSprite(Sprite sprite)
{
@ -94,8 +116,9 @@ namespace BlueWater.Uis
public void DiscardItem()
{
_isUnfinishedCocktailPickedUp = false;
HideUi();
SetItemImage(null);
SetEmpty();
}
public void OrderItem(string itemIdx, int waitTime, int hurryTime)

8
Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs
View File

@ -51,8 +51,8 @@ namespace BlueWater.Uis
{
PopupUi.OnPopupUiOpenEvent += RegisterPopup;
PopupUi.OnPopupUiCloseEvent += UnregisterPopup;
TycoonManager.Instance.OnTycoonOpenedEvent += TycoonOpenEvent;
TycoonManager.Instance.OnTycoonClosedEvent += TycoonClosedEvent;
EventManager.OnTycoonOpenedEvent += TycoonOpenEvent;
EventManager.OnTycoonClosedEvent += TycoonClosedEvent;
EventManager.FadeInOut += FadeInOut;
}
@ -62,8 +62,8 @@ namespace BlueWater.Uis
PopupUi.OnPopupUiOpenEvent -= RegisterPopup;
PopupUi.OnPopupUiCloseEvent -= UnregisterPopup;
TycoonManager.Instance.OnTycoonOpenedEvent -= TycoonOpenEvent;
TycoonManager.Instance.OnTycoonClosedEvent -= TycoonClosedEvent;
EventManager.OnTycoonOpenedEvent -= TycoonOpenEvent;
EventManager.OnTycoonClosedEvent -= TycoonClosedEvent;
EventManager.FadeInOut -= FadeInOut;
}

4
Assets/03.Images/LiquidRenderTexture.renderTexture
View File

@ -12,8 +12,8 @@ RenderTexture:
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 6
m_Width: 256
m_Height: 256
m_Width: 512
m_Height: 512
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 94

0
Assets/03.Images/Props/Mini/BarTable03.png → Assets/03.Images/Props/Mini/ServingTable01.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

0
Assets/03.Images/Props/Mini/BarTable03.png.meta → Assets/03.Images/Props/Mini/ServingTable01.png.meta
View File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 168 KiB

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

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 1024
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 394 KiB

143
Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 1506abfb2ff26fa4aacdeb4b0efc9663
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: 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/Garnish200.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.9 KiB

8
Assets/03.Images/Tycoons/Cocktails/Liquids.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 25bfb1c54b1fb5548bdc5e6f22d7256b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 109 KiB

143
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: a8c45767f0a3ec245a47087c7ada2b50
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: 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/Liquids/LiquidB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

143
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 216cb30d7010e95499c22161ccfde634
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: 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/Liquids/LiquidC.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 122 KiB

143
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 404e93e2e77f60b49bbcbf1df18904d3
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: 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/Liquids/LiquidD.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 123 KiB

143
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: a575a803ef0529e43bcbbe8ccdbb34b2
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: 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/Liquids/LiquidE.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 KiB

143
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 2fc24dca6ce6ac94da0187dfce24fa3a
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: 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:

166
Assets/04.Materials/BarrelLiquid.mat Normal file
View File

@ -0,0 +1,166 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1230891944636227791
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BarrelLiquid
m_Shader: {fileID: -6465566751694194690, guid: 97fd64b40784bc24090f74d74b2ebea5, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_4768904af7ef4db18a183030cfecc457_Texture_1_Texture2D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_a242d45af0654b8eadd44eaaf8c380c1_Texture_1_Texture2D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _FillAmount: 0.5
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _LiquidAmount: 1
- _LiquidFrequency: 18
- _LiquidSpeed: 1
- _LiquidTopWidth: 15
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _RefractionNoise: 70
- _RefractionSpeed: 3.56
- _RefractionStrength: 0.7
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Test: 0
- _TopMaskHeight: 0.035
- _Visibility: 0.1
- _WaterFrequency: 10
- _WaterLevel: 1
- _WaterSpeed: 2
- _WaterTopWidth: 10
- _WaveDepth: 1.5
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0, g: 0.68668544, b: 0.9559735, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FillAmount: {r: 0, g: 0, b: 0, a: 0}
- _FormColor: {r: 0.4078431, g: 1.317647, b: 1.4980392, a: 0}
- _LiquidColor: {r: 2, g: 1.6862745, b: 0, a: 0}
- _LiquidTopColor: {r: 1, g: 1, b: 1, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _WaterColor: {r: 0, g: 1.5319147, b: 2, a: 0}
- _WaterTopColor: {r: 1, g: 1, b: 1, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
Assets/04.Materials/BarrelLiquid.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d48d5f3b84c4ea2489ae5fbbd92f781b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

145
Assets/04.Materials/BarrelOutlineUnlit.mat Normal file
View File

@ -0,0 +1,145 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BarrelOutlineUnlit
m_Shader: {fileID: -6465566751694194690, guid: 35052d46233d61b4fa6a8f340ff50c8b, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MinusTexture:
m_Texture: {fileID: 2800000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _FadeDistance: 150
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _ISCORNER: 0
- _IsCorner: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Thickness: 0.01
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 12.708291, g: 12.708291, b: 12.708291, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &6323663459513743005
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

8
Assets/04.Materials/BarrelOutlineUnlit.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9bce0db68fc4c4d428fa601508de489d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

2
Assets/04.Materials/Liquid3.mat
View File

@ -129,7 +129,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueControl: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _RefractionNoise: 70

151
Assets/04.Materials/SpriteDefault.mat Normal file
View File

@ -0,0 +1,151 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SpriteDefault
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- PixelSnap: 0
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BlendOp: 0
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnableExternalAlpha: 0
- _EnvironmentReflections: 1
- _FadeDistance: 150
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _ISCORNER: 0
- _IsCorner: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SampleGI: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Thickness: 0.01
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &6323663459513743005
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

8
Assets/04.Materials/SpriteDefault.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 84372e94975e22b41a9f570fc18f1daf
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

54
Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab
View File

@ -231,8 +231,8 @@ GameObject:
- component: {fileID: 2935942385829016914}
- component: {fileID: 6054159730444663926}
- component: {fileID: 1063431021331126030}
- component: {fileID: 3359549505901716120}
- component: {fileID: 6662554121718997272}
- component: {fileID: 3359549505901716120}
- component: {fileID: 1674052485383758547}
- component: {fileID: 4836489897218844789}
- component: {fileID: 909302231676134912}
@ -549,27 +549,11 @@ MonoBehaviour:
<PlayerInput>k__BackingField: {fileID: 6054159730444663926}
<VisualLook>k__BackingField: {fileID: 6509241874729291456}
<SkeletonAnimation>k__BackingField: {fileID: 7125556968546628472}
<BalloonUi>k__BackingField: {fileID: 0}
<BalloonUi>k__BackingField: {fileID: 2412195434237916265}
<PlayerHealthPoint>k__BackingField: {fileID: 3359549505901716120}
<TycoonInput>k__BackingField: {fileID: 1674052485383758547}
<TycoonMovement>k__BackingField: {fileID: 4836489897218844789}
<TycoonCarryHandler>k__BackingField: {fileID: 909302231676134912}
--- !u!114 &3359549505901716120
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2768568390039878737}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6ff2dc3fa7a6be445bf8e71043f86d2e, type: 3}
m_Name:
m_EditorClassIdentifier:
_spriteRenderer: {fileID: 5527707380059080408}
<MaxHealthPoint>k__BackingField: 10
<CurrentHealthPoint>k__BackingField: 4
<InvincibilityDuration>k__BackingField: 0
<IsInvincible>k__BackingField: 0
<TycoonPickupHandler>k__BackingField: {fileID: 909302231676134912}
--- !u!114 &6662554121718997272
MonoBehaviour:
m_ObjectHideFlags: 0
@ -588,6 +572,23 @@ MonoBehaviour:
_initialSkinName: 01-1
_isRandomSkin: 0
_randomRange: {x: 0, y: 0}
--- !u!114 &3359549505901716120
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2768568390039878737}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6ff2dc3fa7a6be445bf8e71043f86d2e, type: 3}
m_Name:
m_EditorClassIdentifier:
_spriteRenderer: {fileID: 5527707380059080408}
<MaxHealthPoint>k__BackingField: 4
<CurrentHealthPoint>k__BackingField: 4
<InvincibilityDuration>k__BackingField: 0
<IsInvincible>k__BackingField: 0
--- !u!114 &1674052485383758547
MonoBehaviour:
m_ObjectHideFlags: 0
@ -628,7 +629,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_itemRenderer: {fileID: 5527707380059080408}
_isCarriedItem: 0
_isPickedUpItem: 0
--- !u!1 &5191424939574625822
GameObject:
m_ObjectHideFlags: 0
@ -848,6 +849,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
--- !u!114 &2412195434237916265 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
m_PrefabInstance: {fileID: 448763968479860601}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &2494354617667434336 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}

4
Assets/05.Prefabs/LiquidObject.prefab
View File

@ -30,7 +30,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 296.1, y: 16.4, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
@ -125,7 +125,7 @@ CircleCollider2D:
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0}
m_Radius: 0.2
m_Radius: 0.1
--- !u!50 &3470010340248184897
Rigidbody2D:
serializedVersion: 5

796
Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab
View File

File diff suppressed because it is too large Load Diff

193
Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab
View File

@ -1,193 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7208898558036350106
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7358052634285927493}
m_Layer: 8
m_Name: Center
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7358052634285927493
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7208898558036350106}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 809828747251277026}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &7343451337687172630
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 0.18181819
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 0.18181819
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 0.18181819
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_AnchoredPosition.y
value: 80
objectReference: {fileID: 0}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2cf8faf4514a14547b8f056727e0a0f2, type: 3}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Name
value: Liquid
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2cf8faf4514a14547b8f056727e0a0f2, type: 3}
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 7358052634285927493}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 1535180298174803447}
m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- !u!4 &809828747251277026 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5897095096647521783 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1535180298174803447
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5897095096647521783}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3}
m_Name:
m_EditorClassIdentifier:
<CenterTransform>k__BackingField: {fileID: 7358052634285927493}
<VisualLook>k__BackingField: {fileID: 6077686033771388879}
<InteractionCanvas>k__BackingField: {fileID: 8975593228546502023}
<InteractionUi>k__BackingField: {fileID: 8793236136028073839}
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.5
IsOpened: 0
--- !u!212 &6077686033771388879 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8793236136028073839 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!223 &8975593228546502023 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}

192
Assets/05.Prefabs/Props/Furniture/Interactions/Barrel.prefab → Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab
View File

@ -1,5 +1,179 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6581422458203868687
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5506324081944544526}
- component: {fileID: 6817574259189873408}
m_Layer: 8
m_Name: LiquidImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5506324081944544526
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6581422458203868687}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.408, z: -0.001}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 203741387490724426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6817574259189873408
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6581422458203868687}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &8294670532554988959
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3246572212746126634}
- component: {fileID: 7052380446467937511}
m_Layer: 8
m_Name: Fill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3246572212746126634
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8294670532554988959}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.02, z: 0.017}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 203741387490724426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7052380446467937511
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8294670532554988959}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: d5d9120849e43474aaafba12ab84fc47, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &7343451337687172630
PrefabInstance:
m_ObjectHideFlags: 0
@ -114,12 +288,23 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 5506324081944544526}
- targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 3246572212746126634}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 223172209862223209}
m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- !u!4 &203741387490724426 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5897095096647521783 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
@ -141,10 +326,13 @@ MonoBehaviour:
<VisualLook>k__BackingField: {fileID: 6077686033771388879}
<InteractionCanvas>k__BackingField: {fileID: 8975593228546502023}
<InteractionUi>k__BackingField: {fileID: 8793236136028073839}
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9bce0db68fc4c4d428fa601508de489d, type: 2}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.8
IsOpened: 0
_liquidImage: {fileID: 6817574259189873408}
_fill: {fileID: 7052380446467937511}
_colorIntensity: 2
_idx:
_liquidData:
<Idx>k__BackingField:

0
Assets/05.Prefabs/Props/Furniture/Interactions/Barrel.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab.meta
View File

417
Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab Normal file
View File

@ -0,0 +1,417 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6373979881487551315
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8080204312657253144}
- component: {fileID: 535721072425912087}
m_Layer: 8
m_Name: CocktailGlassImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8080204312657253144
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6373979881487551315}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.679, z: -0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 203741387490724426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &535721072425912087
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6373979881487551315}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 6
m_Sprite: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &5250851799384046169
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 8469578238684922817}
m_Modifications:
- target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Name
value: BalloonUi
objectReference: {fileID: 0}
- target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.x
value: 70
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.y
value: 70
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalPosition.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchoredPosition.x
value: -14.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchoredPosition.y
value: 139.4
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.x
value: -40
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.y
value: -42
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchoredPosition.y
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
--- !u!224 &7816326837915687488 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
m_PrefabInstance: {fileID: 5250851799384046169}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8042662987685484873 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
m_PrefabInstance: {fileID: 5250851799384046169}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &7343451337687172630
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_AnchoredPosition.y
value: 80
objectReference: {fileID: 0}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Name
value: ServingTable
objectReference: {fileID: 0}
- target: {fileID: 7624213675240184438, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3}
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 8080204312657253144}
- targetCorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 7816326837915687488}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 5584299599595477975}
m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- !u!4 &203741387490724426 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5897095096647521783 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5584299599595477975
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5897095096647521783}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2260638226a46a7449ce75e44fbc33f0, type: 3}
m_Name:
m_EditorClassIdentifier:
<CenterTransform>k__BackingField: {fileID: 5927803667513949971}
<VisualLook>k__BackingField: {fileID: 6077686033771388879}
<InteractionCanvas>k__BackingField: {fileID: 8975593228546502023}
<InteractionUi>k__BackingField: {fileID: 8793236136028073839}
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.7
IsOpened: 0
_cocktailGlassImage: {fileID: 535721072425912087}
_balloonUi: {fileID: 8042662987685484873}
--- !u!4 &5927803667513949971 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!212 &6077686033771388879 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8469578238684922817 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8793236136028073839 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!223 &8975593228546502023 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}

2
Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta → Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7cb398d57f4c7ff468b50dbf1d226ca5
guid: a46735af9ffe7684fb0f19bc9b351e30
PrefabImporter:
externalObjects: {}
userData:

2
Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab
View File

@ -135,7 +135,7 @@ MonoBehaviour:
<InteractionUi>k__BackingField: {fileID: 8793236136028073839}
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.6
<InteractionRadius>k__BackingField: 0.7
IsOpened: 0
--- !u!4 &5927803667513949971 stripped
Transform:

5152
Assets/09.Shaders/BarrelOutline.shadergraph Normal file
View File

File diff suppressed because it is too large Load Diff

10
Assets/09.Shaders/BarrelOutline.shadergraph.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 35052d46233d61b4fa6a8f340ff50c8b
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

128
Assets/09.Shaders/Liquid.shadergraph
View File

@ -9,9 +9,6 @@
{
"m_Id": "ca6c0c9e22c5431680a53986dfb3fbc2"
},
{
"m_Id": "4c8c396ecd664d2f9bd994e8e1356d9d"
},
{
"m_Id": "8d544e584fe540b8b4455fd91c059fc5"
},
@ -60,9 +57,6 @@
{
"m_Id": "259d183a142a44b199ec845f1874047d"
},
{
"m_Id": "6308b314c5654e5d95837bd9b7ed2649"
},
{
"m_Id": "fc7bf38a40bb48b1a7e71984ce386c23"
},
@ -235,20 +229,6 @@
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "6308b314c5654e5d95837bd9b7ed2649"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "259d183a142a44b199ec845f1874047d"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@ -571,6 +551,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "f207d005495148b0a7fb864588751ee2"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "259d183a142a44b199ec845f1874047d"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@ -1045,9 +1039,6 @@
{
"m_Id": "ca6c0c9e22c5431680a53986dfb3fbc2"
},
{
"m_Id": "4c8c396ecd664d2f9bd994e8e1356d9d"
},
{
"m_Id": "8d544e584fe540b8b4455fd91c059fc5"
},
@ -1763,36 +1754,6 @@
"m_Channel": 0
}
{
"m_SGVersion": 3,
"m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
"m_ObjectId": "4c8c396ecd664d2f9bd994e8e1356d9d",
"m_Guid": {
"m_GuidSerialized": "cd4711ad-270a-4a2a-abfa-19dcee3fdf04"
},
"m_Name": "Color",
"m_DefaultRefNameVersion": 1,
"m_RefNameGeneratedByDisplayName": "Color",
"m_DefaultReferenceName": "_Color",
"m_OverrideReferenceName": "",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_DismissedVersion": 0,
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
"m_Hidden": false,
"m_Value": {
"r": 0.0,
"g": 0.2823529541492462,
"b": 1.0,
"a": 0.0
},
"isMainColor": false,
"m_ColorMode": 1
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@ -2015,42 +1976,6 @@
"m_Channel": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
"m_ObjectId": "6308b314c5654e5d95837bd9b7ed2649",
"m_Group": {
"m_Id": ""
},
"m_Name": "Property",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -989.9998168945313,
"y": 368.0000305175781,
"width": 104.9998779296875,
"height": 34.0
}
},
"m_Slots": [
{
"m_Id": "a8e84f335fc644298d63454e7c04edf0"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Property": {
"m_Id": "4c8c396ecd664d2f9bd994e8e1356d9d"
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@ -3479,31 +3404,6 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
"m_ObjectId": "a8e84f335fc644298d63454e7c04edf0",
"m_Id": 0,
"m_DisplayName": "Color",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",

28
Assets/09.Shaders/OutlineLit.shadergraph
View File

@ -1730,10 +1730,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -994.9999389648438,
"y": 131.99998474121095,
"width": 207.9998779296875,
"height": 302.00006103515627
"x": -662.9999389648438,
"y": 166.00001525878907,
"width": 207.99993896484376,
"height": 302.0
}
},
"m_Slots": [
@ -1895,10 +1895,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -714.9999389648438,
"y": -19.0,
"width": 208.00006103515626,
"height": 302.0
"x": -383.0,
"y": 14.999998092651368,
"width": 208.00010681152345,
"height": 302.0000305175781
}
},
"m_Slots": [
@ -2168,10 +2168,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -1100.0,
"y": 119.0,
"width": 105.00006103515625,
"height": 34.0
"x": -767.9998779296875,
"y": 153.0,
"width": 104.99993896484375,
"height": 34.000030517578128
}
},
"m_Slots": [
@ -2795,8 +2795,8 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -1203.0,
"y": 517.0,
"x": -1099.0,
"y": 518.0,
"width": 208.00006103515626,
"height": 302.00006103515627
}

2
Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesLitShader.cs
View File

@ -113,7 +113,7 @@ namespace UnityEditor.Rendering.Universal.ShaderGUI
{
m_RenderersUsingThisMaterial.Clear();
ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsOfType(typeof(ParticleSystemRenderer)) as ParticleSystemRenderer[];
ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsByType<ParticleSystemRenderer>(FindObjectsSortMode.None);
foreach (ParticleSystemRenderer renderer in renderers)
{
if (renderer.sharedMaterial == material)

2
Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesSimpleLitShader.cs
View File

@ -114,7 +114,7 @@ namespace UnityEditor.Rendering.Universal.ShaderGUI
{
m_RenderersUsingThisMaterial.Clear();
ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsOfType(typeof(ParticleSystemRenderer)) as ParticleSystemRenderer[];
ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsByType<ParticleSystemRenderer>(FindObjectsSortMode.None);
foreach (ParticleSystemRenderer renderer in renderers)
{
if (renderer.sharedMaterial == material)

2
Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesUnlitShader.cs
View File

@ -112,7 +112,7 @@ namespace UnityEditor.Rendering.Universal.ShaderGUI
{
m_RenderersUsingThisMaterial.Clear();
ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsOfType(typeof(ParticleSystemRenderer)) as ParticleSystemRenderer[];
ParticleSystemRenderer[] renderers = UnityEngine.Object.FindObjectsByType<ParticleSystemRenderer>(FindObjectsSortMode.None);
foreach (ParticleSystemRenderer renderer in renderers)
{
if (renderer.sharedMaterial == material)

11
Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetIsKinematic.cs
View File

@ -30,8 +30,17 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D
Debug.LogWarning("Rigidbody2D is null");
return TaskStatus.Failure;
}
if (storeValue.Value)
{
rigidbody2D.bodyType = RigidbodyType2D.Kinematic;
}
else
{
rigidbody2D.bodyType = RigidbodyType2D.Dynamic;
}
storeValue.Value = rigidbody2D.isKinematic;
//storeValue.Value = rigidbody2D.isKinematic;
return TaskStatus.Success;
}

2
Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/IsKinematic.cs
View File

@ -28,7 +28,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D
return TaskStatus.Failure;
}
return rigidbody2D.isKinematic ? TaskStatus.Success : TaskStatus.Failure;
return rigidbody2D.bodyType == RigidbodyType2D.Kinematic ? TaskStatus.Success : TaskStatus.Failure;
}
public override void OnReset()

11
Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetIsKinematic.cs
View File

@ -30,7 +30,16 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D
return TaskStatus.Failure;
}
rigidbody2D.isKinematic = isKinematic.Value;
if (isKinematic.Value)
{
rigidbody2D.bodyType = RigidbodyType2D.Kinematic;
}
else
{
rigidbody2D.bodyType = RigidbodyType2D.Dynamic;
}
//rigidbody2D.isKinematic = isKinematic.Value;
return TaskStatus.Success;
}

3
Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs
View File

@ -231,7 +231,8 @@ public class PlanarReflectionsRenderer : MonoBehaviour
QualitySettings.lodBias = lodBiasBeforeReflections * 0.5f;
//render
UniversalRenderPipeline.RenderSingleCamera(context, reflectionCamera);
RenderPipeline.SubmitRenderRequest(reflectionCamera, context);
//UniversalRenderPipeline.RenderSingleCamera(context, reflectionCamera);
//restore quality settings
GL.invertCulling = false;

2
ProjectSettings/TagManager.asset
View File

@ -27,7 +27,7 @@ TagManager:
- ClickGround
- DamageableProps
- Liquid
- Test
-
-
-
-