diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index dee2a5cbe..e15fe1a0b 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -291,13 +291,6 @@ namespace BlueWater { OnGainAutoMoneyCounter?.Invoke(gainWaitTime); } - - // 휴지통이 랜덤한 칵테일로 변하는 패시브 카드 이벤트 - public static Action OnSelectedRandomChangeCard; - public static void InvokeChangeRandomCard() - { - OnSelectedRandomChangeCard?.Invoke(); - } // 휴지통이 랜덤한 칵테일로 변하는 패시브 카드 이벤트 public static Action OnChangedRandomCocktail; diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index cfbdb625b..7e97a4f70 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -1,6 +1,5 @@ using System; using BlueWater.Items; -using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; @@ -19,6 +18,9 @@ namespace BlueWater.Tycoons [SerializeField] private string _idx; + + [SerializeField] + private string _interactionEntryName; [SerializeField] private LiquidData _liquidData; @@ -32,8 +34,21 @@ namespace BlueWater.Tycoons [field: SerializeField] public bool IsAutoSupply { get; private set; } + [field: SerializeField] + public bool IsMoldy { get; private set; } + + [SerializeField] + private Sprite _originalSprite; + + [SerializeField] + private Sprite _moldSprite; + + [SerializeField] + private float _playerHoldingTime = 3f; + private Material _instanceMaterial; - private float _elapsedTime; + private float _supplyElapsedTime; + private bool _isPlayerInteracting; public static event Action OnBarrelInteracted; public static event Action OnBarrelCancelInteracted; @@ -65,16 +80,43 @@ namespace BlueWater.Tycoons private void Update() { - if (!IsAutoSupply) return; - - if (_elapsedTime >= 1f) + if (IsShowing) { - AddCurrentAmount(TycoonManager.Instance.TycoonStatus.BarrelAutoIncrease); - - _elapsedTime -= 1f; + EventManager.InvokeHoldInteracting(HoldingElapsedTime); } - _elapsedTime += Time.deltaTime; + if (IsMoldy) + { + if (HoldingElapsedTime >= _playerHoldingTime) + { + Recovery(); + } + + if (_isPlayerInteracting) + { + HoldingElapsedTime += Time.deltaTime; + } + else + { + if (HoldingElapsedTime > 0f) + { + HoldingElapsedTime -= Time.deltaTime; + } + } + } + else + { + if (!IsAutoSupply) return; + + if (_supplyElapsedTime >= 1f) + { + AddCurrentAmount(TycoonManager.Instance.TycoonStatus.BarrelAutoIncrease); + + _supplyElapsedTime -= 1f; + } + + _supplyElapsedTime += Time.deltaTime; + } } private void OnDestroy() @@ -85,14 +127,29 @@ namespace BlueWater.Tycoons public override void Interaction() { - OnBarrelInteracted?.Invoke(this); - GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = true; + if (!IsMoldy) + { + OnBarrelInteracted?.Invoke(this); + GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = true; + } + else + { + _isPlayerInteracting = true; + } } public override void CancelInteraction() { - OnBarrelCancelInteracted?.Invoke(); - GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = false; + if (!IsMoldy) + { + OnBarrelCancelInteracted?.Invoke(); + GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = false; + } + else + { + _isPlayerInteracting = false; + HoldingElapsedTime = 0f; + } } /// @@ -100,8 +157,24 @@ namespace BlueWater.Tycoons /// public override bool CanInteraction() { - return IsActivated && !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem && CanConsume(1); + return IsActivated && !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem && + ((!IsMoldy && CanConsume(1)) || IsMoldy); } + + public override void ShowInteractionUi() + { + if (IsMoldy) + { + UpdateLocalizedString("InteractionMold"); + } + else + { + UpdateLocalizedString(_interactionEntryName); + } + + base.ShowInteractionUi(); + } + public bool CanConsume(int amount) { @@ -159,5 +232,25 @@ namespace BlueWater.Tycoons SetCurrentAmount(CurrentAmount + addedValue); } + + public bool CanMold() + { + return _liquidData.Idx != "LiquidA" && IsActivated && !IsMoldy; + } + + public void Mold() + { + IsMoldy = true; + VisualLook.sprite = _moldSprite; + InteractionCanvas.BalloonUi.ShowUi(); + } + + public void Recovery() + { + CancelInteraction(); + IsMoldy = false; + VisualLook.sprite = _originalSprite; + InteractionCanvas.BalloonUi.HideUi(); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 31a84870e..a4dfae4df 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -13,19 +13,11 @@ namespace BlueWater.Tycoons private SpriteRenderer _spriteRenderer; private bool _isPlayerInteracting; - private bool _isRandomChange; private bool _canInteraction = true; - protected override void Awake() - { - base.Awake(); - - EventManager.OnSelectedRandomChangeCard += SetRandomChange; - } - private void Update() { - if (_isRandomChange) + if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange) { if (InteractionCanvas.BalloonUi.IsWaitTimeOver()) { @@ -40,7 +32,7 @@ namespace BlueWater.Tycoons if (HoldingElapsedTime >= 1f) { - if (_isRandomChange) + if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange) { ChangeRandomCocktail(); } @@ -63,11 +55,6 @@ namespace BlueWater.Tycoons } } - private void OnDestroy() - { - EventManager.OnSelectedRandomChangeCard -= SetRandomChange; - } - public override void Interaction() { _isPlayerInteracting = true; @@ -81,12 +68,13 @@ namespace BlueWater.Tycoons public override bool CanInteraction() { return CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything() && - (_isRandomChange && _canInteraction || !_isRandomChange); + ((_canInteraction && TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange) || + !_canInteraction); } public override void ShowInteractionUi() { - if (_isRandomChange) + if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange) { UpdateLocalizedString("InteractionTrashCanChange"); } @@ -124,12 +112,5 @@ namespace BlueWater.Tycoons _canInteraction = false; _isPlayerInteracting = false; } - - private void SetRandomChange() - { - if (!_canRandomChange) return; - - _isRandomChange = true; - } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index 75a6f2e70..301dbb6bf 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 700 - k__BackingField: {fileID: 21300000, guid: d0b6eba4ac33ece44bccd11e57e415e8, type: 3} + k__BackingField: {fileID: 21300000, guid: 36bc2eb7dbc196d49ba9c3bb472b3b83, type: 3} - k__BackingField: HeartRecovery k__BackingField: k__BackingField: HeartRecovery @@ -42,7 +42,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 7579ee4fd1c5ed34d939eeef18c625be, type: 3} + k__BackingField: {fileID: 21300000, guid: 2634397d49e34444093a3124ae1cfe8f, type: 3} - k__BackingField: AddLiquidB k__BackingField: k__BackingField: AddLiquidB @@ -114,7 +114,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 284734c4624b35b499152e028f90e6f6, type: 3} + k__BackingField: {fileID: 21300000, guid: dd95462c72930b94db1a265e022135dc, type: 3} - k__BackingField: ServerNpcAdd k__BackingField: k__BackingField: ServerNpcAdd @@ -124,7 +124,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 1000 - k__BackingField: {fileID: 21300000, guid: 21ac4e0eced0c8c4894e7e26f5d13779, type: 3} + k__BackingField: {fileID: 21300000, guid: b0d823fb250ab39439086d705f9d09ae, type: 3} - k__BackingField: CleanerNpcAdd k__BackingField: k__BackingField: CleanerNpcAdd @@ -134,7 +134,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 1000 - k__BackingField: {fileID: 21300000, guid: 4d0b5b10aaf1d26438a2f013882ad1f6, type: 3} + k__BackingField: {fileID: 21300000, guid: e026bd2e1836fe944b506588281a3150, type: 3} - k__BackingField: BartenderNpcAdd k__BackingField: k__BackingField: BartenderNpcAdd @@ -144,7 +144,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 1000 - k__BackingField: {fileID: 21300000, guid: 02ff51bea8718c447bea8470257b6782, type: 3} + k__BackingField: {fileID: 21300000, guid: a355a54a3c6f81444af86ea55267f66f, type: 3} - k__BackingField: SpeedBoost k__BackingField: k__BackingField: SpeedBoost @@ -155,7 +155,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 500 - k__BackingField: {fileID: 21300000, guid: 8de251475e5862f4b96ba45c2de88bd5, type: 3} + k__BackingField: {fileID: 21300000, guid: 08e7de38a058c784d9657d7886ad21f3, type: 3} - k__BackingField: ExpBoost k__BackingField: k__BackingField: ExpBoost @@ -166,7 +166,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 500 - k__BackingField: {fileID: 21300000, guid: 400a47b8bcd0a1e4b823160ce9f40232, type: 3} + k__BackingField: {fileID: 21300000, guid: d5f915b089e30ba4188fd0d5f8995258, type: 3} - k__BackingField: GoldBoost k__BackingField: k__BackingField: GoldBoost @@ -176,7 +176,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 500 - k__BackingField: {fileID: 21300000, guid: 121ed7da4e55d2a43ba798a00f95a474, type: 3} + k__BackingField: {fileID: 21300000, guid: 800cfe19988f8de4287cb36c52644c50, type: 3} - k__BackingField: AllCleanUp k__BackingField: k__BackingField: AllCleanUp @@ -186,7 +186,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 1acb09a93fb040241a17107a288d6f54, type: 3} + k__BackingField: {fileID: 21300000, guid: 95a1150a98911da49a19aec02f1d37aa, type: 3} - k__BackingField: GaugeReset k__BackingField: k__BackingField: GaugeReset @@ -208,7 +208,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 500 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 9e07fb1bfe316e4498ebf2eca6416598, type: 3} - k__BackingField: TipBoost k__BackingField: k__BackingField: TipBoost @@ -218,7 +218,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 600 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 6afaa573453b0744a8d8abab0f1149fa, type: 3} - k__BackingField: EndGoldBoost k__BackingField: k__BackingField: EndGoldBoost @@ -229,7 +229,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 47ea9a0f33240884aae3bc86e282f10a, type: 3} - k__BackingField: AllCustomerPurification k__BackingField: k__BackingField: AllCustomerPurification @@ -239,7 +239,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 580b70a0ca6feb443a015b2008b1b380, type: 3} - k__BackingField: GaugeTimeUp k__BackingField: k__BackingField: GaugeTimeUp @@ -250,7 +250,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 1000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: c8a66291b7886b94d9af05765f7cac70, type: 3} - k__BackingField: ServerNpcUpgrade k__BackingField: k__BackingField: ServerNpcUpgrade @@ -261,7 +261,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 300 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 7548a1950cee9714faed2345763707df, type: 3} - k__BackingField: CleanerNpcUpgrade k__BackingField: k__BackingField: CleanerNpcUpgrade @@ -272,7 +272,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 300 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 9698f77ece981714fa2581be702bb4b2, type: 3} - k__BackingField: BartenderNpcUpgrade k__BackingField: k__BackingField: BartenderNpcUpgrade @@ -283,7 +283,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 300 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8a14a667a6ca5414195e87bf80f852a8, type: 3} - k__BackingField: PassiveMakingBonus k__BackingField: k__BackingField: PassiveMakingBonus @@ -295,7 +295,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 1 k__BackingField: 800 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: e9365eac177a0ee4285a561e731e2f61, type: 3} - k__BackingField: PassiveServingBonus k__BackingField: k__BackingField: PassiveServingBonus @@ -307,7 +307,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 1 k__BackingField: 800 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 26117dc80d7e49a4886a6752a6c33bdc, type: 3} - k__BackingField: PassiveCleaningBonus k__BackingField: k__BackingField: PassiveCleaningBonus @@ -320,7 +320,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 1 k__BackingField: 800 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: a70dca31799414e4d9e963a2e64539f4, type: 3} - k__BackingField: BarrelAutoSupply k__BackingField: k__BackingField: BarrelAutoSupply @@ -331,7 +331,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 1500 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: facba79682d930d4684990d6f2d538c2, type: 3} - k__BackingField: PassiveDoubleServing k__BackingField: k__BackingField: PassiveDoubleServing @@ -342,7 +342,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 1 k__BackingField: 1000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: a4046c88ea869084f9d1d8c8decae8f0, type: 3} - k__BackingField: PassiveRandomChange k__BackingField: k__BackingField: PassiveRandomChange @@ -353,7 +353,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 1 k__BackingField: 1000 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 5be50657ec5dce54aa7143fcdd20ad5b, type: 3} - k__BackingField: PassiveGoldAutoGain k__BackingField: k__BackingField: PassiveGoldAutoGain @@ -364,4 +364,4 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 1 k__BackingField: 900 - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 10b0008368ec02a43be3f2d38a556821, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index 886967eca..517426fd2 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -192,7 +192,7 @@ MonoBehaviour: k__BackingField: 30 k__BackingField: LiquidD k__BackingField: 30 - k__BackingField: Garnish2 + k__BackingField: LiquidE k__BackingField: 40 k__BackingField: k__BackingField: 0 @@ -215,7 +215,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} + k__BackingField: {fileID: 21300000, guid: a2cd1b193f5007c4f8a68b1cdd4ca2c1, type: 3} k__BackingField: [] - k__BackingField: Cocktail012 k__BackingField: @@ -271,7 +271,7 @@ MonoBehaviour: - k__BackingField: Cocktail015 k__BackingField: k__BackingField: Cocktail015 - k__BackingField: "\uCE75\uD14C\uC77CE2" + k__BackingField: "\uCE75\uD14C\uC77CE1" k__BackingField: 10 k__BackingField: LiquidE k__BackingField: 50 @@ -283,5 +283,5 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} + k__BackingField: {fileID: 21300000, guid: ee344f47787d148448bd3373235281b6, type: 3} k__BackingField: [] diff --git a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs index 35b6901e3..f37406fde 100644 --- a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs @@ -1,7 +1,9 @@ +using System; using System.Collections.Generic; using System.Linq; using BlueWater.Items; using UnityEngine; +using Random = UnityEngine.Random; namespace BlueWater.Tycoons { @@ -36,6 +38,13 @@ namespace BlueWater.Tycoons { LiquidBarrelA, LiquidBarrelB, LiquidBarrelC, LiquidBarrelD, LiquidBarrelE, GarnishBarrel1, GarnishBarrel2 }; + + EventManager.OnCreateMold += SetMold; + } + + private void OnDestroy() + { + EventManager.OnCreateMold -= SetMold; } /// @@ -85,7 +94,7 @@ namespace BlueWater.Tycoons { var activatedBarrels = GetActivatedBarrels(); return cocktailIngredients.All(element => - activatedBarrels.Find(barrel => barrel.GetLiquidData().Idx == element.Idx && barrel.CurrentAmount >= element.Amount)); + activatedBarrels.Find(barrel => barrel.GetLiquidData().Idx == element.Idx && !barrel.IsMoldy && barrel.CurrentAmount >= element.Amount)); } public void ConsumeMakingCocktailIngredient(List cocktailIngredients) @@ -102,5 +111,16 @@ namespace BlueWater.Tycoons { return _barrels.Where(barrel => barrel.IsActivated).ToList(); } + + public void SetMold() + { + foreach (var element in GetActivatedBarrels()) + { + if (!element.CanMold()) continue; + + element.Mold(); + return; + } + } } } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 87b0dd7f0..7a59efd2b 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -269,7 +269,6 @@ namespace BlueWater.Uis break; case "PassiveRandomChange": _tycoonStatus.CurrentPassiveCard = PassiveCard.RandomChange; - EventManager.InvokeChangeRandomCard(); break; case "PassiveGoldAutoGain": _tycoonStatus.CurrentPassiveCard = PassiveCard.GoldAutoGain; diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png index e8372bcb4..e1c8c29ed 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png index 5ff5282bb..4e3ab2572 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/A2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png index 758f1570a..5998a7fa6 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Abe.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png index 151ca19f3..934002d8d 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Ac.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png deleted file mode 100644 index c3f512136..000000000 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png index d5fb2d232..0dff0603d 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png index 2629df95f..480b56fe5 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/B1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png index f62d7d396..d9ab8f0c1 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Bd.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png index 7d3a8a166..1578cf2a0 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png index f032c1062..2c7c62b6d 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/C2.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png index 046234b28..9cc441860 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cd.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png index 502d6006e..cf5ce2237 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cde.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png index ebdabed0c..005fe1579 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png index e8bb7e591..27a819ee9 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/D1.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png index 56a9c8fc5..2ea1839d2 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png index 46135cd00..92360e59b 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/E1.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AllCleanUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/AllCleanUp.png new file mode 100644 index 000000000..72539ed5a Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AllCleanUp.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AllCleanUp.png.meta similarity index 98% rename from Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/AllCleanUp.png.meta index 1b07f72ca..1cb982813 100644 --- a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Acd.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AllCleanUp.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78afb2f9950251046a96a297f6d61c89 +guid: 95a1150a98911da49a19aec02f1d37aa TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 7 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AllCustomerPurification.png b/Assets/03.Images/Ui/Tycoon/Loglike/AllCustomerPurification.png new file mode 100644 index 000000000..89f3bda9e Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AllCustomerPurification.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AllCustomerPurification.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AllCustomerPurification.png.meta new file mode 100644 index 000000000..30f76a161 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AllCustomerPurification.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 580b70a0ca6feb443a015b2008b1b380 +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/Ui/Tycoon/Loglike/AllLiquidAdd.png b/Assets/03.Images/Ui/Tycoon/Loglike/AllLiquidAdd.png new file mode 100644 index 000000000..c0ab1accb Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AllLiquidAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AllLiquidAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AllLiquidAdd.png.meta new file mode 100644 index 000000000..d750b5bfb --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AllLiquidAdd.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: dd95462c72930b94db1a265e022135dc +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/Ui/Tycoon/Loglike/BarrelAutoSupply.png b/Assets/03.Images/Ui/Tycoon/Loglike/BarrelAutoSupply.png new file mode 100644 index 000000000..35fe451b0 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/BarrelAutoSupply.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/BarrelAutoSupply.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/BarrelAutoSupply.png.meta new file mode 100644 index 000000000..f1d385380 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/BarrelAutoSupply.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: facba79682d930d4684990d6f2d538c2 +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/Ui/Tycoon/Loglike/BartenderNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcAdd.png new file mode 100644 index 000000000..44ba4e7fc Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcAdd.png.meta new file mode 100644 index 000000000..d7d2cb4aa --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcAdd.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a355a54a3c6f81444af86ea55267f66f +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/Ui/Tycoon/Loglike/BartenderNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcUpgrade.png new file mode 100644 index 000000000..06303bc34 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcUpgrade.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcUpgrade.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcUpgrade.png.meta new file mode 100644 index 000000000..4f0f63c14 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/BartenderNpcUpgrade.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 8a14a667a6ca5414195e87bf80f852a8 +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/Ui/Tycoon/Loglike/CleanerNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcAdd.png new file mode 100644 index 000000000..87babe024 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcAdd.png.meta new file mode 100644 index 000000000..f6dcf1752 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcAdd.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: e026bd2e1836fe944b506588281a3150 +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/Ui/Tycoon/Loglike/CleanerNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcUpgrade.png new file mode 100644 index 000000000..9fed154c0 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcUpgrade.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcUpgrade.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcUpgrade.png.meta new file mode 100644 index 000000000..a82318d6c --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpcUpgrade.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 9698f77ece981714fa2581be702bb4b2 +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/Ui/Tycoon/Loglike/DashCooldownReduction.png b/Assets/03.Images/Ui/Tycoon/Loglike/DashCooldownReduction.png new file mode 100644 index 000000000..97918b0e6 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/DashCooldownReduction.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/DashCooldownReduction.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/DashCooldownReduction.png.meta new file mode 100644 index 000000000..3a66520ed --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/DashCooldownReduction.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 9e07fb1bfe316e4498ebf2eca6416598 +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/Ui/Tycoon/Loglike/EndGoldBoost.png b/Assets/03.Images/Ui/Tycoon/Loglike/EndGoldBoost.png new file mode 100644 index 000000000..3606c8145 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/EndGoldBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/EndGoldBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/EndGoldBoost.png.meta new file mode 100644 index 000000000..7d45b4fd2 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/EndGoldBoost.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 47ea9a0f33240884aae3bc86e282f10a +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/Ui/Tycoon/Loglike/ExpBoost.png b/Assets/03.Images/Ui/Tycoon/Loglike/ExpBoost.png new file mode 100644 index 000000000..9ef3e8d79 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/ExpBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ExpBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ExpBoost.png.meta new file mode 100644 index 000000000..e326d875f --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ExpBoost.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: d5f915b089e30ba4188fd0d5f8995258 +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/Ui/Tycoon/Loglike/Frame.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Frame.meta new file mode 100644 index 000000000..964fbe145 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Frame.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0bdb40cae8dee14fb7267b122490480 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameBack.png b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameBack.png new file mode 100644 index 000000000..79090fe51 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameBack.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameBack.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameBack.png.meta new file mode 100644 index 000000000..3b667c1de --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameBack.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f7938260d2ad2b941b131be4c901e69f +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/Ui/Tycoon/Loglike/Frame/FrameFront.png b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameFront.png new file mode 100644 index 000000000..3cbeaeaee Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameFront.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameFront.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameFront.png.meta new file mode 100644 index 000000000..2394434c8 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Frame/FrameFront.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 72e42bd725cab234a9e47e512e5edfc3 +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/Ui/Tycoon/Loglike/FullHeartRecovery.png b/Assets/03.Images/Ui/Tycoon/Loglike/FullHeartRecovery.png new file mode 100644 index 000000000..137b987a0 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/FullHeartRecovery.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/FullHeartRecovery.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/FullHeartRecovery.png.meta new file mode 100644 index 000000000..4e423a692 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/FullHeartRecovery.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 2634397d49e34444093a3124ae1cfe8f +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/Ui/Tycoon/Loglike/GaugeTimeUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeTimeUp.png new file mode 100644 index 000000000..d6c69c288 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeTimeUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GaugeTimeUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeTimeUp.png.meta new file mode 100644 index 000000000..2d07b7411 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeTimeUp.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: c8a66291b7886b94d9af05765f7cac70 +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/Ui/Tycoon/Loglike/GoldBoost.png b/Assets/03.Images/Ui/Tycoon/Loglike/GoldBoost.png new file mode 100644 index 000000000..3eed32fc3 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/GoldBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GoldBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/GoldBoost.png.meta new file mode 100644 index 000000000..d9a9503e8 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/GoldBoost.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 800cfe19988f8de4287cb36c52644c50 +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/Ui/Tycoon/Loglike/HeartSlotPlus.png b/Assets/03.Images/Ui/Tycoon/Loglike/HeartSlotPlus.png new file mode 100644 index 000000000..d07e536ee Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/HeartSlotPlus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartSlotPlus.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/HeartSlotPlus.png.meta new file mode 100644 index 000000000..f2edbf7a1 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/HeartSlotPlus.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 36bc2eb7dbc196d49ba9c3bb472b3b83 +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/Ui/Tycoon/Loglike/Old.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old.meta new file mode 100644 index 000000000..87543279f --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Old.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb61a3818316dfc44913745f71d712b6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddAllLiquid.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddAllLiquid.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddAllLiquid.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddAllLiquid.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish1.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish1.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish1.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish1.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish2.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish2.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish2.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddGarnish2.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidB.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidB.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidB.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidB.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidC.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidC.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidC.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidC.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidD.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidD.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidD.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidD.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidE.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidE.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidE.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/AddLiquidE.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/CardUpgradeSprite.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/CardUpgradeSprite.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/CardUpgradeSprite.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/CardUpgradeSprite.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/ChefNpc.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/ChefNpc.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/ChefNpc.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/ChefNpc.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanUp.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanUp.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanUp.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanUp.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanerNpc.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanerNpc.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanerNpc.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/CleanerNpc.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/ExpGetUp.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/ExpGetUp.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/ExpGetUp.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/ExpGetUp.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Back.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Back.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Back.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Back.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Front.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Front.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Front.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/Frame_Front.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/GaugeReset.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/GaugeReset.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/GaugeReset.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/GaugeReset.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/GoldGetup.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/GoldGetup.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/GoldGetup.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/GoldGetup.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartAllHeal.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartAllHeal.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartAllHeal.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartAllHeal.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartHeal.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartHeal.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartHeal.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartHeal.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartPlus.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartPlus.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartPlus.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/HeartPlus.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/ServerNpc.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/ServerNpc.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/ServerNpc.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/ServerNpc.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/SpeedUp.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/SpeedUp.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/SpeedUp.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/SpeedUp.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png b/Assets/03.Images/Ui/Tycoon/Loglike/Old/UpgradePopup.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/UpgradePopup.png diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Old/UpgradePopup.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Old/UpgradePopup.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Passive.meta new file mode 100644 index 000000000..24689c82d --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Passive.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e6ea2a8f2dcbef4baf7fe581bf05346 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveAutoGoldGain.png b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveAutoGoldGain.png new file mode 100644 index 000000000..642ba7020 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveAutoGoldGain.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveAutoGoldGain.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveAutoGoldGain.png.meta new file mode 100644 index 000000000..9d2a94de7 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveAutoGoldGain.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 10b0008368ec02a43be3f2d38a556821 +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/Ui/Tycoon/Loglike/Passive/PassiveCleaningBonus.png b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveCleaningBonus.png new file mode 100644 index 000000000..82c75703e Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveCleaningBonus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveCleaningBonus.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveCleaningBonus.png.meta new file mode 100644 index 000000000..a6ac00ba8 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveCleaningBonus.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a70dca31799414e4d9e963a2e64539f4 +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/Ui/Tycoon/Loglike/Passive/PassiveDoubleServing.png b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveDoubleServing.png new file mode 100644 index 000000000..55971a3d8 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveDoubleServing.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveDoubleServing.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveDoubleServing.png.meta new file mode 100644 index 000000000..41b264d0d --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveDoubleServing.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a4046c88ea869084f9d1d8c8decae8f0 +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/Ui/Tycoon/Loglike/Passive/PassiveMakingBonus.png b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveMakingBonus.png new file mode 100644 index 000000000..a497fbbfa Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveMakingBonus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveMakingBonus.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveMakingBonus.png.meta new file mode 100644 index 000000000..a49498334 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveMakingBonus.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: e9365eac177a0ee4285a561e731e2f61 +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/Ui/Tycoon/Loglike/Passive/PassiveRandomChange.png b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveRandomChange.png new file mode 100644 index 000000000..c8a7723a7 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveRandomChange.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveRandomChange.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveRandomChange.png.meta new file mode 100644 index 000000000..c1f836041 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveRandomChange.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 5be50657ec5dce54aa7143fcdd20ad5b +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/Ui/Tycoon/Loglike/Passive/PassiveServingBonus.png b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveServingBonus.png new file mode 100644 index 000000000..c6c15cb63 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveServingBonus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveServingBonus.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveServingBonus.png.meta new file mode 100644 index 000000000..7ba24c4c2 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Passive/PassiveServingBonus.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 26117dc80d7e49a4886a6752a6c33bdc +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/Ui/Tycoon/Loglike/ServerNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcAdd.png new file mode 100644 index 000000000..632031492 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcAdd.png.meta new file mode 100644 index 000000000..508ed8505 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcAdd.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: b0d823fb250ab39439086d705f9d09ae +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/Ui/Tycoon/Loglike/ServerNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcUpgrade.png new file mode 100644 index 000000000..bb78bdd1b Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcUpgrade.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcUpgrade.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcUpgrade.png.meta new file mode 100644 index 000000000..503b132d3 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpcUpgrade.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 7548a1950cee9714faed2345763707df +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/Ui/Tycoon/Loglike/SpeedBoost.png b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedBoost.png new file mode 100644 index 000000000..a17d693de Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/SpeedBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedBoost.png.meta new file mode 100644 index 000000000..9eb88d882 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedBoost.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 08e7de38a058c784d9657d7886ad21f3 +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/Ui/Tycoon/Loglike/TipBoost.png b/Assets/03.Images/Ui/Tycoon/Loglike/TipBoost.png new file mode 100644 index 000000000..00655917d Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/TipBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/TipBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/TipBoost.png.meta new file mode 100644 index 000000000..bdfca938c --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/TipBoost.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 6afaa573453b0744a8d8abab0f1149fa +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/Ui/Tycoon/Mold.png b/Assets/03.Images/Ui/Tycoon/Mold.png new file mode 100644 index 000000000..ff5033cd9 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Mold.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Mold.png.meta b/Assets/03.Images/Ui/Tycoon/Mold.png.meta new file mode 100644 index 000000000..abe082405 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Mold.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: d98551edcbd98e542af000fc7aaaf794 +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/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index a6d8b08b2..f5b632114 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -6058,8 +6058,8 @@ PrefabInstance: value: Garnish1 objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: k__BackingField - value: "Garnish1 \uB530\uB974\uAE30" + propertyPath: _interactionEntryName + value: InteractionGarnishBarrel1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x @@ -6276,8 +6276,8 @@ PrefabInstance: value: LiquidD objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: k__BackingField - value: "LiquidD \uB530\uB974\uAE30" + propertyPath: _interactionEntryName + value: InteractionLiquidBarrelD objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x @@ -7600,14 +7600,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: - - target: {fileID: 223172209862223209, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} - propertyPath: _idx - value: LiquidA - objectReference: {fileID: 0} - - target: {fileID: 223172209862223209, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} - propertyPath: k__BackingField - value: "LiquidA \uB530\uB974\uAE30" - objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} propertyPath: m_LocalScale.x value: 5.5 @@ -11835,8 +11827,8 @@ PrefabInstance: value: LiquidC objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: k__BackingField - value: "LiquidC \uB530\uB974\uAE30" + propertyPath: _interactionEntryName + value: InteractionLiquidBarrelC objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x @@ -12777,8 +12769,8 @@ PrefabInstance: value: LiquidB objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: k__BackingField - value: "LiquidB \uB530\uB974\uAE30" + propertyPath: _interactionEntryName + value: InteractionLiquidBarrelB objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x @@ -13359,8 +13351,8 @@ PrefabInstance: value: LiquidE objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: k__BackingField - value: "LiquidE \uB530\uB974\uAE30" + propertyPath: _interactionEntryName + value: InteractionLiquidBarrelE objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x @@ -14473,8 +14465,8 @@ PrefabInstance: value: Garnish2 objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: k__BackingField - value: "Garnish2 \uB530\uB974\uAE30" + propertyPath: _interactionEntryName + value: InteractionGarnishBarrel2 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab index 755413d00..30543a7a6 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab @@ -357,13 +357,25 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} - 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 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x @@ -397,6 +409,10 @@ PrefabInstance: propertyPath: m_Name value: LiquidBarrel01 objectReference: {fileID: 0} + - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d98551edcbd98e542af000fc7aaaf794, type: 3} - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x value: -0.17 @@ -405,6 +421,18 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -568,12 +596,11 @@ MonoBehaviour: k__BackingField: 0.8 k__BackingField: IsOpened: 0 - _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} - _offset: {x: 0, y: 1.5, z: 0} _liquidImage: {fileID: 6817574259189873408} _fill: {fileID: 7052380446467937511} _colorIntensity: 2 _idx: + _interactionEntryName: _liquidData: k__BackingField: k__BackingField: @@ -584,6 +611,10 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 + k__BackingField: 0 + _originalSprite: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} + _moldSprite: {fileID: 21300000, guid: ba260ff89030fda4b99b2bb66f6da61d, type: 3} + _playerHoldingTime: 3 --- !u!114 &1653087204473300138 MonoBehaviour: m_ObjectHideFlags: 0 @@ -598,9 +629,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_StringReference: m_TableReference: - m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableCollectionName: m_TableEntryReference: - m_KeyId: 34976455471104 + m_KeyId: 0 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -611,19 +642,7 @@ MonoBehaviour: m_FormatArguments: [] m_UpdateString: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 223172209862223209} - m_TargetAssemblyTypeName: BlueWater.Tycoons.InteractionFurniture, Assembly-CSharp - m_MethodName: set_InteractionMessage - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 + m_Calls: [] references: version: 2 RefIds: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab index 2827123d4..c336a83e9 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab @@ -426,12 +426,11 @@ MonoBehaviour: k__BackingField: 0.8 k__BackingField: IsOpened: 0 - _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} - _offset: {x: 0, y: 1.5, z: 0} _liquidImage: {fileID: 6817574259189873408} _fill: {fileID: 7052380446467937511} _colorIntensity: 2 - _idx: + _idx: LiquidA + _interactionEntryName: InteractionLiquidBarrelA _liquidData: k__BackingField: k__BackingField: @@ -442,6 +441,10 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 + k__BackingField: 0 + _originalSprite: {fileID: 0} + _moldSprite: {fileID: 0} + _playerHoldingTime: 3 --- !u!114 &7967298876764243330 MonoBehaviour: m_ObjectHideFlags: 0 @@ -456,9 +459,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_StringReference: m_TableReference: - m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableCollectionName: m_TableEntryReference: - m_KeyId: 34976455471104 + m_KeyId: 0 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -469,19 +472,7 @@ MonoBehaviour: m_FormatArguments: [] m_UpdateString: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 223172209862223209} - m_TargetAssemblyTypeName: BlueWater.Tycoons.InteractionFurniture, Assembly-CSharp - m_MethodName: set_InteractionMessage - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 + m_Calls: [] references: version: 2 RefIds: diff --git a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab index 6d5f59984..d77776de0 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab @@ -179,7 +179,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -479173315, guid: 98f18d9519d31f44d898c3b2289ab273, type: 3} + m_Sprite: {fileID: 21300000, guid: 72e42bd725cab234a9e47e512e5edfc3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -447,7 +447,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1160244810, guid: e7481c4658aa1544fabd8323173e4e6a, type: 3} + m_Sprite: {fileID: 21300000, guid: f7938260d2ad2b941b131be4c901e69f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/13.Localization/StringDataTable.csv b/Assets/13.Localization/StringDataTable.csv index a91bc95b3..31cf19a5f 100644 --- a/Assets/13.Localization/StringDataTable.csv +++ b/Assets/13.Localization/StringDataTable.csv @@ -49,3 +49,4 @@ Key,Korean(ko),English(en) "InteractionPump","펌프 작동하기","Operate pump" "InteractionTrashCanDiscard","칵테일 버리기","Discard cocktail" "InteractionTrashCanChange","무작위 칵테일 변경","Change random cocktail" +"InteractionMold","곰팡이 치우기","Cleaning Mold" \ No newline at end of file diff --git a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset index b9ce75566..166834654 100644 --- a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset +++ b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset @@ -216,7 +216,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 55332822069248 - m_Key: + m_Key: InteractionMold m_Metadata: m_Items: [] m_Metadata: diff --git a/Assets/13.Localization/Tables/StringDataTable_en.asset b/Assets/13.Localization/Tables/StringDataTable_en.asset index 6e8449fd1..2b258a4f4 100644 --- a/Assets/13.Localization/Tables/StringDataTable_en.asset +++ b/Assets/13.Localization/Tables/StringDataTable_en.asset @@ -230,6 +230,10 @@ MonoBehaviour: m_Localized: Discard cocktail m_Metadata: m_Items: [] + - m_Id: 55332822069248 + m_Localized: Cleaning Mold + m_Metadata: + m_Items: [] references: version: 2 RefIds: diff --git a/Assets/13.Localization/Tables/StringDataTable_ko.asset b/Assets/13.Localization/Tables/StringDataTable_ko.asset index 22270c339..f0c445583 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ko.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ko.asset @@ -243,6 +243,10 @@ MonoBehaviour: m_Localized: "\uCE75\uD14C\uC77C \uBC84\uB9AC\uAE30" m_Metadata: m_Items: [] + - m_Id: 55332822069248 + m_Localized: "\uACF0\uD321\uC774 \uCE58\uC6B0\uAE30" + m_Metadata: + m_Items: [] references: version: 2 RefIds: diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index eccb45593..2e17b11a1 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 8e0a3b4ef79b6b240a41c854861466bc m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: da65d56768284fe6f422aaede07a2afa m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Resources/Excel/CocktailDataTable.xlsx b/Assets/Resources/Excel/CocktailDataTable.xlsx index c6372d34b..a05b2dd15 100644 Binary files a/Assets/Resources/Excel/CocktailDataTable.xlsx and b/Assets/Resources/Excel/CocktailDataTable.xlsx differ diff --git a/Assets/Resources/JSON/CocktailDataTable.json b/Assets/Resources/JSON/CocktailDataTable.json index 4f962df31..be7e75704 100644 --- a/Assets/Resources/JSON/CocktailDataTable.json +++ b/Assets/Resources/JSON/CocktailDataTable.json @@ -157,7 +157,7 @@ "IngredientRatio1": 30, "IngredientIdx2": "LiquidD", "IngredientRatio2": 30, - "IngredientIdx3": "Garnish2", + "IngredientIdx3": "LiquidE", "IngredientRatio3": 40, "IngredientIdx4": "", "IngredientRatio4": 0, @@ -226,7 +226,7 @@ }, { "Idx": "Cocktail015", - "Name": "칵테일E2", + "Name": "칵테일E1", "RatioRange": 10, "IngredientIdx1": "LiquidE", "IngredientRatio1": 50,