diff --git a/Assets/Art/Fan-v1.png b/Assets/Art/Fan-v1.png new file mode 100644 index 0000000..b9e7f1d Binary files /dev/null and b/Assets/Art/Fan-v1.png differ diff --git a/Assets/Art/Fan-v1.png.meta b/Assets/Art/Fan-v1.png.meta new file mode 100644 index 0000000..2daa84a --- /dev/null +++ b/Assets/Art/Fan-v1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1c2431a53994c424c82389d1cc422df8 +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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + 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: 3 + 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: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings.meta b/Assets/Prefabs/Buildings.meta new file mode 100644 index 0000000..2677495 --- /dev/null +++ b/Assets/Prefabs/Buildings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19f453ec5cfc2ce40b7c57edd77d33cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/FanBuilding.prefab b/Assets/Prefabs/Buildings/FanBuilding.prefab new file mode 100644 index 0000000..3797f6b --- /dev/null +++ b/Assets/Prefabs/Buildings/FanBuilding.prefab @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8624048914473773482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 546461529234046531} + - component: {fileID: 3321531399837876958} + m_Layer: 0 + m_Name: FanBuilding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &546461529234046531 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624048914473773482} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3321531399837876958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624048914473773482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1926ee4d89f644c6976fa93256772490, type: 3} + m_Name: + m_EditorClassIdentifier: + BuildingTexture: {fileID: 2800000, guid: 1c2431a53994c424c82389d1cc422df8, type: 3} + k__BackingField: {x: 1, y: 3} diff --git a/Assets/Prefabs/Buildings/FanBuilding.prefab.meta b/Assets/Prefabs/Buildings/FanBuilding.prefab.meta new file mode 100644 index 0000000..6cf00cc --- /dev/null +++ b/Assets/Prefabs/Buildings/FanBuilding.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b5c88b3f8d08674a9b15155d6ba9a36 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game.meta b/Assets/Scripts/Game.meta new file mode 100644 index 0000000..73f370c --- /dev/null +++ b/Assets/Scripts/Game.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 38f05ce3c9244f4894f2ac3f07ff8531 +timeCreated: 1774952723 \ No newline at end of file diff --git a/Assets/Scripts/Game/Buildings.meta b/Assets/Scripts/Game/Buildings.meta new file mode 100644 index 0000000..90c2e39 --- /dev/null +++ b/Assets/Scripts/Game/Buildings.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6da83f1712164887a1710190cac61f41 +timeCreated: 1774952920 \ No newline at end of file diff --git a/Assets/Scripts/Game/Buildings/BuildingBase.cs b/Assets/Scripts/Game/Buildings/BuildingBase.cs new file mode 100644 index 0000000..d0b9603 --- /dev/null +++ b/Assets/Scripts/Game/Buildings/BuildingBase.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +namespace Fruitomation.Game +{ + public abstract class BuildingBase : MonoBehaviour + { + [Header("Building Properties")] + [SerializeField] private Texture2D BuildingTexture; + [field: SerializeField] public Vector2Int SizeOnGrid { get; private set; } + } +} diff --git a/Assets/Scripts/Game/Buildings/BuildingBase.cs.meta b/Assets/Scripts/Game/Buildings/BuildingBase.cs.meta new file mode 100644 index 0000000..e7c1933 --- /dev/null +++ b/Assets/Scripts/Game/Buildings/BuildingBase.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cfb885c06483444a8586e0e2d1933163 +timeCreated: 1774952929 \ No newline at end of file diff --git a/Assets/Scripts/Game/Buildings/FanBuilding.cs b/Assets/Scripts/Game/Buildings/FanBuilding.cs new file mode 100644 index 0000000..d9b16ea --- /dev/null +++ b/Assets/Scripts/Game/Buildings/FanBuilding.cs @@ -0,0 +1,7 @@ +namespace Fruitomation.Game +{ + public class FanBuilding : BuildingBase + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Buildings/FanBuilding.cs.meta b/Assets/Scripts/Game/Buildings/FanBuilding.cs.meta new file mode 100644 index 0000000..6817879 --- /dev/null +++ b/Assets/Scripts/Game/Buildings/FanBuilding.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1926ee4d89f644c6976fa93256772490 +timeCreated: 1774954178 \ No newline at end of file diff --git a/Assets/Scripts/FruitBehaviour.cs b/Assets/Scripts/Game/FruitBehaviour.cs similarity index 97% rename from Assets/Scripts/FruitBehaviour.cs rename to Assets/Scripts/Game/FruitBehaviour.cs index 849d80d..2a2b7b4 100644 --- a/Assets/Scripts/FruitBehaviour.cs +++ b/Assets/Scripts/Game/FruitBehaviour.cs @@ -1,9 +1,10 @@ +using Fruitomation.Global; using PashaBibko.Pacore.Attributes; using UnityEngine.UI; using UnityEngine; using Random = UnityEngine.Random; -namespace Fruitomation +namespace Fruitomation.Game { public class FruitBehaviour : MonoBehaviour { diff --git a/Assets/Scripts/FruitBehaviour.cs.meta b/Assets/Scripts/Game/FruitBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/FruitBehaviour.cs.meta rename to Assets/Scripts/Game/FruitBehaviour.cs.meta diff --git a/Assets/Scripts/FruitSpawner.cs b/Assets/Scripts/Game/FruitSpawner.cs similarity index 96% rename from Assets/Scripts/FruitSpawner.cs rename to Assets/Scripts/Game/FruitSpawner.cs index 1083976..68e7d57 100644 --- a/Assets/Scripts/FruitSpawner.cs +++ b/Assets/Scripts/Game/FruitSpawner.cs @@ -1,8 +1,9 @@ using PashaBibko.Pacore.Attributes; using System.Collections.Generic; +using Fruitomation.Global; using UnityEngine; -namespace Fruitomation +namespace Fruitomation.Game { public class FruitSpawner : MonoBehaviour { diff --git a/Assets/Scripts/FruitSpawner.cs.meta b/Assets/Scripts/Game/FruitSpawner.cs.meta similarity index 100% rename from Assets/Scripts/FruitSpawner.cs.meta rename to Assets/Scripts/Game/FruitSpawner.cs.meta diff --git a/Assets/Scripts/Global.meta b/Assets/Scripts/Global.meta new file mode 100644 index 0000000..72570ed --- /dev/null +++ b/Assets/Scripts/Global.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4e4f399bdf914615a29c9eb0787a0712 +timeCreated: 1774952662 \ No newline at end of file diff --git a/Assets/Scripts/GameStateController.cs b/Assets/Scripts/Global/GameStateController.cs similarity index 97% rename from Assets/Scripts/GameStateController.cs rename to Assets/Scripts/Global/GameStateController.cs index 6fde806..7f3d949 100644 --- a/Assets/Scripts/GameStateController.cs +++ b/Assets/Scripts/Global/GameStateController.cs @@ -1,7 +1,7 @@ using PashaBibko.Pacore.Attributes; using UnityEngine; -namespace Fruitomation +namespace Fruitomation.Global { public enum GameState { diff --git a/Assets/Scripts/GameStateController.cs.meta b/Assets/Scripts/Global/GameStateController.cs.meta similarity index 100% rename from Assets/Scripts/GameStateController.cs.meta rename to Assets/Scripts/Global/GameStateController.cs.meta diff --git a/Assets/Scripts/MoneyController.cs b/Assets/Scripts/Global/MoneyController.cs similarity index 96% rename from Assets/Scripts/MoneyController.cs rename to Assets/Scripts/Global/MoneyController.cs index 03926a2..f54d9ec 100644 --- a/Assets/Scripts/MoneyController.cs +++ b/Assets/Scripts/Global/MoneyController.cs @@ -1,7 +1,7 @@ using PashaBibko.Pacore.Attributes; using UnityEngine; -namespace Fruitomation +namespace Fruitomation.Global { [CreateInstanceOnStart] public class MoneyController : MonoBehaviour { diff --git a/Assets/Scripts/MoneyController.cs.meta b/Assets/Scripts/Global/MoneyController.cs.meta similarity index 100% rename from Assets/Scripts/MoneyController.cs.meta rename to Assets/Scripts/Global/MoneyController.cs.meta diff --git a/Assets/Scripts/FruitBowlController.cs b/Assets/Scripts/UI/FruitBowlController.cs similarity index 95% rename from Assets/Scripts/FruitBowlController.cs rename to Assets/Scripts/UI/FruitBowlController.cs index e43fa9c..b7810a2 100644 --- a/Assets/Scripts/FruitBowlController.cs +++ b/Assets/Scripts/UI/FruitBowlController.cs @@ -1,7 +1,8 @@ +using Fruitomation.Global; using UnityEngine.UI; using UnityEngine; -namespace Fruitomation +namespace Fruitomation.UI { public class FruitBowlController : MonoBehaviour { diff --git a/Assets/Scripts/FruitBowlController.cs.meta b/Assets/Scripts/UI/FruitBowlController.cs.meta similarity index 100% rename from Assets/Scripts/FruitBowlController.cs.meta rename to Assets/Scripts/UI/FruitBowlController.cs.meta diff --git a/Assets/Scripts/GameCursor.cs b/Assets/Scripts/UI/GameCursor.cs similarity index 98% rename from Assets/Scripts/GameCursor.cs rename to Assets/Scripts/UI/GameCursor.cs index 1e00dd2..3045db0 100644 --- a/Assets/Scripts/GameCursor.cs +++ b/Assets/Scripts/UI/GameCursor.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; +using Fruitomation.Game; using UnityEngine; -namespace Fruitomation +namespace Fruitomation.UI { public class GameCursor : MonoBehaviour { diff --git a/Assets/Scripts/GameCursor.cs.meta b/Assets/Scripts/UI/GameCursor.cs.meta similarity index 100% rename from Assets/Scripts/GameCursor.cs.meta rename to Assets/Scripts/UI/GameCursor.cs.meta diff --git a/Assets/Scripts/UI/GridViewController.cs b/Assets/Scripts/UI/GridViewController.cs index 0b6f952..809cf85 100644 --- a/Assets/Scripts/UI/GridViewController.cs +++ b/Assets/Scripts/UI/GridViewController.cs @@ -1,4 +1,5 @@ -using UnityEngine.UI; +using Fruitomation.Global; +using UnityEngine.UI; using UnityEngine; namespace Fruitomation.UI