diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 1f26cbe8a..a8a420db4 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -10240,7 +10240,7 @@ Camera: m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 2147614679 + m_Bits: 2148138967 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -11752,8 +11752,10 @@ MonoBehaviour: _moveToPlayerDuration: 0.2 _moveToCenterDuration: 0.15 _centerPosition: {x: -340, y: 0, z: 0} - _endPositionOffset: {x: 0, y: 20, z: 0} + _endPositionOffset: {x: 0, y: 0.1, z: 0} _endScale: {x: 0.3, y: 0.3, z: 0.3} + _cameraDistance: {x: 5, y: 15} + _offsetY: {x: 20, y: 15} --- !u!1001 &1008526203 PrefabInstance: m_ObjectHideFlags: 0 @@ -21409,6 +21411,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2} + _vomitingObject: {fileID: 7264946127367919962, guid: d02f28b2bb526af478050f2f027be8e9, type: 3} _mushroomObject: {fileID: 9017181398980009727, guid: 6ae3ef0fd03a4f14bb60802eb4fc0fa8, type: 3} _normalRewardBoxObject: {fileID: 5271591928794914848, guid: c939d59e0cc02ec45b0610f6b470031f, type: 3} _rareRewardBoxObject: {fileID: 5271591928794914848, guid: 6609b1f764f239e4a94f6f88be3d4916, type: 3} @@ -22613,7 +22616,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIexHw7YYvAIAAPoFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wUlpdCyt12g7R7aotJVD5senHhCLIwd+aNAK/77jh1DApUiJZp5M/PmzUy+CJemhsIqfa85e1QMyM8e8d/kR691PsCOrpRc8k84Yt44s5UH0YB5oZYrtKc+zKgNWM2LX3IlPDhBo5O8VHozZyuYKmMNmksqDKBLK+ujJZq+emQXA/bx/enfvQN+FSAt6O+ofjJII7CfJoPbAHayEHRTA/Ok25h0MhjFsJvBKCAldhRBTaJCCcFNJETsvg4NT2ltHLaDAMYpNhioeHwFfFXZED7qhj+XpQEbiWq6n3GNSjV5yW/VyLehZt3Q+6DC+UrD2+vAq0n7+M0/btylVpuHY+U08TVsxYv1C90X1NiOvl3z7Jy6k1sq1jQX8FaBfFL3WjnJ0Gm186HOwNWsk+rU27SCYt3iGq4XRld/n1XaTvQQut8tLdQPrYLXrfWvAbMUKsgfU3pPtEx8StA4vD/YT1ggEwuh1XPE+Fe66m5adNxxbSy6Ip9o9dgFTggYyAKi7n0PkJ5erpz2ucg8cPViODtVWkIwR4I1SCrsfoEZ7eUKXPg6vC48d9QfXWQXfcdbuggJ5hafJBeuhdqehq1xfU3Y6ePXv3c/BFOp7SOY6tlZwWVHbe94QoGnSspmc7tiHsOWTpe06IRZ2FmnYUYtDdWQDi4Y64ailiFCOiH8LocGAiNswD/vXt+KYl0RzORJyXB7Z+9Af+U4O78QktAbOmF5ObpK8/HNbd4f5kPICxjmyZjBeJKScEJcotxULBq9okq4XbLtReK5+IwvYCx1msoweabp9p5/blRn8lyWalloAPncZDg1CxqL4A+GzRnHNpdgLZdhL8lXRoQq1sCyU6IsCDvfWU2zNktGav6hrLdkZBp+hBnx5tNF4up+cNj64mfJQODogL1yARtae1dyIIf/UEsDBBQAAAgIAABIIeyfkg7JbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz0jPVUVBKL0osyCgGChiCOKWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7EfDthi8AgAA+gUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7J+SDslsAAAAdwAAAAkAJAAAAAAAAAAAAAAACQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADAAwAAAAA= + dataString: UEsDBBQAAAgIAABIIexR+FglvAIAAPoFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wUlLbBlb7vAtntoi0pXPWx6cO0JsTB25I8CrfjvO3YMCVSKlGjmzcybNzP5JELZGpjT5tYIfq85kB89Er7Jt17rvIMdXWm1FB9wxLwI7qoAohHzRJ3QaM9DmNUbcEawn2olAzhDo1ei1GYz5yuYaussmksqLaDLaBeiFZo+e2SXAvbp/RHevQN+MVAOzFdUPxvkCdjPs8FNBHvFJN3UwAPpNiafDEYp7PtgFJEKO0qgJhHTUgqbCBG3r2PDU1pbj+0ggAuKDUYqAV+BWFUuho+64Y9lacEloobuZ8KgUk1e8ks38m2oXTf03qn0odL1zTDyatLef/GPG3dp9ObuWDnPQg1XCbZ+ontGrevo2zXPzql7taVyTd8kvFSgHvSt0V5xdDrjQ6i3cDXrpDr1Nq2ArVtcw/XC6Ouvs8rbiR5i97ulg/quVXDYWv9asEupo/wpZfAkyySkBIPD+4P9xAWyqRBaA0eMf6ar7qYlx29hrENX4pOsAbvACQEHxSDp3g8AFei9aW9CLjKPXIMY3k21URDNiWANikq3X2BGd7kCF74OrwvPbxqOLrFLvuMtXYREc4vPsgvXQm9Pwza4vjbu9PHr32sYgq309h5s9eidFKqjdnA8oMBTrVSzuV0xj2FLb0rKOmEOds4bmFFHYzWkgwvGu6GoZYxQXsqwy7GByAgbCM9r0LeiWFdGM3nQKt7e2TvSX3nBzy+E8DKnbMwyxibDcgw3/eEVLd+yq/GEDrPrbJSTeEJCodxULhq9kkq4XartReG5hIxPYB31hqo4eW7o9lZ8bHRn8kKVeskMgHpsMpyaBYNF8AfD51xgm0twTqi4l+SzIFKzNfDilKiIws53ztCizVKQWrxrFywFmcYfYUGC+XSRuLrvArah+FkykDg64M9CwobWwZUdyOE/UEsDBBQAAAgIAABIIewWhYGbvQIAAPgFAAALACQAZ3JhcGgxLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wUlUKDsbRdou4e2qHTVw9KDE0+IhbEjfxRoxX/fsWNIoFKkRDNvZt68mckX4dJUkFul7zVnj4oB+dkh/pv86DTOB9jTtZJL/gknzBtntvQgGjAv1HKF9tSHGbUFq3n+S66FBydodJIXSm/nbA1TZaxBc0GFAXRpZX20RNNXh+xjwCG+P/27c8SvHKQF/R3VTXppBHbTpHcbwE7mgm4rYJ50E5NOesMYNu4NA1JiRxFUJ8qVENxEQsQeqtDwlFbGYTsIYJxig4GKx5fA16UN4cN2+HNRGLCRqKaHGdeoVJ2X/Fa1fFtqNjW9DyqcrzTs34zG/UCtzvz4DTK6Ce5Cq+3DqXia+DK25PnmhR5yamxL4rZ5dsneyR0VG5oJeCtBPql7rZxk6LTa+VBnoD9rpTq3Ny0h3zS4muuV0VXfx5U2Qz0GAfZLC9VDI+JNY/1rwCyFChOIKb0nWiY+JWic3x/sJ+yQiYXQ6jli/Ctdt5ctOu64NhZdkU+0euwChwQMZA5R964HSE8vU077XGQeuHoxnJ0qLSGYI8EKJBX2sMCM9noLrnwtXleeO+rvLrKLvtM5XYUEc4NPkivXQu3Ow9a4wSas9enr37sfginV7hFM+eys4LKltnc8ocBTJWW9vG0xT2FLpwuat8Is7K3TMKOWhmpIBxeMtUNRyxAhnRB+l0MDgRE24J93r29Jsa4IZvKkZDi/i3egv3acXV4ISeiYTlhWDPtpNhrfZt1BNoAsh0GWjBiMJikJJ8Qlyk3FotYrqoTbJZteJJ6Lz7is6E6G89d0d88/t6o1dC4Ltcw1gHyug899gsb8+Hthc8axwyVYy2VYSfK1IkLlG2Crc6JV0HS+t5qumiwrUvEPZb1lRabhN7gi3nw+RtzaDw47X/wiGQicGrBXLmBLK+9KjuT4H1BLAwQUAAAICAAASCHskxvcZYsAAAC1AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAW2NvQ6CMBSFX4V0FtIfWqgvwGbcDcO97S10sBBAE2N8d9u4up2fL+e82ZO2PS6JnSvdyEafKjZtsM57DmQxj+iLvjEfBDjjuHO2DYb6upUQkEtjoeWKa8EyzqED6zFoKdB0PdYKFaEjhdx4MlawMVPHa6UL3Ok3fIVjDjH5mKZm2KIfyn8Z+1+Mny9QSwECLQAUAAAICAAASCHsUfhYJbwCAAD6BQAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHsFoWBm70CAAD4BQAACwAkAAAAAAAAAAAAAAAJAwAAZ3JhcGgxLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHskxvcZYsAAAC1AAAACQAkAAAAAAAAAAAAAAATBgAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAADAAMAFQEAAOkGAAAAAA== file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs index cb1bc37e8..9641c467f 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs @@ -29,7 +29,7 @@ namespace BlueWater.BehaviorTrees.Actions if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingPercent) { _canVomit = true; - _vomitingPosition = Utils.RandomPositionOnGraph(); + _vomitingPosition = Utils.RandomPositionOnGraph(1); _customer.AIMovement.Move(_vomitingPosition); } } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs index 3674a917b..27015fc35 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderCocktail.cs @@ -25,8 +25,6 @@ namespace BlueWater.BehaviorTrees.Actions if (_customer.IsWaitTimeOver()) { _customer.UnregisterPlayerInteraction(); - EventManager.InvokeMissedServing(); - EventManager.InvokeCheckedSkin(_customer.CustomerSkin); return TaskStatus.Failure; } diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 0cb7c8be6..959770f4a 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -98,9 +98,6 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public string InteractionMessage { get; set; } - - [SerializeField] - private Vomiting _vomiting; [field: Title("실시간 데이터")] [field: SerializeField] @@ -345,6 +342,7 @@ namespace BlueWater.Npcs.Customers } EventManager.InvokeCocktailServedToCustomer(cocktailData, IsServedPlayer); EventManager.InvokeOrderResult(this, IsOrderedCorrected); + EventManager.InvokeSucceedServing(IsOrderedCorrected); EventManager.InvokeCheckedSkin(CustomerSkin); } @@ -453,8 +451,10 @@ namespace BlueWater.Npcs.Customers if (isWaitTimeOver) { EventManager.InvokeOrderResult(this, false); + EventManager.InvokeMissedServing(); + EventManager.InvokeCheckedSkin(CustomerSkin); } - + return isWaitTimeOver; } @@ -496,21 +496,7 @@ namespace BlueWater.Npcs.Customers public void InstanceVomit() { var spawnPosition = transform.position + new Vector3(0f, 0f, -0.4f); - Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation); - TycoonStageController.VomitCount++; - if (TycoonStageController.VomitCount >= 3) - { - var random = Random.Range(0, 101); - if (random <= 20) - { - EventManager.InvokeCreateMushroom(); - } - else - { - EventManager.InvokeCreateMold(); - } - TycoonStageController.VomitCount = 0; - } + EventManager.InvokeCreateVomiting(spawnPosition); IsVomited = true; StateMachineController.TransitionToState(IdleState, this); } diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 2b3ac240c..24bac8937 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -228,6 +228,13 @@ namespace BlueWater OnOrderResult?.Invoke(orderedCustomer, orderedCorrected); } + // 손님에게 서빙을 하지 못했을 때 이벤트 + public static Action OnSucceedServing; + public static void InvokeSucceedServing(bool isSucceed) + { + OnSucceedServing?.Invoke(isSucceed); + } + // 손님에게 서빙을 하지 못했을 때 이벤트 public static Action OnMissedServing; public static void InvokeMissedServing() @@ -310,6 +317,13 @@ namespace BlueWater { OnCleaningResult?.Invoke(isSucceed); } + + // 구토 생성 이벤트 + public static Action OnCreateVomiting; + public static void InvokeCreateVomiting(Vector3 spawnPosition) + { + OnCreateVomiting?.Invoke(spawnPosition); + } // 버섯 생성 이벤트 public static Action OnCreateMushroom; diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index d66109282..c8e8edd5c 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -34,13 +34,6 @@ namespace BlueWater.Tycoons public event Action OnInteractionCompleted; - protected override void OnEnable() - { - base.OnEnable(); - - Initialize(); - } - protected override void Start() { base.Start(); diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index 369998f4a..6b24d06aa 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -116,6 +116,12 @@ namespace BlueWater [SerializeField] private Vector3 _endScale = new(0.3f, 0.3f, 0.3f); + [SerializeField] + private Vector2 _cameraDistance = new(5f, 15f); + + [SerializeField] + private Vector2 _offsetY = new(20f, 15f); + private Barrel _currentBarrel; private IObjectPool _liquidObjectPool; private IObjectPool _garnishObjectPool; @@ -565,14 +571,19 @@ namespace BlueWater var startScale = _liquidPanel.transform.localScale; var startPosition = _liquidPanel.transform.position; + Camera mainCamera = TycoonCameraManager.Instance.MainCamera; + var elapsedTime = 0f; while (elapsedTime <= _moveToPlayerDuration) { var playerPosition = _tycoonPlayer.transform.position; - var playerScreenPosition = TycoonCameraManager.Instance.MainCamera.WorldToScreenPoint(playerPosition); - var panelWorldPosition = _overlayCamera.ScreenToWorldPoint(new Vector3(playerScreenPosition.x, - playerScreenPosition.y, _overlayCamera.nearClipPlane)); - panelWorldPosition += _endPositionOffset; + var distance = Vector3.Distance(playerPosition, mainCamera.transform.position); + float t = Mathf.InverseLerp(_cameraDistance.x, _cameraDistance.y, distance); + float offsetY = Mathf.Lerp(_offsetY.x, _offsetY.y, t); + var playerViewportPoint = mainCamera.WorldToViewportPoint(playerPosition); + var panelWorldPosition = _overlayCamera.ViewportToWorldPoint(new Vector3(playerViewportPoint.x, + playerViewportPoint.y, _overlayCamera.nearClipPlane)); + panelWorldPosition.y += offsetY; var lerpTime = elapsedTime / _moveToPlayerDuration; _liquidPanel.transform.position = Vector3.Lerp(startPosition, panelWorldPosition, lerpTime); @@ -590,10 +601,13 @@ namespace BlueWater while (!_isCompleted && !_isPouring) { var playerPosition = _tycoonPlayer.transform.position; - var playerScreenPosition = TycoonCameraManager.Instance.MainCamera.WorldToScreenPoint(playerPosition); - var panelWorldPosition = _overlayCamera.ScreenToWorldPoint(new Vector3(playerScreenPosition.x, - playerScreenPosition.y, _overlayCamera.nearClipPlane)); - panelWorldPosition += _endPositionOffset; + var distance = Vector3.Distance(playerPosition, mainCamera.transform.position); + float t = Mathf.InverseLerp(_cameraDistance.x, _cameraDistance.y, distance); + float offsetY = Mathf.Lerp(_offsetY.x, _offsetY.y, t); + var playerViewportPoint = mainCamera.WorldToViewportPoint(playerPosition); + var panelWorldPosition = _overlayCamera.ViewportToWorldPoint(new Vector3(playerViewportPoint.x, + playerViewportPoint.y, _overlayCamera.nearClipPlane)); + panelWorldPosition.y += offsetY; _liquidPanel.transform.position = panelWorldPosition; yield return waitTime; @@ -631,8 +645,6 @@ namespace BlueWater _liquidPanel.SetActive(false); } - public int GetMaxLiquidCount() => _maxLiquidCount; - #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 49744ba6c..3ce83ec5a 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -5,6 +5,7 @@ using BlueWater.Items; using BlueWater.Utility; using Sirenix.OdinInspector; using UnityEngine; +using Random = UnityEngine.Random; namespace BlueWater.Tycoons { @@ -12,6 +13,9 @@ namespace BlueWater.Tycoons { [field: SerializeField, Required] public StageDataSo StageDataSo { get; private set; } + + [SerializeField] + private Vomiting _vomitingObject; [SerializeField] private Mushroom _mushroomObject; @@ -40,6 +44,7 @@ namespace BlueWater.Tycoons EventManager.OnMakeCocktailCompleted += AddInstanceCocktail; EventManager.OnCocktailServedToCustomer += RemoveInstanceCocktail; EventManager.OnCocktailDiscarded += RemoveInstanceCocktail; + EventManager.OnCreateVomiting += CreateVomiting; EventManager.OnCreateMushroom += CreateMushroom; EventManager.OnLevelUp += CreateChest; } @@ -59,6 +64,7 @@ namespace BlueWater.Tycoons EventManager.OnMakeCocktailCompleted -= AddInstanceCocktail; EventManager.OnCocktailServedToCustomer -= RemoveInstanceCocktail; EventManager.OnCocktailDiscarded -= RemoveInstanceCocktail; + EventManager.OnCreateVomiting -= CreateVomiting; EventManager.OnCreateMushroom -= CreateMushroom; EventManager.OnLevelUp -= CreateChest; } @@ -117,18 +123,31 @@ namespace BlueWater.Tycoons return instanceCount < orderedCount; } - private void PrintInstanceCocktailDatas() + [Button("구토 생성")] + public void CreateVomiting(Vector3 spawnPosition) { - foreach (var element in InstanceCocktailDatas) + var vomitingObject = Instantiate(_vomitingObject, spawnPosition, _vomitingObject.transform.rotation); + vomitingObject.Initialize(); + VomitCount++; + if (VomitCount >= 3) { - print($"key : {element.Key}, Value : {element.Value}"); + var random = Random.Range(0, 101); + if (random <= 20) + { + EventManager.InvokeCreateMushroom(); + } + else + { + EventManager.InvokeCreateMold(); + } + VomitCount = 0; } - print("\n"); } + [Button("버섯 생성")] public void CreateMushroom() { - var spawnPosition = Utils.RandomPositionOnGraph(); + var spawnPosition = Utils.RandomPositionOnGraph(1); var mushroom = Instantiate(_mushroomObject, spawnPosition, _mushroomObject.transform.rotation); mushroom.Initialize(); } @@ -138,7 +157,7 @@ namespace BlueWater.Tycoons { if (levelData.Idx == "1") return; - var spawnPosition = Utils.RandomPositionOnGraph(); + var spawnPosition = Utils.RandomPositionOnGraph(1); var rewardBox = levelData.RewardBoxType switch { diff --git a/Assets/02.Scripts/TycoonCameraManager.cs b/Assets/02.Scripts/TycoonCameraManager.cs index 51449a63e..84ae32fa0 100644 --- a/Assets/02.Scripts/TycoonCameraManager.cs +++ b/Assets/02.Scripts/TycoonCameraManager.cs @@ -196,6 +196,11 @@ namespace BlueWater ); } + public float GetCurrentBaseCameraDistance() + { + return _baseCameraComposer.CameraDistance; + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs index 732cbe057..18d712640 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using BlueWater.Npcs.Customers; @@ -197,7 +198,7 @@ namespace BlueWater.Uis { EventManager.OnShowResult += Open; EventManager.OnCheckedSkin += AddCustomerCount; - EventManager.OnOrderResult += AddServingCount; + EventManager.OnSucceedServing += AddServingCount; EventManager.OnMissedServing += AddMissedServingCount; EventManager.OnCleaningResult += AddCleaningCount; EventManager.OnAddedGold += AddGoldCount; @@ -234,7 +235,7 @@ namespace BlueWater.Uis { EventManager.OnShowResult -= Open; EventManager.OnCheckedSkin -= AddCustomerCount; - EventManager.OnOrderResult -= AddServingCount; + EventManager.OnSucceedServing -= AddServingCount; EventManager.OnMissedServing -= AddMissedServingCount; EventManager.OnCleaningResult -= AddCleaningCount; EventManager.OnAddedGold -= AddGoldCount; @@ -442,12 +443,12 @@ namespace BlueWater.Uis case 1: _pumpkinCount++; break; - default: - break; + default:; + throw new Exception("손님 스킨 인덱스 오류"); } } - private void AddServingCount(Customer orderedCustomer, bool orderedCorrected) + private void AddServingCount(bool orderedCorrected) { if (orderedCorrected) { @@ -459,7 +460,7 @@ namespace BlueWater.Uis } } - private void AddMissedServingCount() => _failedServingCount++; + private void AddMissedServingCount() => _missServingCount++; private void AddCleaningCount(bool isSucceed) { diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike.meta b/Assets/03.Images/Ui/Tycoon/Card.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike.meta rename to Assets/03.Images/Ui/Tycoon/Card.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/AllCleanUp.png b/Assets/03.Images/Ui/Tycoon/Card/AllCleanUp.png new file mode 100644 index 000000000..a393b1ddb Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/AllCleanUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/AllCleanUp.png.meta b/Assets/03.Images/Ui/Tycoon/Card/AllCleanUp.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/AllCleanUp.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/AllCleanUp.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/AllCustomerPurification.png b/Assets/03.Images/Ui/Tycoon/Card/AllCustomerPurification.png new file mode 100644 index 000000000..55a6db6ae Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/AllCustomerPurification.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/AllCustomerPurification.png.meta b/Assets/03.Images/Ui/Tycoon/Card/AllCustomerPurification.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/AllCustomerPurification.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/AllCustomerPurification.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/AllLiquidAdd.png b/Assets/03.Images/Ui/Tycoon/Card/AllLiquidAdd.png new file mode 100644 index 000000000..abfde076d Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/AllLiquidAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/AllLiquidAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Card/AllLiquidAdd.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/AllLiquidAdd.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/AllLiquidAdd.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/BarrelAutoSupply.png b/Assets/03.Images/Ui/Tycoon/Card/BarrelAutoSupply.png new file mode 100644 index 000000000..e51fb92b0 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/BarrelAutoSupply.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/BarrelAutoSupply.png.meta b/Assets/03.Images/Ui/Tycoon/Card/BarrelAutoSupply.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/BarrelAutoSupply.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/BarrelAutoSupply.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcAdd.png new file mode 100644 index 000000000..6429bd1e3 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcAdd.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcAdd.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/BartenderNpcAdd.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcUpgrade.png new file mode 100644 index 000000000..6d6e78ac7 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcUpgrade.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcUpgrade.png.meta b/Assets/03.Images/Ui/Tycoon/Card/BartenderNpcUpgrade.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcUpgrade.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/BartenderNpcUpgrade.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png b/Assets/03.Images/Ui/Tycoon/Card/Card_CountDisabled.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png rename to Assets/03.Images/Ui/Tycoon/Card/Card_CountDisabled.png diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Card_CountDisabled.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Card_CountDisabled.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png b/Assets/03.Images/Ui/Tycoon/Card/Card_CountEnabled.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png rename to Assets/03.Images/Ui/Tycoon/Card/Card_CountEnabled.png diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Card_CountEnabled.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Card_CountEnabled.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcAdd.png new file mode 100644 index 000000000..d8e20b7d4 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcAdd.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcAdd.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/CleanerNpcAdd.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcUpgrade.png new file mode 100644 index 000000000..e25ea4cdc Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcUpgrade.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcUpgrade.png.meta b/Assets/03.Images/Ui/Tycoon/Card/CleanerNpcUpgrade.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcUpgrade.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/CleanerNpcUpgrade.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/DashCooldownReduction.png b/Assets/03.Images/Ui/Tycoon/Card/DashCooldownReduction.png new file mode 100644 index 000000000..f4970df27 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/DashCooldownReduction.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/DashCooldownReduction.png.meta b/Assets/03.Images/Ui/Tycoon/Card/DashCooldownReduction.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/DashCooldownReduction.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/DashCooldownReduction.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/EndGoldBoost.png b/Assets/03.Images/Ui/Tycoon/Card/EndGoldBoost.png new file mode 100644 index 000000000..a96a94f73 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/EndGoldBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/EndGoldBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Card/EndGoldBoost.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/EndGoldBoost.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/EndGoldBoost.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/ExpBoost.png b/Assets/03.Images/Ui/Tycoon/Card/ExpBoost.png new file mode 100644 index 000000000..f6698a927 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/ExpBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/ExpBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Card/ExpBoost.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/ExpBoost.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/ExpBoost.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame.meta b/Assets/03.Images/Ui/Tycoon/Card/Frame.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame.meta rename to Assets/03.Images/Ui/Tycoon/Card/Frame.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameBack.png b/Assets/03.Images/Ui/Tycoon/Card/Frame/FrameBack.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameBack.png rename to Assets/03.Images/Ui/Tycoon/Card/Frame/FrameBack.png diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameBack.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Frame/FrameBack.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameBack.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Frame/FrameBack.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameFront.png b/Assets/03.Images/Ui/Tycoon/Card/Frame/FrameFront.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameFront.png rename to Assets/03.Images/Ui/Tycoon/Card/Frame/FrameFront.png diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameFront.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Frame/FrameFront.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame/FrameFront.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Frame/FrameFront.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/FullHeartRecovery.png b/Assets/03.Images/Ui/Tycoon/Card/FullHeartRecovery.png new file mode 100644 index 000000000..8d36c5185 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/FullHeartRecovery.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/FullHeartRecovery.png.meta b/Assets/03.Images/Ui/Tycoon/Card/FullHeartRecovery.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/FullHeartRecovery.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/FullHeartRecovery.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/GaugeTimeUp.png b/Assets/03.Images/Ui/Tycoon/Card/GaugeTimeUp.png new file mode 100644 index 000000000..f0a1983a4 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/GaugeTimeUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/GaugeTimeUp.png.meta b/Assets/03.Images/Ui/Tycoon/Card/GaugeTimeUp.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/GaugeTimeUp.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/GaugeTimeUp.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/GoldBoost.png b/Assets/03.Images/Ui/Tycoon/Card/GoldBoost.png new file mode 100644 index 000000000..671165527 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/GoldBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/GoldBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Card/GoldBoost.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/GoldBoost.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/GoldBoost.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/HeartSlotPlus.png b/Assets/03.Images/Ui/Tycoon/Card/HeartSlotPlus.png new file mode 100644 index 000000000..8d29f5697 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/HeartSlotPlus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/HeartSlotPlus.png.meta b/Assets/03.Images/Ui/Tycoon/Card/HeartSlotPlus.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/HeartSlotPlus.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/HeartSlotPlus.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive.meta b/Assets/03.Images/Ui/Tycoon/Card/Passive.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Passive.meta rename to Assets/03.Images/Ui/Tycoon/Card/Passive.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveAutoGoldGain.png b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveAutoGoldGain.png new file mode 100644 index 000000000..23258cab3 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveAutoGoldGain.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveAutoGoldGain.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveAutoGoldGain.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveAutoGoldGain.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveAutoGoldGain.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveCleaningBonus.png b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveCleaningBonus.png new file mode 100644 index 000000000..0e899acbd Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveCleaningBonus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveCleaningBonus.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveCleaningBonus.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveCleaningBonus.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveCleaningBonus.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveDoubleServing.png b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveDoubleServing.png new file mode 100644 index 000000000..91c997a31 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveDoubleServing.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveDoubleServing.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveDoubleServing.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveDoubleServing.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveDoubleServing.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveMakingBonus.png b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveMakingBonus.png new file mode 100644 index 000000000..d54328e99 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveMakingBonus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveMakingBonus.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveMakingBonus.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveMakingBonus.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveMakingBonus.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveRandomChange.png b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveRandomChange.png new file mode 100644 index 000000000..aa5a63b52 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveRandomChange.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveRandomChange.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveRandomChange.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveRandomChange.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveRandomChange.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveServingBonus.png b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveServingBonus.png new file mode 100644 index 000000000..e1984c74c Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveServingBonus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveServingBonus.png.meta b/Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveServingBonus.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveServingBonus.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/Passive/PassiveServingBonus.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/ServerNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Card/ServerNpcAdd.png new file mode 100644 index 000000000..d94fd74bb Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/ServerNpcAdd.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcAdd.png.meta b/Assets/03.Images/Ui/Tycoon/Card/ServerNpcAdd.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcAdd.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/ServerNpcAdd.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/ServerNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Card/ServerNpcUpgrade.png new file mode 100644 index 000000000..8ee3b4358 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/ServerNpcUpgrade.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcUpgrade.png.meta b/Assets/03.Images/Ui/Tycoon/Card/ServerNpcUpgrade.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcUpgrade.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/ServerNpcUpgrade.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/SoldOut.png b/Assets/03.Images/Ui/Tycoon/Card/SoldOut.png similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/SoldOut.png rename to Assets/03.Images/Ui/Tycoon/Card/SoldOut.png diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/SoldOut.png.meta b/Assets/03.Images/Ui/Tycoon/Card/SoldOut.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/SoldOut.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/SoldOut.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/SpeedBoost.png b/Assets/03.Images/Ui/Tycoon/Card/SpeedBoost.png new file mode 100644 index 000000000..6790e0613 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/SpeedBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/SpeedBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Card/SpeedBoost.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/SpeedBoost.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/SpeedBoost.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Card/TipBoost.png b/Assets/03.Images/Ui/Tycoon/Card/TipBoost.png new file mode 100644 index 000000000..2b167b796 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Card/TipBoost.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/TipBoost.png.meta b/Assets/03.Images/Ui/Tycoon/Card/TipBoost.png.meta similarity index 100% rename from Assets/03.Images/Ui/Tycoon/Roguelike/TipBoost.png.meta rename to Assets/03.Images/Ui/Tycoon/Card/TipBoost.png.meta diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/AllCleanUp.png b/Assets/03.Images/Ui/Tycoon/Roguelike/AllCleanUp.png deleted file mode 100644 index 72539ed5a..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/AllCleanUp.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/AllCustomerPurification.png b/Assets/03.Images/Ui/Tycoon/Roguelike/AllCustomerPurification.png deleted file mode 100644 index 89f3bda9e..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/AllCustomerPurification.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/AllLiquidAdd.png b/Assets/03.Images/Ui/Tycoon/Roguelike/AllLiquidAdd.png deleted file mode 100644 index c0ab1accb..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/AllLiquidAdd.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/BarrelAutoSupply.png b/Assets/03.Images/Ui/Tycoon/Roguelike/BarrelAutoSupply.png deleted file mode 100644 index 35fe451b0..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/BarrelAutoSupply.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcAdd.png deleted file mode 100644 index 44ba4e7fc..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcAdd.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcUpgrade.png deleted file mode 100644 index 06303bc34..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/BartenderNpcUpgrade.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcAdd.png deleted file mode 100644 index 87babe024..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcAdd.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcUpgrade.png deleted file mode 100644 index 9fed154c0..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/CleanerNpcUpgrade.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/DashCooldownReduction.png b/Assets/03.Images/Ui/Tycoon/Roguelike/DashCooldownReduction.png deleted file mode 100644 index 97918b0e6..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/DashCooldownReduction.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/EndGoldBoost.png b/Assets/03.Images/Ui/Tycoon/Roguelike/EndGoldBoost.png deleted file mode 100644 index 3606c8145..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/EndGoldBoost.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/ExpBoost.png b/Assets/03.Images/Ui/Tycoon/Roguelike/ExpBoost.png deleted file mode 100644 index 9ef3e8d79..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/ExpBoost.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/FullHeartRecovery.png b/Assets/03.Images/Ui/Tycoon/Roguelike/FullHeartRecovery.png deleted file mode 100644 index 137b987a0..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/FullHeartRecovery.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/GaugeTimeUp.png b/Assets/03.Images/Ui/Tycoon/Roguelike/GaugeTimeUp.png deleted file mode 100644 index d6c69c288..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/GaugeTimeUp.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/GoldBoost.png b/Assets/03.Images/Ui/Tycoon/Roguelike/GoldBoost.png deleted file mode 100644 index 3eed32fc3..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/GoldBoost.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/HeartSlotPlus.png b/Assets/03.Images/Ui/Tycoon/Roguelike/HeartSlotPlus.png deleted file mode 100644 index d07e536ee..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/HeartSlotPlus.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old.meta deleted file mode 100644 index 87543279f..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb61a3818316dfc44913745f71d712b6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddAllLiquid.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddAllLiquid.png deleted file mode 100644 index 7400f96c8..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddAllLiquid.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddAllLiquid.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddAllLiquid.png.meta deleted file mode 100644 index 7793f83d0..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddAllLiquid.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: 284734c4624b35b499152e028f90e6f6 -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: - - serializedVersion: 2 - name: AddAllLiquid_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1024 - height: 1024 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 16e7929403eb41d47a15b1f14a3fdf8d - internalID: -254146654 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: d1b704d6b847fbc4fb98f9d6cafe62ad - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - AddAllLiquid_0: -254146654 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish1.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish1.png deleted file mode 100644 index 8a5fd5cf3..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish1.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish1.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish1.png.meta deleted file mode 100644 index 9ffbd2cea..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish1.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: 4708f67b3712d4743af7cb6092edf3c7 -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: - - serializedVersion: 2 - name: AddGanish1_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1024 - height: 1024 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 32d439fcac266a2499025b0247d9ccbb - internalID: 1704811524 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 8856fbf45b6399e4ba69a71f1303a365 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - AddGanish1_0: 1704811524 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish2.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish2.png deleted file mode 100644 index 306846825..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish2.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish2.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish2.png.meta deleted file mode 100644 index f97fa7c57..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddGarnish2.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 70238c4151e9085429d18be7f6f8a2ae -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/Roguelike/Old/AddLiquidB.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidB.png deleted file mode 100644 index 28f2c9fb9..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidB.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidB.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidB.png.meta deleted file mode 100644 index 5227ec693..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidB.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: b1b88ceef90370a4295ed9f58140349a -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/Roguelike/Old/AddLiquidC.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidC.png deleted file mode 100644 index f272a3256..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidC.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidC.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidC.png.meta deleted file mode 100644 index 665bdcb77..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidC.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: d9dbcf5d304083541a40ff4b3cb9048f -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/Roguelike/Old/AddLiquidD.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidD.png deleted file mode 100644 index 0a24f7f92..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidD.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidD.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidD.png.meta deleted file mode 100644 index 9d49d77fd..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidD.png.meta +++ /dev/null @@ -1,170 +0,0 @@ -fileFormatVersion: 2 -guid: 45e4676179dde7e42bb09b8d94935f34 -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: - - serializedVersion: 2 - name: AddLiquidD_0 - rect: - serializedVersion: 2 - x: 400 - y: 468 - width: 229 - height: 374 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: efdb2756a4bd66b43aeffcf9aab0ebc3 - internalID: -667892039 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 3b1c37614f8f29449bef26962781e4a9 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - AddLiquidD_0: -667892039 - AddLiquidD_1: -1982838524 - AddLiquidD_2: 1199438138 - AddLiquidD_3: 1297094540 - AddLiquidD_4: -642381366 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidE.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidE.png deleted file mode 100644 index 564d03c0d..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidE.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidE.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidE.png.meta deleted file mode 100644 index 8ec3a7313..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/AddLiquidE.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 58964556f1712324b9d9ac4515f965aa -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/Roguelike/Old/CardUpgradeSprite.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CardUpgradeSprite.png deleted file mode 100644 index c626fab79..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CardUpgradeSprite.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CardUpgradeSprite.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CardUpgradeSprite.png.meta deleted file mode 100644 index 9c3c2404e..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CardUpgradeSprite.png.meta +++ /dev/null @@ -1,646 +0,0 @@ -fileFormatVersion: 2 -guid: b11ff3cf4cd558e45ba44a568cbec05e -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: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - 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 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: CardUpgradeSprite_0 - rect: - serializedVersion: 2 - x: 0 - y: 4320 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c8db6cc448f395643ac2b83466a17756 - internalID: -514270279 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_1 - rect: - serializedVersion: 2 - x: 1920 - y: 4320 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9787d63091ad4a6418a173fa98081aa0 - internalID: 2029891232 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_2 - rect: - serializedVersion: 2 - x: 3840 - y: 4320 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8dd8479a95cab4f448b9d4e25d4d191b - internalID: -412110272 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_3 - rect: - serializedVersion: 2 - x: 5760 - y: 4320 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e7ba6c117d412b140982d43166d9a680 - internalID: -1542280465 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_4 - rect: - serializedVersion: 2 - x: 7680 - y: 4320 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c6bfaca0ca8c9b04d851619ff88d8df9 - internalID: -2081813130 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_5 - rect: - serializedVersion: 2 - x: 0 - y: 3240 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 1f8510966f1233544bd4d8de27045142 - internalID: 1792130637 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_6 - rect: - serializedVersion: 2 - x: 1920 - y: 3240 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 986bf4e2201699e4cb87e1d73f605f47 - internalID: -1812076872 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_7 - rect: - serializedVersion: 2 - x: 3840 - y: 3240 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 6853eb4d083ed4f42a0d3b43fb5b08b0 - internalID: 886722811 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_8 - rect: - serializedVersion: 2 - x: 5760 - y: 3240 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2450fea27bf21cf4d960c8b473ebd0d9 - internalID: 1413906995 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_9 - rect: - serializedVersion: 2 - x: 7680 - y: 3240 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 417745c63d348304d9a89c1501c6f32f - internalID: 1247144302 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_10 - rect: - serializedVersion: 2 - x: 0 - y: 2160 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: dde5e6b0ff4556d4a866a3d1163024cc - internalID: 1877791573 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_11 - rect: - serializedVersion: 2 - x: 1920 - y: 2160 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 76a8ca4bab6a5c54cb3ead4b211be4e7 - internalID: -1962258449 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_12 - rect: - serializedVersion: 2 - x: 3840 - y: 2160 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 558db8a4502c4f4438e820402e11ec19 - internalID: 301147385 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_13 - rect: - serializedVersion: 2 - x: 5760 - y: 2160 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a78dff3d8d7999c4e8ab40a34ffaa880 - internalID: -401079672 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_14 - rect: - serializedVersion: 2 - x: 7680 - y: 2160 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 90811b8a4f4a857489825d1f1ed6bf42 - internalID: 1932084080 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_15 - rect: - serializedVersion: 2 - x: 0 - y: 1080 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 1b11dd63ba5dea748a62019472c61126 - internalID: 382302681 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_16 - rect: - serializedVersion: 2 - x: 1920 - y: 1080 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e5952c03768fdc34da57bd4640c60897 - internalID: 1256381956 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_17 - rect: - serializedVersion: 2 - x: 3840 - y: 1080 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2e175636accf8a944ba84cd4965c9362 - internalID: 701231901 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_18 - rect: - serializedVersion: 2 - x: 5760 - y: 1080 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 353ba31ff0765ed4b9dac1b0e0ead10e - internalID: -447176599 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_19 - rect: - serializedVersion: 2 - x: 7680 - y: 1080 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ca294a6561731e74f9cdcc4b8aa8ff87 - internalID: -2135924175 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_20 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9af59f36ce68b204dadeb421c2678b62 - internalID: 2045533380 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_21 - rect: - serializedVersion: 2 - x: 1920 - y: 0 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9f49805404493984381025bc56512ba4 - internalID: 972430047 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: CardUpgradeSprite_22 - rect: - serializedVersion: 2 - x: 3840 - y: 0 - width: 1920 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ef8d29f3a3801de40b9295e66c787d89 - internalID: -1139900630 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: fb094edc058ff814381b15b73d5dee90 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - CardUpgradeSprite_0: -514270279 - CardUpgradeSprite_1: 2029891232 - CardUpgradeSprite_10: 1877791573 - CardUpgradeSprite_11: -1962258449 - CardUpgradeSprite_12: 301147385 - CardUpgradeSprite_13: -401079672 - CardUpgradeSprite_14: 1932084080 - CardUpgradeSprite_15: 382302681 - CardUpgradeSprite_16: 1256381956 - CardUpgradeSprite_17: 701231901 - CardUpgradeSprite_18: -447176599 - CardUpgradeSprite_19: -2135924175 - CardUpgradeSprite_2: -412110272 - CardUpgradeSprite_20: 2045533380 - CardUpgradeSprite_21: 972430047 - CardUpgradeSprite_22: -1139900630 - CardUpgradeSprite_3: -1542280465 - CardUpgradeSprite_4: -2081813130 - CardUpgradeSprite_5: 1792130637 - CardUpgradeSprite_6: -1812076872 - CardUpgradeSprite_7: 886722811 - CardUpgradeSprite_8: 1413906995 - CardUpgradeSprite_9: 1247144302 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ChefNpc.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ChefNpc.png deleted file mode 100644 index 5e151e397..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ChefNpc.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ChefNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ChefNpc.png.meta deleted file mode 100644 index 924189aa5..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ChefNpc.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 02ff51bea8718c447bea8470257b6782 -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/Roguelike/Old/CleanUp.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanUp.png deleted file mode 100644 index 925aaea91..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanUp.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanUp.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanUp.png.meta deleted file mode 100644 index 5ae5f9b8f..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanUp.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 1acb09a93fb040241a17107a288d6f54 -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/Roguelike/Old/CleanerNpc.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanerNpc.png deleted file mode 100644 index 4f961aa9c..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanerNpc.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanerNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanerNpc.png.meta deleted file mode 100644 index 65ba63e35..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/CleanerNpc.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 4d0b5b10aaf1d26438a2f013882ad1f6 -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/Roguelike/Old/ExpGetUp.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ExpGetUp.png deleted file mode 100644 index 011c05870..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ExpGetUp.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ExpGetUp.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ExpGetUp.png.meta deleted file mode 100644 index 6b7c7f0e2..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ExpGetUp.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 400a47b8bcd0a1e4b823160ce9f40232 -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/Roguelike/Old/Frame_Back.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Back.png deleted file mode 100644 index c4ffc0137..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Back.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Back.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Back.png.meta deleted file mode 100644 index ee7160a87..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Back.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: e7481c4658aa1544fabd8323173e4e6a -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: 2 - 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: - - serializedVersion: 2 - name: Frame_Back_0 - rect: - serializedVersion: 2 - x: 185 - y: 0 - width: 641 - height: 1024 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c8406de9d7ad9e14485353fdf13e2032 - internalID: 1160244810 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 6a148df6303e53a469a620422386fddd - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - Frame_Back_0: 1160244810 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Front.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Front.png deleted file mode 100644 index 40a06d4a0..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Front.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Front.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Front.png.meta deleted file mode 100644 index e7b69ff8d..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/Frame_Front.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: 98f18d9519d31f44d898c3b2289ab273 -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: 2 - 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: - - serializedVersion: 2 - name: Frame_Front_0 - rect: - serializedVersion: 2 - x: 186 - y: 0 - width: 641 - height: 1024 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8fc4f0adfef7e60489430ce2a498c519 - internalID: -479173315 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 690803adc9eed88469e078401d20df57 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - Frame_Front_0: -479173315 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GaugeReset.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GaugeReset.png deleted file mode 100644 index 9a693ac6b..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GaugeReset.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GaugeReset.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GaugeReset.png.meta deleted file mode 100644 index d5bf5c51f..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GaugeReset.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 1d6e6fd96eb499f42b79f04f3510af87 -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/Roguelike/Old/GoldGetup.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GoldGetup.png deleted file mode 100644 index ae6cf7f56..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GoldGetup.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GoldGetup.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GoldGetup.png.meta deleted file mode 100644 index c3c64ef7f..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/GoldGetup.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 121ed7da4e55d2a43ba798a00f95a474 -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/Roguelike/Old/HeartAllHeal.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartAllHeal.png deleted file mode 100644 index 07a6f9a3a..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartAllHeal.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartAllHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartAllHeal.png.meta deleted file mode 100644 index 1bdc4c2c8..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartAllHeal.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 7579ee4fd1c5ed34d939eeef18c625be -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/Roguelike/Old/HeartHeal.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartHeal.png deleted file mode 100644 index f69984a42..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartHeal.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartHeal.png.meta deleted file mode 100644 index e9c1d5b29..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartHeal.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 466393baecf741d449a05f3b63317368 -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/Roguelike/Old/HeartPlus.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartPlus.png deleted file mode 100644 index 6a68299de..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartPlus.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartPlus.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartPlus.png.meta deleted file mode 100644 index e8c911a48..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/HeartPlus.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: d0b6eba4ac33ece44bccd11e57e415e8 -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/Roguelike/Old/ServerNpc.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ServerNpc.png deleted file mode 100644 index 2a2d9c684..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ServerNpc.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ServerNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ServerNpc.png.meta deleted file mode 100644 index 689d5b65f..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/ServerNpc.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 21ac4e0eced0c8c4894e7e26f5d13779 -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/Roguelike/Old/SpeedUp.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/SpeedUp.png deleted file mode 100644 index ceb84ea8c..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/SpeedUp.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/SpeedUp.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/SpeedUp.png.meta deleted file mode 100644 index 2207b6ed2..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/SpeedUp.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 8de251475e5862f4b96ba45c2de88bd5 -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/Roguelike/Old/UpgradePopup.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/UpgradePopup.png deleted file mode 100644 index bb6b590fa..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/UpgradePopup.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/UpgradePopup.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Old/UpgradePopup.png.meta deleted file mode 100644 index d4c87bd3c..000000000 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Old/UpgradePopup.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: ea9a47744b51f7b46958a79a03d0cca6 -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 - 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/Roguelike/Passive/PassiveAutoGoldGain.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveAutoGoldGain.png deleted file mode 100644 index 642ba7020..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveAutoGoldGain.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveCleaningBonus.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveCleaningBonus.png deleted file mode 100644 index 82c75703e..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveCleaningBonus.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveDoubleServing.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveDoubleServing.png deleted file mode 100644 index 55971a3d8..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveDoubleServing.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveMakingBonus.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveMakingBonus.png deleted file mode 100644 index a497fbbfa..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveMakingBonus.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveRandomChange.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveRandomChange.png deleted file mode 100644 index c8a7723a7..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveRandomChange.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveServingBonus.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveServingBonus.png deleted file mode 100644 index c6c15cb63..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Passive/PassiveServingBonus.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcAdd.png b/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcAdd.png deleted file mode 100644 index 632031492..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcAdd.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcUpgrade.png b/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcUpgrade.png deleted file mode 100644 index bb78bdd1b..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/ServerNpcUpgrade.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/SpeedBoost.png b/Assets/03.Images/Ui/Tycoon/Roguelike/SpeedBoost.png deleted file mode 100644 index a17d693de..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/SpeedBoost.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/TipBoost.png b/Assets/03.Images/Ui/Tycoon/Roguelike/TipBoost.png deleted file mode 100644 index 00655917d..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/TipBoost.png and /dev/null differ diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index 6a086b486..2479df626 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -2734,7 +2734,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 67b65c315e59f5c4999be7c382414bf2, type: 2} + - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2792,13 +2792,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5725645196897356911} serializedVersion: 2 - m_LocalRotation: {x: -0.42810813, y: -0.545313, z: -0.38204312, w: 0.61106485} - m_LocalPosition: {x: -3.5605063, y: 3.8645315, z: -4.2742233} - m_LocalScale: {x: 2.1679962, y: 0.55805, z: 1.7105069} + m_LocalRotation: {x: -0.122787856, y: -0.6963643, z: -0.122787856, w: 0.6963643} + m_LocalPosition: {x: -1.72, y: 2.3, z: -1.66} + m_LocalScale: {x: 2.1679962, y: 0.55805, z: 2.21} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5005591991618624012} - m_LocalEulerAnglesHint: {x: -70.03, y: -83.491, z: 0} + m_LocalEulerAnglesHint: {x: -20, y: -90, z: 0} --- !u!33 &2391601687702815533 MeshFilter: m_ObjectHideFlags: 0 @@ -4287,7 +4287,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 67b65c315e59f5c4999be7c382414bf2, type: 2} + - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4582,6 +4582,114 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1 &7359827611587447093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6013088356132525363} + - component: {fileID: 3670216175789415651} + - component: {fileID: 5451035538689334075} + - component: {fileID: 5111249986990241778} + m_Layer: 19 + m_Name: SpawnObstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6013088356132525363 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359827611587447093} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8829561038016547888} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3670216175789415651 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359827611587447093} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5451035538689334075 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359827611587447093} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &5111249986990241778 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359827611587447093} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7411081930205196350 GameObject: m_ObjectHideFlags: 0 @@ -5594,7 +5702,7 @@ Transform: m_GameObject: {fileID: 8697754653569273504} serializedVersion: 2 m_LocalRotation: {x: 0.24184473, y: -0.24184473, z: 0.66446304, w: 0.66446304} - m_LocalPosition: {x: 2.79, y: 5, z: 1.8} + m_LocalPosition: {x: 2.79, y: 9.7, z: 5.7} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -5649,7 +5757,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 7, y: 20} + m_Size: {x: 14, y: 30} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -5674,7 +5782,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 7, y: 20, z: 0.20000005} + m_Size: {x: 14, y: 30, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &8854654418663393334 GameObject: @@ -6156,7 +6264,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.x - value: 10.358999 + value: 10.488 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.y @@ -6164,7 +6272,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -12.228 + value: -13.72 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -7797,7 +7905,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -11.3220005 + value: -11.293 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -9149,7 +9257,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -11.32 + value: -11.244 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -10291,7 +10399,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -11.185 + value: -11.150001 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -12320,7 +12428,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.x - value: 10.089 + value: 10.255 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.y @@ -13206,7 +13314,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -11.457 + value: -11.389 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -16165,7 +16273,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + insertIndex: -1 + addedObject: {fileID: 6013088356132525363} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} --- !u!4 &8829561038016547888 stripped diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab index 9e8b3af80..f20120a70 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab @@ -1,5 +1,113 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1356608997969100937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6183972536920323200} + - component: {fileID: 1446206865524832056} + - component: {fileID: 94450122680296831} + - component: {fileID: 4645578750748653826} + m_Layer: 19 + m_Name: SpawnObstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6183972536920323200 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1356608997969100937} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.1} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 809828747251277026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1446206865524832056 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1356608997969100937} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &94450122680296831 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1356608997969100937} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &4645578750748653826 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1356608997969100937} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5426810056585111802 GameObject: m_ObjectHideFlags: 0 @@ -260,6 +368,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: 2 addedObject: {fileID: 8688861165770414157} + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: 3 + addedObject: {fileID: 6183972536920323200} - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 8080204312657253144} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab index 0962c74df..feec05b06 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab @@ -376,6 +376,114 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4256360850443085757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7751730638849419946} + - component: {fileID: 2705315287183612200} + - component: {fileID: 7820935781356345446} + - component: {fileID: 1025501011419176266} + m_Layer: 19 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7751730638849419946 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4256360850443085757} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 0.35, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 524190737211815696} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2705315287183612200 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4256360850443085757} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7820935781356345446 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4256360850443085757} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1025501011419176266 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4256360850443085757} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5899113663160612507 GameObject: m_ObjectHideFlags: 0 @@ -647,7 +755,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 7751730638849419946} m_Father: {fileID: 809828747251277026} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!212 &7588633447038655794 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab index c43557513..7d7b9241e 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab @@ -1,5 +1,113 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &5271680023154263759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5612308083958494712} + - component: {fileID: 2155396961505667857} + - component: {fileID: 4241161743590594932} + - component: {fileID: 5195211361296202692} + m_Layer: 19 + m_Name: SpawnObstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5612308083958494712 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5271680023154263759} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.25} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 809828747251277026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2155396961505667857 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5271680023154263759} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4241161743590594932 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5271680023154263759} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &5195211361296202692 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5271680023154263759} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &7343451337687172630 PrefabInstance: m_ObjectHideFlags: 0 @@ -169,11 +277,13 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_RemovedGameObjects: - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: 2 + addedObject: {fileID: 5612308083958494712} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -295,6 +405,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 672328621937310823} m_Mesh: {fileID: 0} +--- !u!4 &809828747251277026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!1 &5897095096647521783 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab index ff39d3622..a951dab0b 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab @@ -1,5 +1,113 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3387633904202891137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2714873429799350134} + - component: {fileID: 3222480226908456848} + - component: {fileID: 2891474961961394885} + - component: {fileID: 7498752195477345329} + m_Layer: 19 + m_Name: SpawnObstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2714873429799350134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3387633904202891137} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.1} + m_LocalScale: {x: 1.2, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 809828747251277026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3222480226908456848 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3387633904202891137} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2891474961961394885 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3387633904202891137} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &7498752195477345329 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3387633904202891137} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6373979881487551315 GameObject: m_ObjectHideFlags: 0 @@ -266,6 +374,9 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: 2 + addedObject: {fileID: 2714873429799350134} - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 8080204312657253144} @@ -282,6 +393,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} +--- !u!4 &809828747251277026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!1 &5897095096647521783 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index c193eeba0..b7df73ced 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -1,5 +1,113 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &405301786318402700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2531320464686335032} + - component: {fileID: 7815421359583432647} + - component: {fileID: 4073134588208960255} + - component: {fileID: 2241071070352818384} + m_Layer: 19 + m_Name: SpawnObstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2531320464686335032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405301786318402700} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 809828747251277026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7815421359583432647 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405301786318402700} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4073134588208960255 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405301786318402700} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2241071070352818384 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405301786318402700} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &7343451337687172630 PrefabInstance: m_ObjectHideFlags: 0 @@ -164,7 +272,10 @@ PrefabInstance: - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_RemovedGameObjects: - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: 2 + addedObject: {fileID: 2531320464686335032} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -286,6 +397,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 672328621937310823} m_Mesh: {fileID: 0} +--- !u!4 &809828747251277026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!1 &5897095096647521783 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 05469f710..db7429d13 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.5.5 + bundleVersion: 0.3.5.6 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 4ff06573a..7b3c4b8f7 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -28,7 +28,7 @@ TagManager: - DamageableProps - Liquid - Garnish - - + - SpawnObstacle - - -