diff --git a/Assets/Prefab/Tree.prefab b/Assets/Prefab/Tree.prefab
deleted file mode 100644
index c36272071571ebd1b667f700e07300ada2363f87..0000000000000000000000000000000000000000
--- a/Assets/Prefab/Tree.prefab
+++ /dev/null
@@ -1,121 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &7666959473089792538
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7666959473089792541}
- - component: {fileID: 7666959473089792540}
- - component: {fileID: 7666959473089792542}
- - component: {fileID: 7666959473089792539}
- m_Layer: 0
- m_Name: Tree
- m_TagString: Resource
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &7666959473089792541
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7666959473089792538}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.6, y: -1.7186036, z: -0.1}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7666959473089792540
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7666959473089792538}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 473e801b3bc9651409881d3f975c23ef, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 0.3, y: 0.3}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!61 &7666959473089792542
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7666959473089792538}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IsTrigger: 1
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 1.28, y: 1.28}
- newSize: {x: 0.3, y: 0.3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 1.28, y: 1.28}
- m_EdgeRadius: 0
---- !u!114 &7666959473089792539
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7666959473089792538}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: cb94cfa918a502245a4097b1749281ad, type: 3}
- m_Name:
- m_EditorClassIdentifier:
diff --git a/Assets/Scenes/MainScene.meta b/Assets/Scripts/EventSystem.meta
similarity index 77%
rename from Assets/Scenes/MainScene.meta
rename to Assets/Scripts/EventSystem.meta
index fad139c12cfcbabc8dcc5959d24c3f7fab5f775b..1be0d20be8cb317a2b0b87da309cdc0d9756b21a 100644
--- a/Assets/Scenes/MainScene.meta
+++ b/Assets/Scripts/EventSystem.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 829c46be4b50d504a8fd053e72cf24e3
+guid: 9116c188ab2d3f747a13fc0390e5f874
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Scripts/EventSystem.cs b/Assets/Scripts/EventSystem/EventSystem.cs
similarity index 100%
rename from Assets/Scripts/EventSystem.cs
rename to Assets/Scripts/EventSystem/EventSystem.cs
diff --git a/Assets/Scripts/EventSystem.cs.meta b/Assets/Scripts/EventSystem/EventSystem.cs.meta
similarity index 100%
rename from Assets/Scripts/EventSystem.cs.meta
rename to Assets/Scripts/EventSystem/EventSystem.cs.meta
diff --git a/Assets/Scripts/EventType.cs b/Assets/Scripts/EventSystem/EventType.cs
similarity index 100%
rename from Assets/Scripts/EventType.cs
rename to Assets/Scripts/EventSystem/EventType.cs
diff --git a/Assets/Scripts/EventType.cs.meta b/Assets/Scripts/EventSystem/EventType.cs.meta
similarity index 100%
rename from Assets/Scripts/EventType.cs.meta
rename to Assets/Scripts/EventSystem/EventType.cs.meta
diff --git a/Assets/Scripts/IAction.cs b/Assets/Scripts/EventSystem/IAction.cs
similarity index 100%
rename from Assets/Scripts/IAction.cs
rename to Assets/Scripts/EventSystem/IAction.cs
diff --git a/Assets/Scripts/IAction.cs.meta b/Assets/Scripts/EventSystem/IAction.cs.meta
similarity index 100%
rename from Assets/Scripts/IAction.cs.meta
rename to Assets/Scripts/EventSystem/IAction.cs.meta
diff --git a/Assets/Prefab/Tree.prefab.meta b/Assets/Scripts/Resources.meta
similarity index 57%
rename from Assets/Prefab/Tree.prefab.meta
rename to Assets/Scripts/Resources.meta
index ac0f485bbb713fe96afc5e3cec2346eab3ec54ca..afddffdb34df3a35209e1ea7bfdde4a2e3d64d2d 100644
--- a/Assets/Prefab/Tree.prefab.meta
+++ b/Assets/Scripts/Resources.meta
@@ -1,6 +1,7 @@
fileFormatVersion: 2
-guid: 3d8a1dd57f0015c4093d8bfb80c3c303
-PrefabImporter:
+guid: f89945eadb9a561409691a6395ace8d0
+folderAsset: yes
+DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
diff --git a/Assets/Scripts/BerryBush.cs b/Assets/Scripts/Resources/BerryBush.cs
similarity index 100%
rename from Assets/Scripts/BerryBush.cs
rename to Assets/Scripts/Resources/BerryBush.cs
diff --git a/Assets/Scripts/BerryBush.cs.meta b/Assets/Scripts/Resources/BerryBush.cs.meta
similarity index 100%
rename from Assets/Scripts/BerryBush.cs.meta
rename to Assets/Scripts/Resources/BerryBush.cs.meta
diff --git a/Assets/Scripts/Forest.cs b/Assets/Scripts/Resources/Forest.cs
similarity index 100%
rename from Assets/Scripts/Forest.cs
rename to Assets/Scripts/Resources/Forest.cs
diff --git a/Assets/Scripts/Forest.cs.meta b/Assets/Scripts/Resources/Forest.cs.meta
similarity index 100%
rename from Assets/Scripts/Forest.cs.meta
rename to Assets/Scripts/Resources/Forest.cs.meta
diff --git a/Assets/Scripts/Outcrop.cs b/Assets/Scripts/Resources/Outcrop.cs
similarity index 100%
rename from Assets/Scripts/Outcrop.cs
rename to Assets/Scripts/Resources/Outcrop.cs
diff --git a/Assets/Scripts/Outcrop.cs.meta b/Assets/Scripts/Resources/Outcrop.cs.meta
similarity index 100%
rename from Assets/Scripts/Outcrop.cs.meta
rename to Assets/Scripts/Resources/Outcrop.cs.meta
diff --git a/Assets/Scripts/Quarry.cs b/Assets/Scripts/Resources/Quarry.cs
similarity index 100%
rename from Assets/Scripts/Quarry.cs
rename to Assets/Scripts/Resources/Quarry.cs
diff --git a/Assets/Scripts/Quarry.cs.meta b/Assets/Scripts/Resources/Quarry.cs.meta
similarity index 100%
rename from Assets/Scripts/Quarry.cs.meta
rename to Assets/Scripts/Resources/Quarry.cs.meta
diff --git a/Assets/Scripts/Resource.cs b/Assets/Scripts/Resources/Resource.cs
similarity index 100%
rename from Assets/Scripts/Resource.cs
rename to Assets/Scripts/Resources/Resource.cs
diff --git a/Assets/Scripts/Resource.cs.meta b/Assets/Scripts/Resources/Resource.cs.meta
similarity index 100%
rename from Assets/Scripts/Resource.cs.meta
rename to Assets/Scripts/Resources/Resource.cs.meta
diff --git a/Assets/Scripts/Upgrades.meta b/Assets/Scripts/Upgrades.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d1163fccd0a0497cd7721c07fcd3fada3bced023
--- /dev/null
+++ b/Assets/Scripts/Upgrades.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fba4cb26078d1984686361f4f6a2adf3
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CollectorUpgrade.cs b/Assets/Scripts/Upgrades/CollectorUpgrade.cs
similarity index 100%
rename from Assets/Scripts/CollectorUpgrade.cs
rename to Assets/Scripts/Upgrades/CollectorUpgrade.cs
diff --git a/Assets/Scripts/CollectorUpgrade.cs.meta b/Assets/Scripts/Upgrades/CollectorUpgrade.cs.meta
similarity index 100%
rename from Assets/Scripts/CollectorUpgrade.cs.meta
rename to Assets/Scripts/Upgrades/CollectorUpgrade.cs.meta
diff --git a/Assets/Scripts/PopulationUpgrade.cs b/Assets/Scripts/Upgrades/PopulationUpgrade.cs
similarity index 100%
rename from Assets/Scripts/PopulationUpgrade.cs
rename to Assets/Scripts/Upgrades/PopulationUpgrade.cs
diff --git a/Assets/Scripts/PopulationUpgrade.cs.meta b/Assets/Scripts/Upgrades/PopulationUpgrade.cs.meta
similarity index 100%
rename from Assets/Scripts/PopulationUpgrade.cs.meta
rename to Assets/Scripts/Upgrades/PopulationUpgrade.cs.meta
diff --git a/Assets/Scripts/ResourceCapacityUpgrade.cs b/Assets/Scripts/Upgrades/ResourceCapacityUpgrade.cs
similarity index 100%
rename from Assets/Scripts/ResourceCapacityUpgrade.cs
rename to Assets/Scripts/Upgrades/ResourceCapacityUpgrade.cs
diff --git a/Assets/Scripts/ResourceCapacityUpgrade.cs.meta b/Assets/Scripts/Upgrades/ResourceCapacityUpgrade.cs.meta
similarity index 100%
rename from Assets/Scripts/ResourceCapacityUpgrade.cs.meta
rename to Assets/Scripts/Upgrades/ResourceCapacityUpgrade.cs.meta
diff --git a/Assets/Scripts/ResourceEfficiencyUpgrade.cs b/Assets/Scripts/Upgrades/ResourceEfficiencyUpgrade.cs
similarity index 100%
rename from Assets/Scripts/ResourceEfficiencyUpgrade.cs
rename to Assets/Scripts/Upgrades/ResourceEfficiencyUpgrade.cs
diff --git a/Assets/Scripts/ResourceEfficiencyUpgrade.cs.meta b/Assets/Scripts/Upgrades/ResourceEfficiencyUpgrade.cs.meta
similarity index 100%
rename from Assets/Scripts/ResourceEfficiencyUpgrade.cs.meta
rename to Assets/Scripts/Upgrades/ResourceEfficiencyUpgrade.cs.meta
diff --git a/Assets/Scripts/RoadUpgrade.cs b/Assets/Scripts/Upgrades/RoadUpgrade.cs
similarity index 100%
rename from Assets/Scripts/RoadUpgrade.cs
rename to Assets/Scripts/Upgrades/RoadUpgrade.cs
diff --git a/Assets/Scripts/RoadUpgrade.cs.meta b/Assets/Scripts/Upgrades/RoadUpgrade.cs.meta
similarity index 100%
rename from Assets/Scripts/RoadUpgrade.cs.meta
rename to Assets/Scripts/Upgrades/RoadUpgrade.cs.meta
diff --git a/Assets/Scripts/Upgrade.cs b/Assets/Scripts/Upgrades/Upgrade.cs
similarity index 100%
rename from Assets/Scripts/Upgrade.cs
rename to Assets/Scripts/Upgrades/Upgrade.cs
diff --git a/Assets/Scripts/Upgrade.cs.meta b/Assets/Scripts/Upgrades/Upgrade.cs.meta
similarity index 100%
rename from Assets/Scripts/Upgrade.cs.meta
rename to Assets/Scripts/Upgrades/Upgrade.cs.meta
diff --git a/Assets/Scripts/UpgradeTargets.cs b/Assets/Scripts/Upgrades/UpgradeTargets.cs
similarity index 100%
rename from Assets/Scripts/UpgradeTargets.cs
rename to Assets/Scripts/Upgrades/UpgradeTargets.cs
diff --git a/Assets/Scripts/UpgradeTargets.cs.meta b/Assets/Scripts/Upgrades/UpgradeTargets.cs.meta
similarity index 100%
rename from Assets/Scripts/UpgradeTargets.cs.meta
rename to Assets/Scripts/Upgrades/UpgradeTargets.cs.meta
diff --git a/Assets/Sprites/Grass.png.meta b/Assets/Sprites/Grass.png.meta
index 5341c5362a17fc9a61635b2c9e2935dd026c12d5..dbce3806f5da7a2701a8f99a50e7c9bfa9cf9b33 100644
--- a/Assets/Sprites/Grass.png.meta
+++ b/Assets/Sprites/Grass.png.meta
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
- filterMode: -1
+ filterMode: 1
aniso: -1
mipBias: -100
wrapU: 1
@@ -69,6 +69,28 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/Assets/Sprites/Sand.png b/Assets/Sprites/Sand.png
new file mode 100644
index 0000000000000000000000000000000000000000..95e717d34b4c0542d8fbb071d211ad21da08587f
Binary files /dev/null and b/Assets/Sprites/Sand.png differ
diff --git a/Assets/Sprites/Sand.png.meta b/Assets/Sprites/Sand.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..57e9fcb746ef6068bc53fa1aac582a456524929f
--- /dev/null
+++ b/Assets/Sprites/Sand.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: fe463401d3186b54086acff6bb82891f
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ 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
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ 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
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 9f8d7790a6190714ca86122031b8136c
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Sprites/bilberry.png.meta b/Assets/Sprites/bilberry.png.meta
index 0b5748b76418a8c585bcc1f2832b6cd7ded90083..271c71c05737a4da457045cce36401869d439d38 100644
--- a/Assets/Sprites/bilberry.png.meta
+++ b/Assets/Sprites/bilberry.png.meta
@@ -1,12 +1,5 @@
fileFormatVersion: 2
-<<<<<<< HEAD
guid: f85d51a973c87b04692395ace7bbb53d
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 9
-=======
-guid: dde5606cbdab11afc87431367dca6696
TextureImporter:
fileIDToRecycleName:
21300000: bilberry_0
@@ -16,8 +9,7 @@ TextureImporter:
21300008: bilberry_4
21300010: bilberry_5
externalObjects: {}
- serializedVersion: 7
->>>>>>> c144ec98ed3df10cff691d1ef9681c5c4c2be766
+ serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -45,25 +37,21 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
- filterMode: -1
+ filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
- wrapW: 1
+ wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
-<<<<<<< HEAD
- spriteMode: 1
-=======
spriteMode: 2
->>>>>>> c144ec98ed3df10cff691d1ef9681c5c4c2be766
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 128
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@@ -87,15 +75,6 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
-<<<<<<< HEAD
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 279b46b7cdee93742b12cd9b807c97da
-=======
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
@@ -107,6 +86,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
@@ -125,7 +115,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
- spriteID: 877cff87778aaebe79e9d86847ac5ef1
+ spriteID: 1dd7fbc1b60b07a4383bc4bc06feec77
vertices: []
indices:
edges: []
@@ -145,7 +135,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
- spriteID: 7fa07a994a0a0b723abf32dc95e34acf
+ spriteID: 3eb0a55594e815d4ab1531a3dd923509
vertices: []
indices:
edges: []
@@ -165,7 +155,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
- spriteID: 88365fd521d52effead5ccd28f8f740f
+ spriteID: c67731dd4f3bf2f49ba81abc81584ba2
vertices: []
indices:
edges: []
@@ -185,7 +175,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
- spriteID: b5c28560f4befbbebb8f3d4a1a45c9b6
+ spriteID: df459a4285ee72f45baecab2776feae5
vertices: []
indices:
edges: []
@@ -205,7 +195,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
- spriteID: d77916cad24f098b4a7dfb38e62af0a0
+ spriteID: a44b3b5f8868aa444b4791bcdd661a02
vertices: []
indices:
edges: []
@@ -225,7 +215,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
- spriteID: d26057aa2debb759eab5608e2d88d6f9
+ spriteID: d39e4fd1125b43847b292c2010320bbf
vertices: []
indices:
edges: []
@@ -233,8 +223,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID: 097e26d958152dae4b6460317905a5f4
->>>>>>> c144ec98ed3df10cff691d1ef9681c5c4c2be766
+ spriteID: 71b4fdb3148552245b390bc5caf147fc
vertices: []
indices:
edges: []
diff --git a/Assets/Sprites/house.png.meta b/Assets/Sprites/house.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..83e651232f4ad8ed6b3ed64d1153d07555824956
--- /dev/null
+++ b/Assets/Sprites/house.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: a69243cd6bee5c34497418b7bbea1e20
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ 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
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ 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
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 561f538456358e94a9c0adce4610ebea
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Sprites/rock.png.meta b/Assets/Sprites/rock.png.meta
index da4bc3013332d618a551508c79a731b72019efa9..07a386f96c75d503d075f03eddd3185bb947ccad 100644
--- a/Assets/Sprites/rock.png.meta
+++ b/Assets/Sprites/rock.png.meta
@@ -3,7 +3,7 @@ guid: 2d5618b5caec3c7d6bac162c4cd0a034
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
- serializedVersion: 7
+ serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
- filterMode: -1
+ filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
@@ -45,7 +45,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 128
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@@ -69,6 +69,28 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/Assets/Sprites/trees.png.meta b/Assets/Sprites/trees.png.meta
index abcdced146eeae11728555a79e1463da28105c1e..84faf8c369740f273ef44c5aa5d92a64cbd70691 100644
--- a/Assets/Sprites/trees.png.meta
+++ b/Assets/Sprites/trees.png.meta
@@ -11,7 +11,7 @@ TextureImporter:
21300012: trees_6
21300014: trees_7
externalObjects: {}
- serializedVersion: 7
+ serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -39,7 +39,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
- filterMode: -1
+ filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
@@ -53,7 +53,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 128
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@@ -88,6 +88,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: