diff --git a/Assets/Art/Upgrade9Slice-v1.png b/Assets/Art/Upgrade9Slice-v1.png new file mode 100644 index 0000000..6e4670e Binary files /dev/null and b/Assets/Art/Upgrade9Slice-v1.png differ diff --git a/Assets/Art/Upgrade9Slice-v1.png.meta b/Assets/Art/Upgrade9Slice-v1.png.meta new file mode 100644 index 0000000..d877eaf --- /dev/null +++ b/Assets/Art/Upgrade9Slice-v1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: fd64923844b14084ead7988cb85f3f18 +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: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3 + spriteBorder: {x: 6, y: 6, z: 6, w: 6} + 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: 0 + 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: WebGL + 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: c8ef6e86da535ff46acabd12342bcda7 + internalID: -702473764 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: + - key: SpriteEditor.SliceSettings + value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":64.0,"y":64.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":1,"keepEmptyRects":false,"isAlternate":false}' + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/UI-BrownMat.mat b/Assets/Materials/UI-BrownMat.mat index 2ad55a3..fda61ef 100644 --- a/Assets/Materials/UI-BrownMat.mat +++ b/Assets/Materials/UI-BrownMat.mat @@ -118,8 +118,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.509434, g: 0.29217535, b: 0.1273585, a: 0.3137255} - - _Color: {r: 0.509434, g: 0.29217532, b: 0.12735847, a: 0.3137255} + - _BaseColor: {r: 0.30980393, g: 0.19607843, b: 0.10980392, a: 1} + - _Color: {r: 0.3098039, g: 0.19607839, b: 0.10980389, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI-WhiteText.mat b/Assets/Materials/UI-WhiteText.mat new file mode 100644 index 0000000..1dd45ba --- /dev/null +++ b/Assets/Materials/UI-WhiteText.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI-WhiteText + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} + - _Color: {r: 0.9686274, g: 0.945098, b: 0.8862745, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &4849881747461813350 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/Materials/UI-WhiteText.mat.meta b/Assets/Materials/UI-WhiteText.mat.meta new file mode 100644 index 0000000..2b2c930 --- /dev/null +++ b/Assets/Materials/UI-WhiteText.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ae1565c971ab08479d9a158f290bbb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Items/Items.asset b/Assets/Prefabs/Items/Items.asset index b6b8ee7..b3e64ea 100644 --- a/Assets/Prefabs/Items/Items.asset +++ b/Assets/Prefabs/Items/Items.asset @@ -17,47 +17,173 @@ MonoBehaviour: CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 23e3bfe33d8c6004c85fd638db567ab6, type: 3} - MinMoney: 0.5 - MaxMoney: 1.5 + MinMoney: 1 + MaxMoney: 5 - Type: 2 CustomBehaviour: 1 Prefab: {fileID: 8799415981405337049, guid: c21e0b5539573904cb10d979de4a3f72, type: 3} - MinMoney: 3 - MaxMoney: 7 + MinMoney: 1 + MaxMoney: 5 - Type: 3 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 5e1f7f5d4294c1d4fa3e6f88dec0dfa6, type: 3} - MinMoney: 12 - MaxMoney: 18 + MinMoney: 1 + MaxMoney: 5 - Type: 4 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: b224b6df33529e64d83245d78e0feb9f, type: 3} - MinMoney: 40 - MaxMoney: 60 + MinMoney: 1 + MaxMoney: 5 - Type: 5 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 7af455f1c1666e5409156598fe669f74, type: 3} - MinMoney: 120 - MaxMoney: 160 + MinMoney: 1 + MaxMoney: 5 - Type: 7 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 13f2740b5ae396e40940587ab2effd65, type: 3} - MinMoney: 250 - MaxMoney: 350 + MinMoney: 1 + MaxMoney: 5 - Type: 8 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: ebddb1b81a288cc4c993a25bc9efe894, type: 3} - MinMoney: 800 - MaxMoney: 900 + MinMoney: 1 + MaxMoney: 5 - Type: 6 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 2cf42dbc57bb6374b9e6ec700aad5854, type: 3} - MinMoney: 2000 - MaxMoney: 3000 + MinMoney: 1 + MaxMoney: 5 + - Type: 9 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 41d6fc24602553e48b206f2ea7d60bb5, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 11 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 044e3c59048f2ec4db0a06bcabc676b0, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 19 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 1d1c1945744668945abc5ea0f9a4c760, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 20 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: f2420d92fef5dde46ba12236e8315458, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 18 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: e1b896c45d0dc394eb584c739794ff21, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 17 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: c5580241b3a654e47a270fc00407cbd4, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 15 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 2125bd42c9c45584b9c2ed2d6421e410, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 10 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 45b8d9d3353ed7c4e8fd11c6387d2364, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 16 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: b2ad6f08a32678344aa95ae220e3d030, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 29 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 46e1f4f05a477b046a5d8121bb63388d, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 28 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 7ba70ccf373f1064a9911798bc1748ce, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 12 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 9fc502b6f85c8764ab181f64c646bcf1, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 21 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 0ff4ad3b26e30d14286f45c67ce8ea91, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 23 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: eb6cbc0d308433642a3157f5afe2b17e, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 22 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 642bb664840379a46b4dff87e65e229d, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 24 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 5e2046530547f3a4f807e051d6e1da05, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 26 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: e37376b2f30b7d64fa634df2233ff9ab, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 14 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 082386cfbe8dfc34189664a1dd37ede4, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 25 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: d0fc612fb6777b14b88133b4cd485733, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 27 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: f74988e3ad5daf64f8f6c6adab75c984, + type: 3} + MinMoney: 1 + MaxMoney: 5 + - Type: 13 + CustomBehaviour: 0 + Prefab: {fileID: 4485779862959683977, guid: 30a47cb0b048fe14aad8715a93340ea7, + type: 3} + MinMoney: 1 + MaxMoney: 5 diff --git a/Assets/Scenes/UpgradesScene.unity b/Assets/Scenes/UpgradesScene.unity index 639c37d..26374cf 100644 --- a/Assets/Scenes/UpgradesScene.unity +++ b/Assets/Scenes/UpgradesScene.unity @@ -239,7 +239,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -467,7 +467,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -535,7 +535,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1300, y: 200} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 350, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &216535973 MonoBehaviour: @@ -601,8 +601,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -610,7 +610,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &216535975 CanvasRenderer: m_ObjectHideFlags: 0 @@ -632,8 +632,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 8 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 306312747} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -676,7 +678,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 200, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &218329189 MonoBehaviour: @@ -742,8 +744,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -751,7 +753,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &218329191 CanvasRenderer: m_ObjectHideFlags: 0 @@ -773,8 +775,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 3 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -851,7 +855,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -300, y: -200} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 350, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &239945579 MonoBehaviour: @@ -917,8 +921,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -926,7 +930,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &239945581 CanvasRenderer: m_ObjectHideFlags: 0 @@ -948,8 +952,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 23 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1215656306} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -1004,7 +1010,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1107,7 +1113,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1700, y: 200} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &263965908 MonoBehaviour: @@ -1173,8 +1179,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1182,7 +1188,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &263965910 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1204,8 +1210,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 32 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 531797809} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -1252,7 +1260,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 500, y: 600} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &282988159 MonoBehaviour: @@ -1318,8 +1326,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1327,7 +1335,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &282988161 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1349,8 +1357,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 28 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 766041999} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -1405,7 +1415,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1472,7 +1482,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1300, y: 600} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &306312744 MonoBehaviour: @@ -1538,8 +1548,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1547,7 +1557,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &306312746 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1569,8 +1579,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 7 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 946556767} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -1625,7 +1637,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1739,7 +1751,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1806,7 +1818,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -900, y: 600} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &406517116 MonoBehaviour: @@ -1872,8 +1884,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1881,7 +1893,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &406517118 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1903,8 +1915,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 12 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1077588040} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -1959,7 +1973,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2038,7 +2052,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2143,7 +2157,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 700, y: 0} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &471231061 MonoBehaviour: @@ -2209,8 +2223,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2218,7 +2232,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &471231063 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2240,8 +2254,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 27 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 766041999} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -2428,7 +2444,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1400, y: 100} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &528476486 MonoBehaviour: @@ -2494,8 +2510,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2503,7 +2519,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &528476488 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2525,8 +2541,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 33 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 531797809} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -2569,7 +2587,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1400, y: 600} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &531797806 MonoBehaviour: @@ -2635,8 +2653,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2644,7 +2662,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &531797808 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2666,8 +2684,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 31 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1805700036} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -2722,7 +2742,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2801,7 +2821,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2870,7 +2890,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -100, y: 498} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &566818524 MonoBehaviour: @@ -2936,8 +2956,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2945,7 +2965,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &566818526 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2967,8 +2987,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 22 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1342376329} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -3027,7 +3049,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3106,7 +3128,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3185,7 +3207,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3264,7 +3286,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3332,7 +3354,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1100, y: 500} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &683605712 MonoBehaviour: @@ -3398,8 +3420,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3407,7 +3429,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &683605714 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3429,8 +3451,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 10 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1077588040} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -3512,7 +3536,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 500, y: 200} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 350, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &697576764 MonoBehaviour: @@ -3578,8 +3602,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3587,7 +3611,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &697576766 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3609,8 +3633,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 29 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1552666745} - {fileID: 282988162} @@ -3752,7 +3778,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3819,7 +3845,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 600, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &766041996 MonoBehaviour: @@ -3885,8 +3911,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3894,7 +3920,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &766041998 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3916,8 +3942,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 4 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -3960,7 +3988,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 700, y: -400} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 450, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &772192186 MonoBehaviour: @@ -4026,8 +4054,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4035,7 +4063,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &772192188 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4057,8 +4085,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 26 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 239945582} - {fileID: 471231064} @@ -4156,7 +4186,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4235,7 +4265,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4349,7 +4379,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4428,7 +4458,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4582,7 +4612,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4724,7 +4754,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1400, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &946556764 MonoBehaviour: @@ -4790,8 +4820,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4799,7 +4829,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &946556766 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4821,8 +4851,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 0 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -4876,7 +4908,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4955,7 +4987,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5024,7 +5056,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1200, y: -400} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 420, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1015076959 MonoBehaviour: @@ -5090,8 +5122,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5099,7 +5131,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1015076961 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5121,8 +5153,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 34 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 528476489} - {fileID: 471231064} @@ -5175,7 +5209,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -300, y: 200} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1021226831 MonoBehaviour: @@ -5241,8 +5275,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5250,7 +5284,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1021226833 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5272,8 +5306,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 20 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1812298575} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -5351,7 +5387,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1000, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1077588037 MonoBehaviour: @@ -5417,8 +5453,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5426,7 +5462,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1077588039 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5448,8 +5484,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 0 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -5562,7 +5600,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -500, y: 0} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1215656303 MonoBehaviour: @@ -5628,8 +5666,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5637,7 +5675,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1215656305 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5659,8 +5697,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 17 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1486581294} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -5835,7 +5875,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5914,7 +5954,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6028,7 +6068,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6107,7 +6147,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6186,7 +6226,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6265,7 +6305,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6332,7 +6372,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -200, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1342376326 MonoBehaviour: @@ -6398,8 +6438,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6407,7 +6447,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1342376328 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6429,8 +6469,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 2 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -6472,7 +6514,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1100, y: 303} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1394817803 MonoBehaviour: @@ -6538,8 +6580,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6547,7 +6589,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1394817805 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6569,8 +6611,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 11 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 683605715} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -6651,7 +6695,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 100, y: 100} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1449025484 MonoBehaviour: @@ -6717,8 +6761,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6726,7 +6770,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1449025486 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6748,8 +6792,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 24 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 218329192} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -6811,7 +6857,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6890,7 +6936,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6957,7 +7003,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -600, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1486581291 MonoBehaviour: @@ -7023,8 +7069,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7032,7 +7078,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1486581293 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7054,8 +7100,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 1 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -7233,7 +7281,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 100, y: -400} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 350, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1533141410 MonoBehaviour: @@ -7299,8 +7347,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7308,7 +7356,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1533141412 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7330,8 +7378,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 21 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1992771926} - {fileID: 1449025487} @@ -7386,7 +7436,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 300, y: 400} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1552666742 MonoBehaviour: @@ -7452,8 +7502,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7461,7 +7511,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1552666744 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7483,8 +7533,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 25 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 218329192} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -7578,7 +7630,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7656,7 +7708,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 + m_ReferencePixelsPerUnit: 30 m_ScaleFactor: 1 m_ReferenceResolution: {x: 3840, y: 2160} m_ScreenMatchMode: 1 @@ -7677,7 +7729,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 475841623} - m_PlaneDistance: 100 + m_PlaneDistance: 10 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -7761,7 +7813,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7943,7 +7995,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -8046,7 +8098,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1000, y: 400} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 400, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1721077922 MonoBehaviour: @@ -8112,8 +8164,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8121,7 +8173,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1721077924 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8143,8 +8195,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 30 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 2128693475} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -8188,7 +8242,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -900, y: 0} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 350, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1729499772 MonoBehaviour: @@ -8254,8 +8308,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8263,7 +8317,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1729499774 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8285,8 +8339,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 13 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 406517119} - {fileID: 216535976} @@ -8342,7 +8398,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -700, y: -200} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 350, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1778644666 MonoBehaviour: @@ -8408,8 +8464,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8417,7 +8473,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1778644668 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8439,8 +8495,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 16 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1215656306} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -8483,7 +8541,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1400, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1805700033 MonoBehaviour: @@ -8549,8 +8607,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8558,7 +8616,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1805700035 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8580,8 +8638,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 6 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -8623,7 +8683,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -300, y: 600} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1812298572 MonoBehaviour: @@ -8689,8 +8749,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8698,7 +8758,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1812298574 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8720,8 +8780,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 18 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1342376329} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -8765,7 +8827,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -100, y: 300} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1835457755 MonoBehaviour: @@ -8831,8 +8893,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8840,7 +8902,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1835457757 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8862,8 +8924,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 19 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1812298575} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -8910,7 +8974,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -700, y: 300} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 350, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1835680346 MonoBehaviour: @@ -8976,8 +9040,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8985,7 +9049,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1835680348 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9007,8 +9071,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 15 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1836886870} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -9052,7 +9118,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -700, y: 500} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1836886867 MonoBehaviour: @@ -9118,8 +9184,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9127,7 +9193,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1836886869 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9149,8 +9215,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 14 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 1486581294} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -9344,7 +9412,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1500, y: 0} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 275, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1992771923 MonoBehaviour: @@ -9410,8 +9478,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9419,7 +9487,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1992771925 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9441,8 +9509,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 9 - UpgradeCost: 0 DrawDefaultLines: 0 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: - {fileID: 946556767} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} @@ -9536,7 +9606,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9711,7 +9781,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1000, y: 800} - m_SizeDelta: {x: 250, y: 80} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2128693472 MonoBehaviour: @@ -9777,8 +9847,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: fd64923844b14084ead7988cb85f3f18, type: 3} + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9786,7 +9856,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &2128693474 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9808,8 +9878,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 5 - UpgradeCost: 0 DrawDefaultLines: 1 + Cost: + Magnitude: 0 + Ammount: 0 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} Lines: [] @@ -9863,7 +9935,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9942,7 +10014,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.96862745, g: 0.94509804, b: 0.8862745, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Scripts/Game/CurrencyAmount.cs b/Assets/Scripts/Game/CurrencyAmount.cs new file mode 100644 index 0000000..3dfa616 --- /dev/null +++ b/Assets/Scripts/Game/CurrencyAmount.cs @@ -0,0 +1,53 @@ +using UnityEngine; +using System.Text; +using System; + +namespace Fruitomation.Game +{ + public enum CurrencyMagnitude + { + Ones, + Thousands, + Millions, + Billions, + Trillions + } + + [Serializable] public class CurrencyAmount + { + [SerializeField] private CurrencyMagnitude Magnitude; + [SerializeField] private float Ammount; + + public string AsString() + { + StringBuilder builder = new(); + builder.Append( + Ammount > 10f + ? $"${Ammount:I}" + : $"${Ammount:F1}" + ); + + switch (Magnitude) + { + case CurrencyMagnitude.Ones: + break; + case CurrencyMagnitude.Thousands: + builder.Append("K"); + break; + case CurrencyMagnitude.Millions: + builder.Append("M"); + break; + case CurrencyMagnitude.Billions: + builder.Append("B"); + break; + case CurrencyMagnitude.Trillions: + builder.Append("T"); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + return builder.ToString(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/CurrencyAmount.cs.meta b/Assets/Scripts/Game/CurrencyAmount.cs.meta new file mode 100644 index 0000000..d9145dc --- /dev/null +++ b/Assets/Scripts/Game/CurrencyAmount.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7e9afb637ef14ed4b34fd226298272d5 +timeCreated: 1776767993 \ No newline at end of file diff --git a/Assets/Scripts/UI/BasicUpgradeButton.cs b/Assets/Scripts/UI/BasicUpgradeButton.cs index 85f775d..bee0e0d 100644 --- a/Assets/Scripts/UI/BasicUpgradeButton.cs +++ b/Assets/Scripts/UI/BasicUpgradeButton.cs @@ -4,6 +4,7 @@ using UnityEngine.UI; using UnityEngine; using System.Linq; using System; +using System.Text.RegularExpressions; namespace Fruitomation.UI { @@ -24,8 +25,9 @@ namespace Fruitomation.UI [Header("Settings")] [SerializeField] private BasicUpgrade Upgrade; - [SerializeField] private int UpgradeCost; [SerializeField] private bool DrawDefaultLines; + [SerializeField] private CurrencyAmount Cost; + [SerializeField] private bool BigText; [Header("References")] [SerializeField] private BasicUpgradeButton[] RequiredUpgrades; @@ -43,6 +45,8 @@ namespace Fruitomation.UI private void Awake() { AttachedText = gameObject.GetComponentInChildren(); + AttachedText.fontSize = 30; + AttachedButton = GetComponent