diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 812b369e5..64aafccb7 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -2309,6 +2309,58 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &186139407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 186139408} + - component: {fileID: 186139409} + m_Layer: 5 + m_Name: SelectCardUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &186139408 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186139407} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 737939132} + m_Father: {fileID: 1049919592} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &186139409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186139407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dd7358ce993836479029d580437bb79, type: 3} + m_Name: + m_EditorClassIdentifier: + card01: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + card02: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + card03: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} --- !u!1 &204218137 GameObject: m_ObjectHideFlags: 0 @@ -7035,6 +7087,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 713557313} m_CullTransparentMesh: 1 +--- !u!1001 &737939131 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 186139408} + m_Modifications: + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_Name + value: Card + objectReference: {fileID: 0} + - target: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3} +--- !u!224 &737939132 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + m_PrefabInstance: {fileID: 737939131} + m_PrefabAsset: {fileID: 0} --- !u!1001 &738295682 PrefabInstance: m_ObjectHideFlags: 0 @@ -9736,6 +9894,7 @@ RectTransform: - {fileID: 1733600342} - {fileID: 1909799357} - {fileID: 2032162537} + - {fileID: 186139408} - {fileID: 2055805161} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/02.Scripts/DataManager.cs b/Assets/02.Scripts/DataManager.cs index 654ced3c2..c1ea8e01e 100644 --- a/Assets/02.Scripts/DataManager.cs +++ b/Assets/02.Scripts/DataManager.cs @@ -1,6 +1,3 @@ - using System; -using System.Collections.Generic; -using BlueWater.Items; using BlueWater.Tycoons; using Sirenix.OdinInspector; using UnityEngine; @@ -34,30 +31,7 @@ namespace BlueWater public void TestData() { - Inventory.AddItem(new ItemSlot("10107", 2)); - Inventory.AddItem(new ItemSlot("10108", 1)); - Inventory.AddItem(new ItemSlot("10109", 2)); - Inventory.AddItem(new ItemSlot("10201", 1)); - Inventory.AddItem(new ItemSlot("10404", 9)); - Inventory.AddItem(new ItemSlot("10503", 4)); - Inventory.AddItem(new ItemSlot("10507", 15)); - Inventory.AddItem(new ItemSlot("10508", 100)); - Inventory.AddItem(new ItemSlot("10603", 3)); - Inventory.AddItem(new ItemSlot("10701", 999)); - Inventory.AddItem(new ItemSlot("10704", 5396)); - Inventory.AddItem(new ItemSlot("10705", 66)); - Inventory.AddItem(new ItemSlot("10706", 35)); - Inventory.AddItem(new ItemSlot("60001", 2)); - TycoonData.AddFoodRecipe("30001"); - TycoonData.AddFoodRecipe("30002"); - TycoonData.AddFoodRecipe("30004"); - TycoonData.AddFoodRecipe("30005"); - TycoonData.AddFoodRecipe("30006"); - - TycoonData.AddDrinkRecipe("Drink001"); - TycoonData.AddDrinkRecipe("Drink002"); - TycoonData.AddDrinkRecipe("Ice001"); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index b4ea161e5..d3bdb73cd 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -17,15 +17,15 @@ MonoBehaviour: k__BackingField: k__BackingField: HeartPlus k__BackingField: HeartPlusImg - k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uCD94\uAC00" - k__BackingField: 10 + k__BackingField: "\uD558\uD2B8 \uD55C\uCE78 \uCD94\uAC00" + k__BackingField: 5 k__BackingField: 5 k__BackingField: {fileID: 21300000, guid: d0b6eba4ac33ece44bccd11e57e415e8, type: 3} - k__BackingField: HeartHeal k__BackingField: k__BackingField: HeartHeal k__BackingField: HeartHealImg - k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uD68C\uBCF5" + k__BackingField: "\uD558\uD2B8 \uD55C\uCE78 \uD68C\uBCF5" k__BackingField: 10 k__BackingField: 10 k__BackingField: {fileID: 21300000, guid: 466393baecf741d449a05f3b63317368, type: 3} @@ -60,7 +60,7 @@ MonoBehaviour: k__BackingField: "D \uC220\uC744 4000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 5 - k__BackingField: {fileID: -667892039, guid: 45e4676179dde7e42bb09b8d94935f34, type: 3} + k__BackingField: {fileID: 21300000, guid: 45e4676179dde7e42bb09b8d94935f34, type: 3} - k__BackingField: AddLiquidE k__BackingField: k__BackingField: AddLiquidE @@ -92,7 +92,7 @@ MonoBehaviour: k__BackingField: "\uC804\uCCB4 \uC7AC\uB8CC 1000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 10 - k__BackingField: {fileID: -254146654, guid: 284734c4624b35b499152e028f90e6f6, type: 3} + k__BackingField: {fileID: 21300000, guid: 284734c4624b35b499152e028f90e6f6, type: 3} - k__BackingField: ServerNpc k__BackingField: k__BackingField: ServerNpc @@ -100,7 +100,7 @@ MonoBehaviour: k__BackingField: "\uC11C\uBE59 \uC885\uC5C5\uC6D0 \uCD94\uAC00" k__BackingField: 5 k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 02ff51bea8718c447bea8470257b6782, type: 3} + k__BackingField: {fileID: 21300000, guid: 21ac4e0eced0c8c4894e7e26f5d13779, type: 3} - k__BackingField: CleanerNpc k__BackingField: k__BackingField: CleanerNpc @@ -108,7 +108,7 @@ MonoBehaviour: k__BackingField: "\uCCAD\uC18C \uC885\uC5C5\uC6D0 \uCD94\uAC00" k__BackingField: 5 k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 02ff51bea8718c447bea8470257b6782, type: 3} + k__BackingField: {fileID: 21300000, guid: 4d0b5b10aaf1d26438a2f013882ad1f6, type: 3} - k__BackingField: ChefNpc k__BackingField: k__BackingField: ChefNpc @@ -125,7 +125,7 @@ MonoBehaviour: 5% \uC99D\uAC00" k__BackingField: 10 k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 1acb09a93fb040241a17107a288d6f54, type: 3} + k__BackingField: {fileID: 21300000, guid: 8de251475e5862f4b96ba45c2de88bd5, type: 3} - k__BackingField: ExpGetUp k__BackingField: k__BackingField: ExpGetUp @@ -150,12 +150,12 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 5 k__BackingField: {fileID: 21300000, guid: 1acb09a93fb040241a17107a288d6f54, type: 3} - - k__BackingField: GuageReset + - k__BackingField: GaugeReset k__BackingField: - k__BackingField: GuageReset - k__BackingField: GuageResetImg + k__BackingField: GaugeReset + k__BackingField: GaugeResetImg k__BackingField: "\uBAA8\uB4E0 \uC190\uB2D8\uB4E4\uC758 \uAE30\uB2E4\uB9BC \uCD08\uAE30\uD654" k__BackingField: 0 k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 74feb2405992b004f9937758b66f9668, type: 3} + k__BackingField: {fileID: 0} diff --git a/Assets/02.Scripts/ScriptableObject/StageData.asset b/Assets/02.Scripts/ScriptableObject/StageData.asset index 2989841a2..900047734 100644 --- a/Assets/02.Scripts/ScriptableObject/StageData.asset +++ b/Assets/02.Scripts/ScriptableObject/StageData.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: StageData m_EditorClassIdentifier: k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 + k__BackingField: 10 + k__BackingField: 30 + k__BackingField: 20 k__BackingField: 30 diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs index 160a39835..34b8a6829 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs @@ -184,7 +184,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH float t = (1.0f - _returnSpeedTime); t = 1 - Mathf.Pow(2, -10 * t); - _cardComTransform.localScale = Vector2.Lerp(initialScale, targetScale, t); + _cardComTransform.localScale = Vector3.Lerp(initialScale, targetScale, t); yield return null; } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index c2ec6ca0c..8d8ae0dcd 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -151,7 +151,7 @@ namespace BlueWater.Uis case "ExpGetUp": return; break; case "GoldGetUp": return; break; case "CleanUp": return; break; - case "GuageReset": return; break; + case "GaugeReset": return; break; default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return; break; } diff --git a/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png.meta b/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png.meta index 0d199c635..d4a64b1fc 100644 --- a/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png.meta +++ b/Assets/03.Images/Ui/Tycoon/CustomerBalloon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe306df97c6ccf34599e403eb74474fe +guid: b93d1d9adc811a74fb4192ade70fd3cc TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png b/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png deleted file mode 100644 index 6ea12ee9c..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png index 4df9d71c0..7400f96c8 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png and b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta index 0909ce137..7793f83d0 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta @@ -43,12 +43,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png deleted file mode 100644 index a2d633b8a..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png new file mode 100644 index 000000000..fd71e5e6b Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png.meta similarity index 80% rename from Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png.meta index 4f8c351b9..9ffbd2cea 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish1.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png index 14589c8de..306846825 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png and b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta index 35adbd959..f97fa7c57 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png index 66b4e86e8..28f2c9fb9 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta index 7b5458f8e..5227ec693 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png index df5e86437..f272a3256 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta index 08d2ce7d6..665bdcb77 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png index dbebba620..0a24f7f92 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta index 20f1387db..9d49d77fd 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta @@ -43,12 +43,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png index f1adbcb53..564d03c0d 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta index 3ad529c64..8ec3a7313 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png index a6df75c72..5e151e397 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png and b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta index e52bea40a..924189aa5 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png index 27178f5ca..138ac1cf7 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png and b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta index 649911570..5ae5f9b8f 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png new file mode 100644 index 000000000..4f961aa9c Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png differ diff --git a/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png.meta similarity index 98% rename from Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png.meta index 2d086d896..65ba63e35 100644 --- a/Assets/03.Images/Ui/Tycoon/CustomerBalloonBackground.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/CleanerNpc.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 252c4a717c0f082459089793566b412f +guid: 4d0b5b10aaf1d26438a2f013882ad1f6 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png index f57badb6d..011c05870 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png and b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta index 6fe616dfd..6b7c7f0e2 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta index 8bcb63fa0..ee7160a87 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta index 8680cd49d..e7b69ff8d 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png new file mode 100644 index 000000000..4baf93aad Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png.meta similarity index 76% rename from Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png.meta index 6a0e06044..d5bf5c51f 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/GaugeReset.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 74feb2405992b004f9937758b66f9668 +guid: 1d6e6fd96eb499f42b79f04f3510af87 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png index c399ab36e..f69e1dbaf 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png and b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta index 4ee2d06e0..c3c64ef7f 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png b/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png deleted file mode 100644 index 36a9efe7e..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png index e4129207c..07a6f9a3a 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png and b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta index f0b04bc98..1bdc4c2c8 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png index a73c1eefc..f69984a42 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png and b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta index e9904d5b3..e9c1d5b29 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png index e240fe8e0..6a68299de 100644 Binary files a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png and b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta index 5ac769a67..e8c911a48 100644 --- a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -93,6 +93,32 @@ TextureImporter: 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: [] diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png new file mode 100644 index 000000000..d0c4d8f85 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png.meta new file mode 100644 index 000000000..689d5b65f --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ServerNpc.png.meta @@ -0,0 +1,143 @@ +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/Loglike/SpeedUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png new file mode 100644 index 000000000..ceb84ea8c Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png.meta new file mode 100644 index 000000000..2207b6ed2 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/SpeedUp.png.meta @@ -0,0 +1,143 @@ +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/Resources/Excel/CardDataTable.xlsx b/Assets/Resources/Excel/CardDataTable.xlsx index 23bf56018..1031d7da1 100644 Binary files a/Assets/Resources/Excel/CardDataTable.xlsx and b/Assets/Resources/Excel/CardDataTable.xlsx differ diff --git a/Assets/Resources/JSON/CardDataTable.json b/Assets/Resources/JSON/CardDataTable.json index fa17eed8b..1e8d84957 100644 --- a/Assets/Resources/JSON/CardDataTable.json +++ b/Assets/Resources/JSON/CardDataTable.json @@ -2,14 +2,14 @@ { "Idx": "HeartPlus", "Img": "HeartPlusImg", - "ScriptText": "하트 하나 추가", - "Max": 10, + "ScriptText": "하트 한칸 추가", + "Max": 5, "Ratio": 5 }, { "Idx": "HeartHeal", "Img": "HeartHealImg", - "ScriptText": "하트 하나 회복", + "ScriptText": "하트 한칸 회복", "Max": 10, "Ratio": 10 }, @@ -119,8 +119,8 @@ "Ratio": 5 }, { - "Idx": "GuageReset", - "Img": "GuageResetImg", + "Idx": "GaugeReset", + "Img": "GaugeResetImg", "ScriptText": "모든 손님들의 기다림 초기화", "Max": 0, "Ratio": 5