diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index d20cb9bb5..1f7241ac1 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -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 - k__BackingField: 3 - CurrentHeart: 0 - Invincibility: 0 - k__BackingField: 1 - k__BackingField: 1000 - k__BackingField: 1000 - k__BackingField: 1000 - k__BackingField: 1000 - k__BackingField: 1000 - k__BackingField: 1000 - k__BackingField: 1000 k__BackingField: {fileID: 1665075870} k__BackingField: {fileID: 1665075872} + k__BackingField: {fileID: 0} _dailyBgm: TycoonDailyBgm1 + 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 k__BackingField: {fileID: 11400000, guid: 702b1ed0ce71d1b4aa1ddbce67e475a1, type: 2} 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: + k__BackingField: {fileID: 455003948} + k__BackingField: {fileID: 1605879905} + k__BackingField: {fileID: 405502709} + k__BackingField: {fileID: 1950956315} + k__BackingField: {fileID: 620853359} + k__BackingField: {fileID: 0} + 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} diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs b/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs index f198c91a1..199b56c8a 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs @@ -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) diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs index 4793324ac..4ef230b38 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs @@ -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() diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatStatus.cs b/Assets/02.Scripts/Character/Player/Combat/CombatStatus.cs index fe4913c87..a37600a4a 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatStatus.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatStatus.cs @@ -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); } diff --git a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs index 5299f6fb2..58b5d9305 100644 --- a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs +++ b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs @@ -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 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(); - 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; } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index 32a88b4b4..0ef640e02 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -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; diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs index 3f056aa89..a3ec321ee 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs @@ -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(); } + 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"; + + /// + /// 완성된 아이템이 있는 경우 + /// public bool IsPickedUpItem() => _isPickedUpItem; + + /// + /// 제조중인 칵테일이 있거나, 아이템이 있는 경우 + /// + public bool IsPickedUpCocktail() => _isPickedUpItem || _isUnfinishedCocktailPickedUp; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 3609af58d..dc586daa0 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -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(); BalloonUi = transform.Find("Canvas/BalloonUi").GetComponent(); + PlayerHealthPoint = GetComponent(); TycoonInput = GetComponent(); TycoonMovement = GetComponent(); TycoonPickupHandler = GetComponent(); @@ -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) // { diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 598179f51..49131d498 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -10,6 +10,9 @@ namespace BlueWater #region Global events public static Action FadeInOut; + public static Action OnMaxHealthChanged; + public static Action OnHealthChanged; + public static Action OnDead; #endregion @@ -19,13 +22,19 @@ namespace BlueWater // 음료 // public static Action OnDrinkRecipeAcquired; // public static Action OnDrinkRecipeSelected; + + public static Action OnTycoonOpenedEvent; + public static Action OnTycoonClosedEvent; public static Action OnLiquidRegionEntered; public static Action OnLiquidRegionExited; + public static Action OnCocktailStarted; public static Action OnCocktailCompleted; public static Action OnCocktailDiscarded; + public static Action OnPlaceOnServingTable; + public static Action OnTakeFromServingTable; // 요리 //public static Action OnFoodRecipeAcquired; diff --git a/Assets/02.Scripts/GameTimeManager.cs b/Assets/02.Scripts/GameTimeManager.cs index 785ee73b4..a661258d7 100644 --- a/Assets/02.Scripts/GameTimeManager.cs +++ b/Assets/02.Scripts/GameTimeManager.cs @@ -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() diff --git a/Assets/02.Scripts/Interface/IPhysicMovable.cs b/Assets/02.Scripts/Interface/IPhysicMovable.cs index 2a076207b..7bdbbfbcd 100644 --- a/Assets/02.Scripts/Interface/IPhysicMovable.cs +++ b/Assets/02.Scripts/Interface/IPhysicMovable.cs @@ -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(); diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/LiquidController.cs index f034fe93c..09a67cb13 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/LiquidController.cs @@ -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 - + /// /// 술 제조 과정 초기화 함수 /// @@ -237,32 +236,27 @@ namespace BlueWater { _activeLiquids[i].Destroy(); } - + _liquidDataCounts.Clear(); _instanceLiquidCount = 0; + _instanceMaterial.SetFloat(LiquidAmountHash, 0f); SetCurrentAmount(0f); - _instanceMaterial.SetFloat(_liquidAmountHash, 0f); + HidePanel(); } - /// - /// 현재 상호작용 중인 Barrel 연동 - /// - /// - 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(); diff --git a/Assets/02.Scripts/LiquidInteractionRegion.cs b/Assets/02.Scripts/LiquidInteractionRegion.cs index e03999e4e..7378568f0 100644 --- a/Assets/02.Scripts/LiquidInteractionRegion.cs +++ b/Assets/02.Scripts/LiquidInteractionRegion.cs @@ -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(); } } diff --git a/Assets/02.Scripts/Prop/Tycoon/Bar.cs b/Assets/02.Scripts/Prop/Tycoon/Bar.cs index eddacc049..0e89b40a0 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Bar.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Bar.cs @@ -14,12 +14,12 @@ namespace BlueWater.Tycoons public void ActiveIsPouring() { - _liquidController.ActiveIsPouring(); + //_liquidController.ActiveIsPouring(); } public void InActiveIsPouring() { - _liquidController.InActiveIsPouring(); + //_liquidController.InActiveIsPouring(); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index e901cc279..bfe9b22c8 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -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 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(); + _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 /// 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); + } + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs index ab74970f8..98df335b6 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs @@ -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 }; diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index d70c62a8d..fab08da57 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -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(); } diff --git a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs index fbef3ad3d..a7d6e7f33 100644 --- a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs +++ b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs @@ -11,7 +11,7 @@ namespace BlueWater.Tycoons public override void Interaction() { - TycoonManager.Instance.OnTycoonOpenedEvent?.Invoke(); + EventManager.OnTycoonOpenedEvent?.Invoke(); } public override bool CanInteraction() diff --git a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs new file mode 100644 index 000000000..1c1e2fef3 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs @@ -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; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs.meta b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs.meta new file mode 100644 index 000000000..c5a452b5b --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2260638226a46a7449ce75e44fbc33f0 diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 5449e8817..12ecfe780 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -10,7 +10,7 @@ namespace BlueWater.Tycoons public override bool CanInteraction() { - return CurrentTycoonPlayer.IsCarriedItem(); + return CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpCocktail(); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset index 5cb35d4fb..6b44684d8 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset @@ -18,47 +18,47 @@ MonoBehaviour: k__BackingField: LiquidA k__BackingField: "\uC220 \uC6D0\uC561A" k__BackingField: 99999 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3} k__BackingField: {r: 1, g: 0, b: 0, a: 1} - k__BackingField: LiquidB k__BackingField: k__BackingField: LiquidB k__BackingField: "\uC220 \uC6D0\uC561B" k__BackingField: 2000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3} k__BackingField: {r: 1, g: 0.5019608, b: 0, a: 1} - k__BackingField: LiquidC k__BackingField: k__BackingField: LiquidC k__BackingField: "\uC220 \uC6D0\uC561C" k__BackingField: 2000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3} k__BackingField: {r: 1, g: 1, b: 0, a: 1} - k__BackingField: LiquidD k__BackingField: k__BackingField: LiquidD k__BackingField: "\uC220 \uC6D0\uC561D" k__BackingField: 2000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3} k__BackingField: {r: 0, g: 1, b: 0, a: 1} - k__BackingField: LiquidE k__BackingField: k__BackingField: LiquidE k__BackingField: "\uC220 \uC6D0\uC561E" k__BackingField: 2000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3} k__BackingField: {r: 0, g: 0, b: 1, a: 1} - k__BackingField: Garnish1 k__BackingField: k__BackingField: Garnish1 k__BackingField: "\uAC00\uB098\uC26C1" k__BackingField: 2000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} k__BackingField: {r: 0, g: 0, b: 0, a: 0} - k__BackingField: Garnish2 k__BackingField: k__BackingField: Garnish2 k__BackingField: "\uAC00\uB098\uC26C2" k__BackingField: 2000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3} k__BackingField: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/02.Scripts/SpriteDataSo.cs b/Assets/02.Scripts/SpriteDataSo.cs index 89128e949..6a3a882e8 100644 --- a/Assets/02.Scripts/SpriteDataSo.cs +++ b/Assets/02.Scripts/SpriteDataSo.cs @@ -7,5 +7,8 @@ namespace BlueWater { [field: SerializeField] public Sprite Gold { get; private set; } + + [field: SerializeField] + public Sprite UnfinishedCocktail { get; private set; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs new file mode 100644 index 000000000..d0729b7a3 --- /dev/null +++ b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs @@ -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; } + } +} diff --git a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs.meta b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs.meta new file mode 100644 index 000000000..90857963f --- /dev/null +++ b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 72638ccfaf7778d42808e233d2eb6e8c \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs index adb2c908c..c03e3d64d 100644 --- a/Assets/02.Scripts/Tycoon/TycoonManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -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 @@ -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(); TycoonStageController = GetComponent(); + TycoonIngredientController = GetComponent(); } - } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 10b157a07..f24f321c3 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -32,12 +32,12 @@ namespace BlueWater.Tycoons var maxCount = _stageDataSo.MaxCustomersByRating.Length; _dailyCustomerVisitInfos = new List(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; } diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs new file mode 100644 index 000000000..95ebe06cc --- /dev/null +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -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; + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs.meta b/Assets/02.Scripts/Tycoon/TycoonStatus.cs.meta new file mode 100644 index 000000000..2299f90a4 --- /dev/null +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6bf507622ae51214eb39bd387c8f6dbe \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Combat/PlayerHealthPointUi.cs b/Assets/02.Scripts/Ui/Combat/PlayerHealthPointUi.cs index d92a23826..130ce63ae 100644 --- a/Assets/02.Scripts/Ui/Combat/PlayerHealthPointUi.cs +++ b/Assets/02.Scripts/Ui/Combat/PlayerHealthPointUi.cs @@ -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; diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index 6a20660ab..0a8df6a66 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -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) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs index 7bfd7d4ca..d10bae567 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs @@ -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; } diff --git a/Assets/03.Images/LiquidRenderTexture.renderTexture b/Assets/03.Images/LiquidRenderTexture.renderTexture index 36b6a7cd1..ae1712b59 100644 --- a/Assets/03.Images/LiquidRenderTexture.renderTexture +++ b/Assets/03.Images/LiquidRenderTexture.renderTexture @@ -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 diff --git a/Assets/03.Images/Props/Mini/BarTable03.png b/Assets/03.Images/Props/Mini/ServingTable01.png similarity index 100% rename from Assets/03.Images/Props/Mini/BarTable03.png rename to Assets/03.Images/Props/Mini/ServingTable01.png diff --git a/Assets/03.Images/Props/Mini/BarTable03.png.meta b/Assets/03.Images/Props/Mini/ServingTable01.png.meta similarity index 100% rename from Assets/03.Images/Props/Mini/BarTable03.png.meta rename to Assets/03.Images/Props/Mini/ServingTable01.png.meta diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png new file mode 100644 index 000000000..9436010b7 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png.meta b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png.meta similarity index 99% rename from Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png.meta rename to Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png.meta index cd8493a5c..ac00ee784 100644 --- a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish1.png.meta @@ -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 diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png new file mode 100644 index 000000000..de6557383 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta new file mode 100644 index 000000000..a29d8896d --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish2.png.meta @@ -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: diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png deleted file mode 100644 index b9c730d45..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids.meta new file mode 100644 index 000000000..e6e3aebd1 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25bfb1c54b1fb5548bdc5e6f22d7256b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png new file mode 100644 index 000000000..55281860c Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta new file mode 100644 index 000000000..6d1e6be0f --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png.meta @@ -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: diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png new file mode 100644 index 000000000..1231da7e0 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta new file mode 100644 index 000000000..da86660cf --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png.meta @@ -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: diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png new file mode 100644 index 000000000..ca18f08dc Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta new file mode 100644 index 000000000..f53870caa --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png.meta @@ -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: diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png new file mode 100644 index 000000000..0d442e922 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta new file mode 100644 index 000000000..ffbe81da8 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png.meta @@ -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: diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png new file mode 100644 index 000000000..43c474372 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta new file mode 100644 index 000000000..7eb75fd1a --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png.meta @@ -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: diff --git a/Assets/04.Materials/BarrelLiquid.mat b/Assets/04.Materials/BarrelLiquid.mat new file mode 100644 index 000000000..eb565d2c4 --- /dev/null +++ b/Assets/04.Materials/BarrelLiquid.mat @@ -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 diff --git a/Assets/04.Materials/BarrelLiquid.mat.meta b/Assets/04.Materials/BarrelLiquid.mat.meta new file mode 100644 index 000000000..cfd4fc53a --- /dev/null +++ b/Assets/04.Materials/BarrelLiquid.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d48d5f3b84c4ea2489ae5fbbd92f781b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/BarrelOutlineUnlit.mat b/Assets/04.Materials/BarrelOutlineUnlit.mat new file mode 100644 index 000000000..3ca67b1f9 --- /dev/null +++ b/Assets/04.Materials/BarrelOutlineUnlit.mat @@ -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 diff --git a/Assets/04.Materials/BarrelOutlineUnlit.mat.meta b/Assets/04.Materials/BarrelOutlineUnlit.mat.meta new file mode 100644 index 000000000..0371a6185 --- /dev/null +++ b/Assets/04.Materials/BarrelOutlineUnlit.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9bce0db68fc4c4d428fa601508de489d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Liquid3.mat b/Assets/04.Materials/Liquid3.mat index ec2b3c451..db4ec6e32 100644 --- a/Assets/04.Materials/Liquid3.mat +++ b/Assets/04.Materials/Liquid3.mat @@ -129,7 +129,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueControl: 0 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RefractionNoise: 70 diff --git a/Assets/04.Materials/SpriteDefault.mat b/Assets/04.Materials/SpriteDefault.mat new file mode 100644 index 000000000..ab2dcee53 --- /dev/null +++ b/Assets/04.Materials/SpriteDefault.mat @@ -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 diff --git a/Assets/04.Materials/SpriteDefault.mat.meta b/Assets/04.Materials/SpriteDefault.mat.meta new file mode 100644 index 000000000..97aa3b950 --- /dev/null +++ b/Assets/04.Materials/SpriteDefault.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84372e94975e22b41a9f570fc18f1daf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index 5aac607a0..07732351e 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -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: k__BackingField: {fileID: 6054159730444663926} k__BackingField: {fileID: 6509241874729291456} k__BackingField: {fileID: 7125556968546628472} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 2412195434237916265} + k__BackingField: {fileID: 3359549505901716120} k__BackingField: {fileID: 1674052485383758547} k__BackingField: {fileID: 4836489897218844789} - 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} - k__BackingField: 10 - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 0 + 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} + k__BackingField: 4 + k__BackingField: 4 + k__BackingField: 0 + 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} diff --git a/Assets/05.Prefabs/LiquidObject.prefab b/Assets/05.Prefabs/LiquidObject.prefab index c21663b80..6f121e774 100644 --- a/Assets/05.Prefabs/LiquidObject.prefab +++ b/Assets/05.Prefabs/LiquidObject.prefab @@ -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 diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index 1e7f9070a..d74574b0a 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -874,11 +874,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5465039636530628167} - - {fileID: 2294108577146112326} - - {fileID: 2669598217517900337} - - {fileID: 1638511973844291035} - - {fileID: 883194467903853233} - {fileID: 4241127396383300414} - {fileID: 3073304110347784108} m_Father: {fileID: 5604696651888245994} @@ -2171,10 +2166,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5563229157638235859} - - {fileID: 3166343339917656399} - - {fileID: 1419470226628917559} - - {fileID: 4972329663912231510} - - {fileID: 8833514766988139896} - {fileID: 8148531330268556604} - {fileID: 3659724498606878420} - {fileID: 3381794055646013358} @@ -2464,6 +2455,42 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6896564140071356710 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4798925548635759970} + m_Layer: 0 + m_Name: ServingTables + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4798925548635759970 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6896564140071356710} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5701996018619210215} + - {fileID: 790144698020171886} + - {fileID: 5559400221697507446} + - {fileID: 5881185964479335323} + - {fileID: 7251359079948161700} + m_Father: {fileID: 1402113424960589398} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6980906008572417858 GameObject: m_ObjectHideFlags: 0 @@ -3354,6 +3381,7 @@ Transform: - {fileID: 1582116343231843844} - {fileID: 1829148020791446333} - {fileID: 7679049083161624399} + - {fileID: 4798925548635759970} m_Father: {fileID: 4449232531499695111} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8697754653569273504 @@ -3695,8 +3723,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} propertyPath: m_Name - value: Barrel (2) + value: LiquidC objectReference: {fileID: 0} + - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3707,6 +3739,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} m_PrefabInstance: {fileID: 117039659876036668} m_PrefabAsset: {fileID: 0} +--- !u!1001 &128984391524895884 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4798925548635759970} + m_Modifications: + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalPosition.x + value: -10.6 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalPosition.z + value: -4.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_Name + value: ServingTable (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} +--- !u!4 &790144698020171886 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + m_PrefabInstance: {fileID: 128984391524895884} + m_PrefabAsset: {fileID: 0} --- !u!1001 &566974549354246688 PrefabInstance: m_ObjectHideFlags: 0 @@ -3855,80 +3949,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} m_PrefabInstance: {fileID: 715352878371128445} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1399077340140374731 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5604696651888245994} - m_Modifications: - - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_Name - value: WoodenBeerMug (2) - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.x - value: -0.45678616 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.y - value: -4.418142 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.z - value: 6.553108 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} ---- !u!4 &4972329663912231510 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - m_PrefabInstance: {fileID: 1399077340140374731} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1863792370835691434 PrefabInstance: m_ObjectHideFlags: 0 @@ -4295,8 +4315,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} propertyPath: m_Name - value: Barrel (4) + value: LiquidE objectReference: {fileID: 0} + - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4321,7 +4345,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} propertyPath: m_LocalPosition.z @@ -4329,7 +4353,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} propertyPath: m_LocalScale.y @@ -4407,7 +4431,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} propertyPath: m_LocalScale.x - value: -0.30281872 + value: 0.3028187 objectReference: {fileID: 0} - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} propertyPath: m_LocalScale.y @@ -4461,6 +4485,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 0 objectReference: {fileID: 0} + - target: {fileID: 6882913462236487221, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4545,80 +4573,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 3186502922114083016} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3241805517936596453 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5604696651888245994} - m_Modifications: - - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_Name - value: WoodenBeerMug (3) - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.x - value: 0.38121414 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.y - value: -4.418142 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.z - value: 6.553108 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} ---- !u!4 &8833514766988139896 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - m_PrefabInstance: {fileID: 3241805517936596453} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3436624839453424206 PrefabInstance: m_ObjectHideFlags: 0 @@ -4673,8 +4627,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} propertyPath: m_Name - value: Barrel (3) + value: LiquidD objectReference: {fileID: 0} + - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4697,13 +4655,17 @@ PrefabInstance: propertyPath: m_Name value: ColumnDown (3) objectReference: {fileID: 0} + - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} propertyPath: m_LocalPosition.z value: -0.044 objectReference: {fileID: 0} - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} propertyPath: m_LocalScale.y @@ -4767,68 +4729,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} m_PrefabInstance: {fileID: 3856405686373709802} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3858679024849465919 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5806978480304762257} - m_Modifications: - - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_Name - value: BarTable01 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.x - value: -10.657999 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.y - value: -13.495887 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.z - value: 10.88 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} ---- !u!4 &5465039636530628167 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - m_PrefabInstance: {fileID: 3858679024849465919} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4902314923449089493 PrefabInstance: m_ObjectHideFlags: 0 @@ -4907,79 +4807,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} m_PrefabInstance: {fileID: 4902314923449089493} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5033123015211643306 +--- !u!1001 &4907966878471849221 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5604696651888245994} + m_TransformParent: {fileID: 4798925548635759970} m_Modifications: - - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_Name - value: WoodenBeerMug (1) - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.x - value: -1.3087864 + value: -11.5 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.y - value: -4.418142 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.z - value: 6.553108 + value: -4.5 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_Name + value: ServingTable + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} ---- !u!4 &1419470226628917559 stripped + m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} +--- !u!4 &5701996018619210215 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - m_PrefabInstance: {fileID: 5033123015211643306} + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + m_PrefabInstance: {fileID: 4907966878471849221} m_PrefabAsset: {fileID: 0} --- !u!1001 &5035810302287944272 PrefabInstance: @@ -5055,6 +4943,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 5035810302287944272} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5051882093702667412 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4798925548635759970} + m_Modifications: + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalPosition.x + value: -9.7 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalPosition.z + value: -4.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_Name + value: ServingTable (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} +--- !u!4 &5559400221697507446 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + m_PrefabInstance: {fileID: 5051882093702667412} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5201253258313963114 PrefabInstance: m_ObjectHideFlags: 0 @@ -5215,67 +5165,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} m_PrefabInstance: {fileID: 5895671552974814301} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6581766585052698185 +--- !u!1001 &6531131564544366457 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5806978480304762257} + m_TransformParent: {fileID: 4798925548635759970} m_Modifications: - - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_Name - value: BarTable01 (2) - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.x - value: -8.915 + value: -8.8 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.y - value: -13.495887 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.z - value: 10.851 + value: -4.5 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_Name + value: ServingTable (3) + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} ---- !u!4 &2669598217517900337 stripped + m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} +--- !u!4 &5881185964479335323 stripped Transform: - m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - m_PrefabInstance: {fileID: 6581766585052698185} + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + m_PrefabInstance: {fileID: 6531131564544366457} m_PrefabAsset: {fileID: 0} --- !u!1001 &6594491959083110697 PrefabInstance: @@ -5357,6 +5307,10 @@ PrefabInstance: propertyPath: m_Color.r value: 1 objectReference: {fileID: 0} + - target: {fileID: 8730324995362642221, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5441,68 +5395,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 6710588257829302041} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7029344006648184126 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5806978480304762257} - m_Modifications: - - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_Name - value: BarTable01 (1) - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.x - value: -9.783 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.y - value: -13.495887 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.z - value: 10.865 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} ---- !u!4 &2294108577146112326 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - m_PrefabInstance: {fileID: 7029344006648184126} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7034712271388384592 PrefabInstance: m_ObjectHideFlags: 0 @@ -5885,129 +5777,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 7334668314689431639} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7558827210384554403 +--- !u!1001 &8043172050540613190 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5806978480304762257} + m_TransformParent: {fileID: 4798925548635759970} m_Modifications: - - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_Name - value: BarTable01 (3) - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.x - value: -8.06 + value: -7.9 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.y - value: -13.495887 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalPosition.z - value: 10.845 + value: -4.5 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + propertyPath: m_Name + value: ServingTable (4) + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} ---- !u!4 &1638511973844291035 stripped + m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} +--- !u!4 &7251359079948161700 stripped Transform: - m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - m_PrefabInstance: {fileID: 7558827210384554403} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &8222108409924576969 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5806978480304762257} - m_Modifications: - - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_Name - value: BarTable01 (4) - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.x - value: -7.194 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.y - value: -13.495887 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalPosition.z - value: 10.843 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} ---- !u!4 &883194467903853233 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} - m_PrefabInstance: {fileID: 8222108409924576969} + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} + m_PrefabInstance: {fileID: 8043172050540613190} m_PrefabAsset: {fileID: 0} --- !u!1001 &8302987225568116693 PrefabInstance: @@ -6133,8 +5963,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} propertyPath: m_Name - value: Barrel (1) + value: LiquidB objectReference: {fileID: 0} + - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6293,80 +6127,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} m_PrefabInstance: {fileID: 8583561182893986693} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9050786560278694354 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5604696651888245994} - m_Modifications: - - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_Name - value: WoodenBeerMug - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.x - value: -2.1647863 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.y - value: -4.418142 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalPosition.z - value: 6.553108 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} ---- !u!4 &3166343339917656399 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} - m_PrefabInstance: {fileID: 9050786560278694354} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9194699079792504016 PrefabInstance: m_ObjectHideFlags: 0 @@ -6421,8 +6181,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} propertyPath: m_Name - value: Barrel + value: LiquidA objectReference: {fileID: 0} + - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab deleted file mode 100644 index bfbe87f7c..000000000 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab +++ /dev/null @@ -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: - k__BackingField: {fileID: 7358052634285927493} - k__BackingField: {fileID: 6077686033771388879} - k__BackingField: {fileID: 8975593228546502023} - k__BackingField: {fileID: 8793236136028073839} - k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} - k__BackingField: 1 - k__BackingField: 0.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} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Barrel.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab similarity index 56% rename from Assets/05.Prefabs/Props/Furniture/Interactions/Barrel.prefab rename to Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab index 96fa2cc2b..488c29491 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Barrel.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab @@ -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: k__BackingField: {fileID: 6077686033771388879} k__BackingField: {fileID: 8975593228546502023} k__BackingField: {fileID: 8793236136028073839} - k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: {fileID: 2100000, guid: 9bce0db68fc4c4d428fa601508de489d, type: 2} k__BackingField: 1 k__BackingField: 0.8 IsOpened: 0 + _liquidImage: {fileID: 6817574259189873408} + _fill: {fileID: 7052380446467937511} + _colorIntensity: 2 _idx: _liquidData: k__BackingField: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Barrel.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Interactions/Barrel.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab new file mode 100644 index 000000000..a677ba19d --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab @@ -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: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 8975593228546502023} + k__BackingField: {fileID: 8793236136028073839} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: 1 + k__BackingField: 0.7 + 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} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab.meta index cdf1ec00a..c7a70936f 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7cb398d57f4c7ff468b50dbf1d226ca5 +guid: a46735af9ffe7684fb0f19bc9b351e30 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index 215eca3b1..5d265bfcf 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -135,7 +135,7 @@ MonoBehaviour: k__BackingField: {fileID: 8793236136028073839} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 - k__BackingField: 0.6 + k__BackingField: 0.7 IsOpened: 0 --- !u!4 &5927803667513949971 stripped Transform: diff --git a/Assets/09.Shaders/BarrelOutline.shadergraph b/Assets/09.Shaders/BarrelOutline.shadergraph new file mode 100644 index 000000000..79d60be04 --- /dev/null +++ b/Assets/09.Shaders/BarrelOutline.shadergraph @@ -0,0 +1,5152 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "861a4042db8340ddbebfefbd2d916222", + "m_Properties": [ + { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + }, + { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + }, + { + "m_Id": "7fbb2a282b424e529213916616262bbe" + }, + { + "m_Id": "594a27ff8c7b4846b2db3e6ff31bbee9" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "e7ccc2fc76c9447b8bb659cc5ca3a91d" + } + ], + "m_Nodes": [ + { + "m_Id": "e50e9278ffec451c8300198cb892e4b5" + }, + { + "m_Id": "2c23310d2ded4f859baf7f68a22c45a3" + }, + { + "m_Id": "1a9bfaaab8cd45889a00f03bc50a11cb" + }, + { + "m_Id": "3bd706a78a994586967fbc1761b702d9" + }, + { + "m_Id": "8f912cb54a9c4c54bae0e0cb3859f536" + }, + { + "m_Id": "e6510b9c22c044e4aa0a93cad23ab2ba" + }, + { + "m_Id": "161efa0aa64a4e99827423df02d85b04" + }, + { + "m_Id": "f0f4fcc5b3c949469cd09412641ea167" + }, + { + "m_Id": "2f868b8bc12e4ef795c61658c6c0d4f7" + }, + { + "m_Id": "e5cad01bd43d42a98c92ffc3789faa9c" + }, + { + "m_Id": "b5b2b21ff15c4366bbf289e5b409aa60" + }, + { + "m_Id": "c2d3ad2c24dc4883a9084964289c2184" + }, + { + "m_Id": "d6054adae079405fb455135a9e1a8f6e" + }, + { + "m_Id": "d52587de953e42aea3ba2fbbd5690de7" + }, + { + "m_Id": "adb95fd9286f4c44a49e904f391513af" + }, + { + "m_Id": "1e634342b8c3428e803b87a66f9e8862" + }, + { + "m_Id": "6e8103b6ce05478da49d82dd7f15f05c" + }, + { + "m_Id": "53b2b0b23c6a4c64a618774c830b2186" + }, + { + "m_Id": "6105c0049559416fa43f7e56447b6976" + }, + { + "m_Id": "daa82567d3664682873c3d69494cf3d4" + }, + { + "m_Id": "1af4a97d9087497eb26c7dc91794b595" + }, + { + "m_Id": "50f5ecd73d9c40179f4f7a0dbc72c6f1" + }, + { + "m_Id": "90947faeb4954920beb6acc9d536aaac" + }, + { + "m_Id": "47c312e0f0824f42a2fb0b492c6f5cb0" + }, + { + "m_Id": "7739e7bf6b014470a7ec64106d04774e" + }, + { + "m_Id": "12d40edb730245f197605e0589472fe3" + }, + { + "m_Id": "8ba5aae80ae94bc69363d563958656b6" + }, + { + "m_Id": "86b226c7baa4422d996f5f1ba8a36407" + }, + { + "m_Id": "cd4bdad5bddc43bdb39aeaa4d5fe81fd" + }, + { + "m_Id": "b33a6c970d7c414db6a8ac814b2ce838" + }, + { + "m_Id": "7d12789c26be4a9ab3f5fc68f1b69832" + }, + { + "m_Id": "a9ab020864b5432e8a0e9e5be82948c6" + }, + { + "m_Id": "85f3ad54d844479c9f0fd46289433125" + }, + { + "m_Id": "98dd26b124104404a026b64aa7e21806" + }, + { + "m_Id": "4a821bea20c84df1a7ac007911c6c63e" + }, + { + "m_Id": "7a25b26720b247c8846d097f970774f0" + }, + { + "m_Id": "ee00d25de3bf4fd5814f4fd49ecbd2e6" + }, + { + "m_Id": "b0be938ec62a4a2cba86891dff4cb85c" + }, + { + "m_Id": "eb76a84209a44a989df7309f15c462ce" + }, + { + "m_Id": "2b1df0f5e640423a94b63a1f65d10605" + }, + { + "m_Id": "eab6e8b29d6f402c937400a2d41ac0c0" + }, + { + "m_Id": "4ce48be466ed459ab961a4d8f9506990" + }, + { + "m_Id": "5dda866a7917497b86e23c46ba52c885" + }, + { + "m_Id": "4694418cf8a2407e849faaf235c5d244" + }, + { + "m_Id": "7b8dd39d89ce4831bff1b3efa431ca6c" + }, + { + "m_Id": "e0c4b0e238e84aa2bdfb17d0da0f7f3e" + }, + { + "m_Id": "e89cfa457f7f4d178442d715347a95ab" + } + ], + "m_GroupDatas": [ + { + "m_Id": "c8c3dea05a494e57a304e444f68f375b" + }, + { + "m_Id": "cacaf36fe3ff48cdbde2eda0b724d218" + }, + { + "m_Id": "0bd91721d9ef4ff78de9ab1551fd961a" + }, + { + "m_Id": "1f105565b2154b5599306fb8ce516f3d" + }, + { + "m_Id": "561e307e33ff463c845e8f37e43a896d" + }, + { + "m_Id": "cd1c622bccfb452c8445d6501fa230b4" + }, + { + "m_Id": "c93ad14e56db4c18a9ad39700faefde6" + }, + { + "m_Id": "8fac6e6e416b46b49be1befe3fb1d60c" + } + ], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "12d40edb730245f197605e0589472fe3" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7739e7bf6b014470a7ec64106d04774e" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "161efa0aa64a4e99827423df02d85b04" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e6510b9c22c044e4aa0a93cad23ab2ba" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1af4a97d9087497eb26c7dc91794b595" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "50f5ecd73d9c40179f4f7a0dbc72c6f1" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1e634342b8c3428e803b87a66f9e8862" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d52587de953e42aea3ba2fbbd5690de7" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2b1df0f5e640423a94b63a1f65d10605" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "eab6e8b29d6f402c937400a2d41ac0c0" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2f868b8bc12e4ef795c61658c6c0d4f7" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f0f4fcc5b3c949469cd09412641ea167" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4694418cf8a2407e849faaf235c5d244" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4ce48be466ed459ab961a4d8f9506990" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "47c312e0f0824f42a2fb0b492c6f5cb0" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7b8dd39d89ce4831bff1b3efa431ca6c" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4a821bea20c84df1a7ac007911c6c63e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "98dd26b124104404a026b64aa7e21806" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4ce48be466ed459ab961a4d8f9506990" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3bd706a78a994586967fbc1761b702d9" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "50f5ecd73d9c40179f4f7a0dbc72c6f1" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "90947faeb4954920beb6acc9d536aaac" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "53b2b0b23c6a4c64a618774c830b2186" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6e8103b6ce05478da49d82dd7f15f05c" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5dda866a7917497b86e23c46ba52c885" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4694418cf8a2407e849faaf235c5d244" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6105c0049559416fa43f7e56447b6976" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6e8103b6ce05478da49d82dd7f15f05c" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6e8103b6ce05478da49d82dd7f15f05c" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1af4a97d9087497eb26c7dc91794b595" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7739e7bf6b014470a7ec64106d04774e" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b0be938ec62a4a2cba86891dff4cb85c" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7a25b26720b247c8846d097f970774f0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "98dd26b124104404a026b64aa7e21806" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7b8dd39d89ce4831bff1b3efa431ca6c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4694418cf8a2407e849faaf235c5d244" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7b8dd39d89ce4831bff1b3efa431ca6c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e89cfa457f7f4d178442d715347a95ab" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7d12789c26be4a9ab3f5fc68f1b69832" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ee00d25de3bf4fd5814f4fd49ecbd2e6" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "85f3ad54d844479c9f0fd46289433125" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7d12789c26be4a9ab3f5fc68f1b69832" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "86b226c7baa4422d996f5f1ba8a36407" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b0be938ec62a4a2cba86891dff4cb85c" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "8ba5aae80ae94bc69363d563958656b6" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7739e7bf6b014470a7ec64106d04774e" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "90947faeb4954920beb6acc9d536aaac" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "47c312e0f0824f42a2fb0b492c6f5cb0" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "98dd26b124104404a026b64aa7e21806" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ee00d25de3bf4fd5814f4fd49ecbd2e6" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a9ab020864b5432e8a0e9e5be82948c6" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7d12789c26be4a9ab3f5fc68f1b69832" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "adb95fd9286f4c44a49e904f391513af" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d52587de953e42aea3ba2fbbd5690de7" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b0be938ec62a4a2cba86891dff4cb85c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "eb76a84209a44a989df7309f15c462ce" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b33a6c970d7c414db6a8ac814b2ce838" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "86b226c7baa4422d996f5f1ba8a36407" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b5b2b21ff15c4366bbf289e5b409aa60" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "daa82567d3664682873c3d69494cf3d4" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c2d3ad2c24dc4883a9084964289c2184" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b5b2b21ff15c4366bbf289e5b409aa60" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "cd4bdad5bddc43bdb39aeaa4d5fe81fd" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "86b226c7baa4422d996f5f1ba8a36407" + }, + "m_SlotId": 814628614 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d52587de953e42aea3ba2fbbd5690de7" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1af4a97d9087497eb26c7dc91794b595" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d6054adae079405fb455135a9e1a8f6e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b5b2b21ff15c4366bbf289e5b409aa60" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "daa82567d3664682873c3d69494cf3d4" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "50f5ecd73d9c40179f4f7a0dbc72c6f1" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e5cad01bd43d42a98c92ffc3789faa9c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f0f4fcc5b3c949469cd09412641ea167" + }, + "m_SlotId": -1299781773 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e6510b9c22c044e4aa0a93cad23ab2ba" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4ce48be466ed459ab961a4d8f9506990" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e6510b9c22c044e4aa0a93cad23ab2ba" + }, + "m_SlotId": 7 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7b8dd39d89ce4831bff1b3efa431ca6c" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e89cfa457f7f4d178442d715347a95ab" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8f912cb54a9c4c54bae0e0cb3859f536" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "eab6e8b29d6f402c937400a2d41ac0c0" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "90947faeb4954920beb6acc9d536aaac" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "eb76a84209a44a989df7309f15c462ce" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "eab6e8b29d6f402c937400a2d41ac0c0" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ee00d25de3bf4fd5814f4fd49ecbd2e6" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "eb76a84209a44a989df7309f15c462ce" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f0f4fcc5b3c949469cd09412641ea167" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "daa82567d3664682873c3d69494cf3d4" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "e50e9278ffec451c8300198cb892e4b5" + }, + { + "m_Id": "2c23310d2ded4f859baf7f68a22c45a3" + }, + { + "m_Id": "1a9bfaaab8cd45889a00f03bc50a11cb" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "3bd706a78a994586967fbc1761b702d9" + }, + { + "m_Id": "8f912cb54a9c4c54bae0e0cb3859f536" + }, + { + "m_Id": "e0c4b0e238e84aa2bdfb17d0da0f7f3e" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "9d6ea995f2bd415a8c96f314deed80eb" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "0059353343f94b34a35679292c24de52", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "03773a6bbd2748729d181c0a912e5442", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "05486cf8e1c2482a9ba076a640b2958e", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": 1.0, + "y": -1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "0a2db752a1234536a5bda4a9168ec713", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "0bd91721d9ef4ff78de9ab1551fd961a", + "m_Title": "-1, 0", + "m_Position": { + "x": -3235.0, + "y": 1064.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0df297ea888e4fb9ac93690d4c410a0b", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "107753db492f4cfe82f1d0f08b3ce744", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "1162be23ef1743a1b38b9a5b0cfe8ca3", + "m_Id": 0, + "m_DisplayName": "IsCorner", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "12d40edb730245f197605e0589472fe3", + "m_Group": { + "m_Id": "561e307e33ff463c845e8f37e43a896d" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3222.000244140625, + "y": 2329.0, + "width": 127.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "2b18aabfbc524fd08b6bd60bc4d14b32" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "161efa0aa64a4e99827423df02d85b04", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1692.0001220703125, + "y": -19.00003433227539, + "width": 127.0, + "height": 34.00003433227539 + } + }, + "m_Slots": [ + { + "m_Id": "0a2db752a1234536a5bda4a9168ec713" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "16861de767204acab431f37565bb1ee4", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "175db60ae4da4b94a40c164e556853a0", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "178fe2eec37144f6b49fb4e8ad42858e", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "17f1bf58da4440d69be1a013e8b7fb82", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "1a9bfaaab8cd45889a00f03bc50a11cb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "cb3199ba51654fb4817cf7d57f37c15f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "1af4a97d9087497eb26c7dc91794b595", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2593.888916015625, + "y": 1298.1112060546875, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "58ab6959395c4654a04881cefebaae1e" + }, + { + "m_Id": "3bf98b52927347cca3256e073920b90e" + }, + { + "m_Id": "6eef2e7edf0b4c11827f57e4e3df9962" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "1e634342b8c3428e803b87a66f9e8862", + "m_Group": { + "m_Id": "0bd91721d9ef4ff78de9ab1551fd961a" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3210.0, + "y": 1157.0, + "width": 128.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "3c6d265fd5234091b9b7c8c546c25de8" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "1f105565b2154b5599306fb8ce516f3d", + "m_Title": "1, 0", + "m_Position": { + "x": -3244.999755859375, + "y": 1532.0001220703125 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "239e150146d146af84c4a4a214b1e4fd", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "24638ce17bcd4549b94b1776f1577c7d", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "25772329032444d1bf9a47f74696f092", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "25b8e8723f8d422e968390e8cab6bd80", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "26d499bf4b9648c9b56b27922b37eb61", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "2b18aabfbc524fd08b6bd60bc4d14b32", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2b1df0f5e640423a94b63a1f65d10605", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2093.999755859375, + "y": 2916.0, + "width": 122.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "1162be23ef1743a1b38b9a5b0cfe8ca3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "594a27ff8c7b4846b2db3e6ff31bbee9" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "2c23310d2ded4f859baf7f68a22c45a3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "0059353343f94b34a35679292c24de52" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2e86267e3a534ea3ba92829299990492", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2f868b8bc12e4ef795c61658c6c0d4f7", + "m_Group": { + "m_Id": "c8c3dea05a494e57a304e444f68f375b" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3195.000244140625, + "y": 200.00003051757813, + "width": 127.0, + "height": 33.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "de1b65f4efe14d3bb13065fb9b1f248d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "31fef6af27794c0e8d6d29d5790a39b5", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "32fadbc6a8994333a9047bdae8341853", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "38fa438b71d04a758c6ec85bc5cdb3ff", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3bd706a78a994586967fbc1761b702d9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "7043be9bd70d4f45ac745958c6ef48d5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "3bf98b52927347cca3256e073920b90e", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3c6d265fd5234091b9b7c8c546c25de8", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "418ef45ca093438cb7d62ad7fb06a2a3", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "44e96e71b0644f10bdd49d63e4328c13", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "456f661176f64f08ac180c5f81c25a71", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "4694418cf8a2407e849faaf235c5d244", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -994.9999389648438, + "y": 131.99998474121095, + "width": 207.9998779296875, + "height": 302.00006103515627 + } + }, + "m_Slots": [ + { + "m_Id": "ae402709ad3d40ecbe64be6941062eea" + }, + { + "m_Id": "44e96e71b0644f10bdd49d63e4328c13" + }, + { + "m_Id": "6a86f7dc348c4ba59c7286ac794fc3b1" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "47c312e0f0824f42a2fb0b492c6f5cb0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1513.999755859375, + "y": 878.9999389648438, + "width": 207.9998779296875, + "height": 277.99993896484377 + } + }, + "m_Slots": [ + { + "m_Id": "cf9ad4419cbb48f1803cb9c67299ef05" + }, + { + "m_Id": "7f2d2d4d321741f782903ee2382b6783" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "47e2be83add84f18a244fc8803bc2ee8", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "4a821bea20c84df1a7ac007911c6c63e", + "m_Group": { + "m_Id": "8fac6e6e416b46b49be1befe3fb1d60c" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3221.999755859375, + "y": 3685.999755859375, + "width": 127.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "7a17647727ec457d8873c30f5aaf7acc" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "4ce48be466ed459ab961a4d8f9506990", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -714.9999389648438, + "y": -19.0, + "width": 208.00006103515626, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "03773a6bbd2748729d181c0a912e5442" + }, + { + "m_Id": "cc5b04ba302343e1b2b62d848bfa0d20" + }, + { + "m_Id": "546c8272b4a34d5dbd06a8b1fda190c8" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4ddac7bf92b64e0da0d9cab6c7111940", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "50f5ecd73d9c40179f4f7a0dbc72c6f1", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2227.967041015625, + "y": 891.0331420898438, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "24638ce17bcd4549b94b1776f1577c7d" + }, + { + "m_Id": "ea7ffce2322544898c977a7b841e25fa" + }, + { + "m_Id": "f78d57039a3c47599723f075ef69d97d" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "53b2b0b23c6a4c64a618774c830b2186", + "m_Group": { + "m_Id": "1f105565b2154b5599306fb8ce516f3d" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3218.999755859375, + "y": 1591.0001220703125, + "width": 126.999755859375, + "height": 33.9998779296875 + } + }, + "m_Slots": [ + { + "m_Id": "d473870c8be2408d92a5be524dc5c32f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "546c8272b4a34d5dbd06a8b1fda190c8", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "561e307e33ff463c845e8f37e43a896d", + "m_Title": "1, 1", + "m_Position": { + "x": -3248.000244140625, + "y": 2270.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "57bcf05f7e8444e8af6d2a06ba0ebe6a", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5855c76048664ad28eaa2d932df174fe", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "58ab6959395c4654a04881cefebaae1e", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", + "m_ObjectId": "594a27ff8c7b4846b2db3e6ff31bbee9", + "m_Guid": { + "m_GuidSerialized": "d8e4c8c5-092a-4f88-b185-2d0b65db65af" + }, + "m_Name": "IsCorner", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "IsCorner", + "m_DefaultReferenceName": "_IsCorner", + "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": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5bae8b8de885479295513dff1a34ed67", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "5dda866a7917497b86e23c46ba52c885", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1100.0, + "y": 119.0, + "width": 105.00006103515625, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "d7fb754f8c66478f802b49a8e0c69582" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "7fbb2a282b424e529213916616262bbe" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5e40be5ccbc64699869c038ca3f59ce6", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "60f52e126a8a473e880dd1a0a04eaa56", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": 1.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "6105c0049559416fa43f7e56447b6976", + "m_Group": { + "m_Id": "1f105565b2154b5599306fb8ce516f3d" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3220.0, + "y": 1625.0, + "width": 128.0, + "height": 34.0001220703125 + } + }, + "m_Slots": [ + { + "m_Id": "5855c76048664ad28eaa2d932df174fe" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "617886aa80354ab993f362937bcdde51", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "64f748e15c984aa19329ebcc3f1891fd", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "6544fa84fc1a479899140716067b724f", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "65c8697d74b448b896f36c0a556fdb90", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "663b5bb856194bfa9656cc3bfb05644c", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "67217f9d5ea0498880b402dbec335f93", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "68c32b6180ea456989fdc2c90fb0cbe6", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "68fc36ac5d8540dc9465ce3bdf1243de", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6a86f7dc348c4ba59c7286ac794fc3b1", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "6e8103b6ce05478da49d82dd7f15f05c", + "m_Group": { + "m_Id": "1f105565b2154b5599306fb8ce516f3d" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3056.0, + "y": 1591.0001220703125, + "width": 208.0, + "height": 326.9998779296875 + } + }, + "m_Slots": [ + { + "m_Id": "89035b9971e0465e99f453c3359cf7ae" + }, + { + "m_Id": "68fc36ac5d8540dc9465ce3bdf1243de" + }, + { + "m_Id": "f6b7e28bc93349b38ef9825481338e45" + }, + { + "m_Id": "869d833cd2d14cd18d758f5a490c5906" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6eef2e7edf0b4c11827f57e4e3df9962", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "7043be9bd70d4f45ac745958c6ef48d5", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "75c7d261956b47f9aa4e7327778d8013", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "7739e7bf6b014470a7ec64106d04774e", + "m_Group": { + "m_Id": "561e307e33ff463c845e8f37e43a896d" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3059.000244140625, + "y": 2329.0, + "width": 208.0, + "height": 327.0 + } + }, + "m_Slots": [ + { + "m_Id": "fa5e82d3d3e3404bbca9030b6f530da2" + }, + { + "m_Id": "456f661176f64f08ac180c5f81c25a71" + }, + { + "m_Id": "60f52e126a8a473e880dd1a0a04eaa56" + }, + { + "m_Id": "c9f7c4424485463b824663efc328a6b4" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "797d3dbc260047c2a53db1bdd7e78701", + "m_Id": 0, + "m_DisplayName": "Predicate", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Predicate", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "79aa63f0af914e1a9f6863f18654be8b" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "7a17647727ec457d8873c30f5aaf7acc", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "7a25b26720b247c8846d097f970774f0", + "m_Group": { + "m_Id": "8fac6e6e416b46b49be1befe3fb1d60c" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3222.999755859375, + "y": 3719.999755859375, + "width": 128.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "0df297ea888e4fb9ac93690d4c410a0b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubtractNode", + "m_ObjectId": "7b8dd39d89ce4831bff1b3efa431ca6c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Subtract", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1203.0, + "y": 517.0, + "width": 208.00006103515626, + "height": 302.00006103515627 + } + }, + "m_Slots": [ + { + "m_Id": "d6a1767e913b439b9124bd9479258859" + }, + { + "m_Id": "eb4c034fff894abfac4f30bb05073f4b" + }, + { + "m_Id": "ccffb91fba584b00bc5905b2f75be8d8" + } + ], + "synonyms": [ + "subtraction", + "remove", + "minus", + "take away" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7c691923eb5e498185421edc8304f009", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "7d12789c26be4a9ab3f5fc68f1b69832", + "m_Group": { + "m_Id": "c93ad14e56db4c18a9ad39700faefde6" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3059.0, + "y": 3252.0, + "width": 208.0, + "height": 326.999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "99c0754938fe44eaaf966d316c65741f" + }, + { + "m_Id": "f848f1f02aa642c4b567ba3faea18c49" + }, + { + "m_Id": "05486cf8e1c2482a9ba076a640b2958e" + }, + { + "m_Id": "5bae8b8de885479295513dff1a34ed67" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "7f2d2d4d321741f782903ee2382b6783", + "m_Id": 1, + "m_DisplayName": "Out", + "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_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "7fbb2a282b424e529213916616262bbe", + "m_Guid": { + "m_GuidSerialized": "7eb47ef3-b544-46ed-887b-8a159c5f7c6e" + }, + "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.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 1 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "84a8aed14db945699f52ce27cc4fafe1", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "85f3ad54d844479c9f0fd46289433125", + "m_Group": { + "m_Id": "c93ad14e56db4c18a9ad39700faefde6" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3223.0, + "y": 3286.0, + "width": 128.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "17f1bf58da4440d69be1a013e8b7fb82" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8638369587c84cf49049fda747005503", + "m_Id": 1, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "869d833cd2d14cd18d758f5a490c5906", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "86b226c7baa4422d996f5f1ba8a36407", + "m_Group": { + "m_Id": "cd1c622bccfb452c8445d6501fa230b4" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3064.0, + "y": 2805.999755859375, + "width": 208.0, + "height": 327.0 + } + }, + "m_Slots": [ + { + "m_Id": "47e2be83add84f18a244fc8803bc2ee8" + }, + { + "m_Id": "93c0780b44ee4888bc438ec004859ca9" + }, + { + "m_Id": "bc24e7b9c5444945833d26a9537913a7" + }, + { + "m_Id": "2e86267e3a534ea3ba92829299990492" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8771d9884f4f4c2491c62aadfe3383d8", + "m_Id": 3, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "89035b9971e0465e99f453c3359cf7ae", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "8ba5aae80ae94bc69363d563958656b6", + "m_Group": { + "m_Id": "561e307e33ff463c845e8f37e43a896d" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3223.000244140625, + "y": 2363.0, + "width": 128.0, + "height": 34.000244140625 + } + }, + "m_Slots": [ + { + "m_Id": "9568b9bda0024fe2b7324c15b54b5c84" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "8f912cb54a9c4c54bae0e0cb3859f536", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "178fe2eec37144f6b49fb4e8ad42858e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "8fac6e6e416b46b49be1befe3fb1d60c", + "m_Title": "-1, 1", + "m_Position": { + "x": -3247.999755859375, + "y": 3626.999755859375 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "90947faeb4954920beb6acc9d536aaac", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1809.000244140625, + "y": 891.0, + "width": 207.9998779296875, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "84a8aed14db945699f52ce27cc4fafe1" + }, + { + "m_Id": "25b8e8723f8d422e968390e8cab6bd80" + }, + { + "m_Id": "5e40be5ccbc64699869c038ca3f59ce6" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "91f4ac5ae0164dc0bf087c7688318fdd", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": -1.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "93c0780b44ee4888bc438ec004859ca9", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "947c31301ade43718a9c646855661ff9", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9568b9bda0024fe2b7324c15b54b5c84", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "96b416db77f04787bdffa0e9e08899db", + "m_Guid": { + "m_GuidSerialized": "b9b09337-9ee6-485f-8dba-c3a323c8c364" + }, + "m_Name": "MainTex", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MainTex", + "m_DefaultReferenceName": "_MainTex", + "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": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "96d9958050774037b5c03abad77690d8", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "98dd26b124104404a026b64aa7e21806", + "m_Group": { + "m_Id": "8fac6e6e416b46b49be1befe3fb1d60c" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3058.999755859375, + "y": 3685.999755859375, + "width": 208.0, + "height": 327.0 + } + }, + "m_Slots": [ + { + "m_Id": "239e150146d146af84c4a4a214b1e4fd" + }, + { + "m_Id": "c93056374a6248889f9cd92b94f1012c" + }, + { + "m_Id": "ca6c0a8823cd4c6ea5d31d7d20e35da3" + }, + { + "m_Id": "6544fa84fc1a479899140716067b724f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "99c0754938fe44eaaf966d316c65741f", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "9d6ea995f2bd415a8c96f314deed80eb", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "79aa63f0af914e1a9f6863f18654be8b" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 1, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 0, + "m_AlphaClip": true, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a13cc5af4b5740fab3c0d5cedac6ad7e", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "a20800de8a0b4eb78543cd085d8f8966", + "m_Guid": { + "m_GuidSerialized": "93c863ec-d724-4ee4-b0af-9071538f4328" + }, + "m_Name": "Thickness", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Thickness", + "m_DefaultReferenceName": "_Thickness", + "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": 0.009999999776482582, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 0.009999999776482582 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "a21448f42a1c4a428a3db7022a194b00", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a9ab020864b5432e8a0e9e5be82948c6", + "m_Group": { + "m_Id": "c93ad14e56db4c18a9ad39700faefde6" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3222.0, + "y": 3252.0, + "width": 127.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "f2e7fc7a6b854f89b291d0707fb2d9ad" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "adb95fd9286f4c44a49e904f391513af", + "m_Group": { + "m_Id": "0bd91721d9ef4ff78de9ab1551fd961a" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3208.999755859375, + "y": 1123.0, + "width": 126.999755859375, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "f37526adc6a442a79e1244c395edccd0" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ae402709ad3d40ecbe64be6941062eea", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "afcd80712a7941b49978588b216febd5", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "b0be938ec62a4a2cba86891dff4cb85c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2663.0, + "y": 2572.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "175db60ae4da4b94a40c164e556853a0" + }, + { + "m_Id": "ef26c8b0ab0046cc804276c2f600daa7" + }, + { + "m_Id": "d2a60778b2d940ca88a24410c997bbe7" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b0f9205a678e46078a43d86155725a6d", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b33a6c970d7c414db6a8ac814b2ce838", + "m_Group": { + "m_Id": "cd1c622bccfb452c8445d6501fa230b4" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3228.0, + "y": 2839.999755859375, + "width": 128.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "cc348f58cdbf483ab440a3f9abf5b99e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "b5b2b21ff15c4366bbf289e5b409aa60", + "m_Group": { + "m_Id": "cacaf36fe3ff48cdbde2eda0b724d218" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3042.0, + "y": 668.0, + "width": 208.0, + "height": 326.99993896484377 + } + }, + "m_Slots": [ + { + "m_Id": "38fa438b71d04a758c6ec85bc5cdb3ff" + }, + { + "m_Id": "418ef45ca093438cb7d62ad7fb06a2a3" + }, + { + "m_Id": "f63b797614ad403483646f2bf121c0f5" + }, + { + "m_Id": "b97178c8ee1e41aaabc8dca99cb518c6" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "b7b426e14c7246af9919bc728cd792f7", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b97178c8ee1e41aaabc8dca99cb518c6", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "bc24e7b9c5444945833d26a9537913a7", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": -1.0, + "y": -1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "bd71eeef2ac44ebc94ee74931d7f8dd3", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c065c7c2fc534f599f0299340b819c22", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c2d3ad2c24dc4883a9084964289c2184", + "m_Group": { + "m_Id": "cacaf36fe3ff48cdbde2eda0b724d218" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3205.0, + "y": 668.0, + "width": 127.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "b7b426e14c7246af9919bc728cd792f7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "c8c3dea05a494e57a304e444f68f375b", + "m_Title": "0, 1", + "m_Position": { + "x": 10.0, + "y": 10.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c93056374a6248889f9cd92b94f1012c", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "c93ad14e56db4c18a9ad39700faefde6", + "m_Title": "1, -1", + "m_Position": { + "x": -3248.0, + "y": 3193.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c9f7c4424485463b824663efc328a6b4", + "m_Id": 1, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "ca6c0a8823cd4c6ea5d31d7d20e35da3", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": -1.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "ca8f616e85024da98f72f1e07277df0d", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "cacaf36fe3ff48cdbde2eda0b724d218", + "m_Title": "0, -1", + "m_Position": { + "x": -3231.0, + "y": 609.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "cb3199ba51654fb4817cf7d57f37c15f", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "cbe0c8fc3ff74e1ca2f52175f0ce3fab", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "cc348f58cdbf483ab440a3f9abf5b99e", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "cc5b04ba302343e1b2b62d848bfa0d20", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ccffb91fba584b00bc5905b2f75be8d8", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "cd1c622bccfb452c8445d6501fa230b4", + "m_Title": "-1, -1", + "m_Position": { + "x": -3253.0, + "y": 2746.999755859375 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "cd4bdad5bddc43bdb39aeaa4d5fe81fd", + "m_Group": { + "m_Id": "cd1c622bccfb452c8445d6501fa230b4" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3227.0, + "y": 2805.999755859375, + "width": 127.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "a21448f42a1c4a428a3db7022a194b00" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "cf9ad4419cbb48f1803cb9c67299ef05", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d0a83ecd2eb24c778cb54994ef1c0688", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "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.DynamicVectorMaterialSlot", + "m_ObjectId": "d2a60778b2d940ca88a24410c997bbe7", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "d3519e780e904eb28253df1b83006460", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "d473870c8be2408d92a5be524dc5c32f", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "d52587de953e42aea3ba2fbbd5690de7", + "m_Group": { + "m_Id": "0bd91721d9ef4ff78de9ab1551fd961a" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3046.0, + "y": 1123.0, + "width": 208.000244140625, + "height": 327.0 + } + }, + "m_Slots": [ + { + "m_Id": "65c8697d74b448b896f36c0a556fdb90" + }, + { + "m_Id": "67217f9d5ea0498880b402dbec335f93" + }, + { + "m_Id": "91f4ac5ae0164dc0bf087c7688318fdd" + }, + { + "m_Id": "64f748e15c984aa19329ebcc3f1891fd" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "d6054adae079405fb455135a9e1a8f6e", + "m_Group": { + "m_Id": "cacaf36fe3ff48cdbde2eda0b724d218" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3206.0, + "y": 702.0, + "width": 128.0, + "height": 33.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "7c691923eb5e498185421edc8304f009" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "d6a1767e913b439b9124bd9479258859", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "d73d3cb8a1d445cf8896a284ecaa663e", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d7fb754f8c66478f802b49a8e0c69582", + "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.AddNode", + "m_ObjectId": "daa82567d3664682873c3d69494cf3d4", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2593.999755859375, + "y": 517.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "68c32b6180ea456989fdc2c90fb0cbe6" + }, + { + "m_Id": "57bcf05f7e8444e8af6d2a06ba0ebe6a" + }, + { + "m_Id": "25772329032444d1bf9a47f74696f092" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "de1b65f4efe14d3bb13065fb9b1f248d", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "e0c4b0e238e84aa2bdfb17d0da0f7f3e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "31fef6af27794c0e8d6d29d5790a39b5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "e50e9278ffec451c8300198cb892e4b5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "26d499bf4b9648c9b56b27922b37eb61" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "e5cad01bd43d42a98c92ffc3789faa9c", + "m_Group": { + "m_Id": "c8c3dea05a494e57a304e444f68f375b" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3196.0, + "y": 234.0, + "width": 127.999755859375, + "height": 34.000030517578128 + } + }, + "m_Slots": [ + { + "m_Id": "16861de767204acab431f37565bb1ee4" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "e6510b9c22c044e4aa0a93cad23ab2ba", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1554.0, + "y": -19.00003433227539, + "width": 207.999755859375, + "height": 435.0000915527344 + } + }, + "m_Slots": [ + { + "m_Id": "d0a83ecd2eb24c778cb54994ef1c0688" + }, + { + "m_Id": "96d9958050774037b5c03abad77690d8" + }, + { + "m_Id": "663b5bb856194bfa9656cc3bfb05644c" + }, + { + "m_Id": "a13cc5af4b5740fab3c0d5cedac6ad7e" + }, + { + "m_Id": "c065c7c2fc534f599f0299340b819c22" + }, + { + "m_Id": "d73d3cb8a1d445cf8896a284ecaa663e" + }, + { + "m_Id": "d3519e780e904eb28253df1b83006460" + }, + { + "m_Id": "f5748388d93e47edb27a79013efdd77d" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "e7ccc2fc76c9447b8bb659cc5ca3a91d", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "96b416db77f04787bdffa0e9e08899db" + }, + { + "m_Id": "a20800de8a0b4eb78543cd085d8f8966" + }, + { + "m_Id": "7fbb2a282b424e529213916616262bbe" + }, + { + "m_Id": "594a27ff8c7b4846b2db3e6ff31bbee9" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", + "m_ObjectId": "e89cfa457f7f4d178442d715347a95ab", + "m_Group": { + "m_Id": "" + }, + "m_Name": "One Minus", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -850.9998168945313, + "y": 541.0, + "width": 207.9998779296875, + "height": 277.99993896484377 + } + }, + "m_Slots": [ + { + "m_Id": "107753db492f4cfe82f1d0f08b3ce744" + }, + { + "m_Id": "8638369587c84cf49049fda747005503" + } + ], + "synonyms": [ + "complement", + "invert", + "opposite" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ea7ffce2322544898c977a7b841e25fa", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "eab6e8b29d6f402c937400a2d41ac0c0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Branch", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1955.0001220703125, + "y": 2926.000244140625, + "width": 208.0001220703125, + "height": 326.000244140625 + } + }, + "m_Slots": [ + { + "m_Id": "797d3dbc260047c2a53db1bdd7e78701" + }, + { + "m_Id": "ec819b85fa0149788cb32e275941b83b" + }, + { + "m_Id": "f63e9857f80c481da5dff72b87d2f5a1" + }, + { + "m_Id": "8771d9884f4f4c2491c62aadfe3383d8" + } + ], + "synonyms": [ + "switch", + "if", + "else" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "eb4c034fff894abfac4f30bb05073f4b", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "eb76a84209a44a989df7309f15c462ce", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2331.999755859375, + "y": 2950.0, + "width": 207.999755859375, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "cbe0c8fc3ff74e1ca2f52175f0ce3fab" + }, + { + "m_Id": "b0f9205a678e46078a43d86155725a6d" + }, + { + "m_Id": "617886aa80354ab993f362937bcdde51" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ec819b85fa0149788cb32e275941b83b", + "m_Id": 1, + "m_DisplayName": "True", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "True", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "ee00d25de3bf4fd5814f4fd49ecbd2e6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2663.0, + "y": 3384.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "bd71eeef2ac44ebc94ee74931d7f8dd3" + }, + { + "m_Id": "32fadbc6a8994333a9047bdae8341853" + }, + { + "m_Id": "947c31301ade43718a9c646855661ff9" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ef26c8b0ab0046cc804276c2f600daa7", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "f0f4fcc5b3c949469cd09412641ea167", + "m_Group": { + "m_Id": "c8c3dea05a494e57a304e444f68f375b" + }, + "m_Name": "OutlineSample", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3032.000244140625, + "y": 200.00003051757813, + "width": 208.0, + "height": 327.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "75c7d261956b47f9aa4e7327778d8013" + }, + { + "m_Id": "4ddac7bf92b64e0da0d9cab6c7111940" + }, + { + "m_Id": "ca8f616e85024da98f72f1e07277df0d" + }, + { + "m_Id": "afcd80712a7941b49978588b216febd5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"1a0303398d8326744abaeb636159aa55\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "4b59801d-8e84-48ff-9469-596f0b58715c", + "4e8f3057-9fe3-4257-bc59-fbc27b11a57c", + "87e72843-09d9-4c14-8a1c-2803a8bd14bd", + "04b7f89f-9ad4-49c1-b001-1bcfdd759bab", + "3cc4f812-aeee-4f67-8ab5-d772a4907f5f" + ], + "m_PropertyIds": [ + 814628614, + -1299781773, + 1976533176, + 703993382, + 1577808850 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "f2e7fc7a6b854f89b291d0707fb2d9ad", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "f37526adc6a442a79e1244c395edccd0", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "f5748388d93e47edb27a79013efdd77d", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "f63b797614ad403483646f2bf121c0f5", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": -1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f63e9857f80c481da5dff72b87d2f5a1", + "m_Id": 2, + "m_DisplayName": "False", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "False", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "f6b7e28bc93349b38ef9825481338e45", + "m_Id": 1577808850, + "m_DisplayName": "Direction", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Direction", + "m_StageCapability": 2, + "m_Value": { + "x": 1.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f78d57039a3c47599723f075ef69d97d", + "m_Id": 2, + "m_DisplayName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f848f1f02aa642c4b567ba3faea18c49", + "m_Id": -1299781773, + "m_DisplayName": "Thickness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Thickness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "fa5e82d3d3e3404bbca9030b6f530da2", + "m_Id": 814628614, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Texture", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + diff --git a/Assets/09.Shaders/BarrelOutline.shadergraph.meta b/Assets/09.Shaders/BarrelOutline.shadergraph.meta new file mode 100644 index 000000000..b4a99c819 --- /dev/null +++ b/Assets/09.Shaders/BarrelOutline.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 35052d46233d61b4fa6a8f340ff50c8b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/09.Shaders/Liquid.shadergraph b/Assets/09.Shaders/Liquid.shadergraph index 7bce556bf..c783d8139 100644 --- a/Assets/09.Shaders/Liquid.shadergraph +++ b/Assets/09.Shaders/Liquid.shadergraph @@ -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", diff --git a/Assets/09.Shaders/OutlineLit.shadergraph b/Assets/09.Shaders/OutlineLit.shadergraph index 5b8e45d16..b30e8d67d 100644 --- a/Assets/09.Shaders/OutlineLit.shadergraph +++ b/Assets/09.Shaders/OutlineLit.shadergraph @@ -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 } diff --git a/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesLitShader.cs b/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesLitShader.cs index b4312e2be..da60628a3 100644 --- a/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesLitShader.cs +++ b/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesLitShader.cs @@ -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(FindObjectsSortMode.None); foreach (ParticleSystemRenderer renderer in renderers) { if (renderer.sharedMaterial == material) diff --git a/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesSimpleLitShader.cs b/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesSimpleLitShader.cs index 81942a65e..55196b4e9 100644 --- a/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesSimpleLitShader.cs +++ b/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesSimpleLitShader.cs @@ -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(FindObjectsSortMode.None); foreach (ParticleSystemRenderer renderer in renderers) { if (renderer.sharedMaterial == material) diff --git a/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesUnlitShader.cs b/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesUnlitShader.cs index 978599e5d..55a7dcde8 100644 --- a/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesUnlitShader.cs +++ b/Assets/Amazing Assets/Curved World/Editor/Material Editors/URP/ParticlesUnlitShader.cs @@ -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(FindObjectsSortMode.None); foreach (ParticleSystemRenderer renderer in renderers) { if (renderer.sharedMaterial == material) diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetIsKinematic.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetIsKinematic.cs index d32b65e7d..ca760d0c5 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetIsKinematic.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetIsKinematic.cs @@ -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; } diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/IsKinematic.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/IsKinematic.cs index 7c7ecab13..ac9abbc4f 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/IsKinematic.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/IsKinematic.cs @@ -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() diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetIsKinematic.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetIsKinematic.cs index 401f422ce..bdc239a53 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetIsKinematic.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetIsKinematic.cs @@ -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; } diff --git a/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs b/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs index 4f6e1c391..1aac92f18 100644 --- a/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs +++ b/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs @@ -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; diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2c6c115a2..d370eb355 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -27,7 +27,7 @@ TagManager: - ClickGround - DamageableProps - Liquid - - Test + - - - -