Assets/Prefab/ShopTrigger.prefab.meta

+fileFormatVersion: 2
+guid: f0354d4d550e4994cb346ed8fce67111
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefab/StoneResouce.prefab

@@ -11,9 +11,10 @@ GameObject:
   - component: {fileID: 4378544729630622907}
   - component: {fileID: 6537826622454043909}
   - component: {fileID: 4263803972273305565}
+  - component: {fileID: 6933693375278105387}
   m_Layer: 0
   m_Name: StoneResouce
-  m_TagString: Untagged
+  m_TagString: Resource
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -101,3 +102,29 @@ MonoBehaviour:
   - {fileID: 21300006, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
   - {fileID: 21300008, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
   - {fileID: 21300010, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
+--- !u!61 &6933693375278105387
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6392040089189307514}
+  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, y: 1}
+    newSize: {x: 1, y: 1}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0

Assets/Prefab/worker.prefab

@@ -10,10 +10,11 @@ GameObject:
   m_Component:
   - component: {fileID: 548039319383633026}
   - component: {fileID: 548039319383633027}
+  - component: {fileID: 6298442855940817967}
   - component: {fileID: 548039319383633029}
   - component: {fileID: 548039319383633028}
   - component: {fileID: 548039319383633031}
-  m_Layer: 0
+  m_Layer: 8
   m_Name: worker
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -82,6 +83,27 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &6298442855940817967
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 548039319383633024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 266b3ace213eb154d80f94023b63eabb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  sprites:
+  - {fileID: 21300000, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
+  - {fileID: 21300002, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
+  - {fileID: 21300004, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
+  - {fileID: 21300006, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
+  - {fileID: 21300008, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
+  - {fileID: 21300010, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
+  - {fileID: 21300012, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
+  - {fileID: 21300014, guid: 488af5ae9ee5f2e48b2879b969ebc0a1, type: 3}
 --- !u!114 &548039319383633029
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -97,10 +119,15 @@ MonoBehaviour:
   target: {fileID: 0}
   move_to: {fileID: 0}
   max_amount: 10
+  Requested_amount: 0
+  Requested_resource: {fileID: 0}
+  OnkoVapaa: 0
   amount: 0
   home: {fileID: 7607310651946833762, guid: 118ed7528555d45418acb5a87b330000, type: 3}
   resource: {fileID: 0}
   speed: 1
+  target_flag: {fileID: 0}
+  send_to_resource: 0
   flag: {fileID: 8796312832300166883, guid: 5cba37404bc15114b929eea3f4ec84f3, type: 3}
 --- !u!61 &548039319383633028
 BoxCollider2D:
@@ -148,4 +175,4 @@ Rigidbody2D:
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
-  m_Constraints: 0
+  m_Constraints: 4

Assets/Scenes/MainMenu.unity

@@ -112,6 +112,133 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &219155984
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 219155986}
+  - component: {fileID: 219155985}
+  m_Layer: 0
+  m_Name: Audio Source
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!82 &219155985
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 219155984}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 9dd9dbd2b5d8ecf4c9ed2ac98ae2cd3b, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!4 &219155986
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 219155984}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.2447734, y: 0.57238865, z: 0.020284206}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &834199860
 GameObject:
   m_ObjectHideFlags: 0
@@ -128,7 +255,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!212 &834199861
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -185,7 +312,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 834199860}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 5.2034483, y: 2.3731437, z: 0}
+  m_LocalPosition: {x: -0.16, y: -2.91, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -207,7 +334,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!212 &1242906260
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -264,7 +391,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1242906259}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -5.3051963, y: 2.9021022, z: 0}
+  m_LocalPosition: {x: 5.65, y: 1.53, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -324,7 +451,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
-  m_Sprite: {fileID: 21300000, guid: 2d5618b5caec3c7d6bac162c4cd0a034, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9d5681b72addd744fb24b53783f0fc45, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -343,8 +470,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1334682652}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.89, y: -3.87, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: -2, y: 3, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
@@ -359,6 +486,8 @@ GameObject:
   m_Component:
   - component: {fileID: 1346472592}
   - component: {fileID: 1346472591}
+  - component: {fileID: 1346472594}
+  - component: {fileID: 1346472593}
   m_Layer: 0
   m_Name: ExitButton
   m_TagString: Untagged
@@ -403,8 +532,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Color: {r: 0.990566, g: 0, b: 0, a: 1}
+  m_Sprite: {fileID: 21300002, guid: 96af674e67bc4b521aa75450c40dfcbf, type: 3}
+  m_Color: {r: 0.8980393, g: 0.8980393, b: 0.8980393, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
@@ -422,12 +551,52 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1346472590}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1.22, z: 0.058931645}
-  m_LocalScale: {x: 20, y: 5, z: 1}
+  m_LocalPosition: {x: 2.5, y: -1.5, z: 0.058931645}
+  m_LocalScale: {x: 3, y: 3, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &1346472593
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1346472590}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  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, y: 1}
+    newSize: {x: 0.16, y: 0.16}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
+--- !u!114 &1346472594
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1346472590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b987107b9a225144a51d7e298dbf2aa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  playButton: {fileID: 1377888703}
+  exitButton: {fileID: 1346472590}
 --- !u!1 &1377888703
 GameObject:
   m_ObjectHideFlags: 0
@@ -438,6 +607,8 @@ GameObject:
   m_Component:
   - component: {fileID: 1377888705}
   - component: {fileID: 1377888704}
+  - component: {fileID: 1377888707}
+  - component: {fileID: 1377888708}
   m_Layer: 0
   m_Name: PlayButton
   m_TagString: Untagged
@@ -482,8 +653,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Color: {r: 0.013082923, g: 0.9245283, b: 0.18797691, a: 1}
+  m_Sprite: {fileID: 21300000, guid: 96af674e67bc4b521aa75450c40dfcbf, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
@@ -501,12 +672,131 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1377888703}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.14, z: 0.058931645}
-  m_LocalScale: {x: 20, y: 5, z: 1}
+  m_LocalPosition: {x: -2.5, y: -1.5, z: 0.058931645}
+  m_LocalScale: {x: 3, y: 3, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1377888707
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1377888703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b987107b9a225144a51d7e298dbf2aa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  playButton: {fileID: 1377888703}
+  exitButton: {fileID: 1346472590}
+--- !u!61 &1377888708
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1377888703}
+  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, y: 1}
+    newSize: {x: 0.16, y: 0.16}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
+--- !u!1 &1490674628
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1490674630}
+  - component: {fileID: 1490674629}
+  m_Layer: 0
+  m_Name: rock (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!212 &1490674629
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1490674628}
+  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: 1
+  m_Sprite: {fileID: 21300000, guid: 2d5618b5caec3c7d6bac162c4cd0a034, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!4 &1490674630
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1490674628}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -5.29, y: 2.63, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1507413978
 GameObject:
   m_ObjectHideFlags: 0
@@ -523,7 +813,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!212 &1507413979
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -580,7 +870,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1507413978}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 4.25, y: -2.0348446, z: 0}
+  m_LocalPosition: {x: 5.62, y: -2.75, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -640,7 +930,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: fe463401d3186b54086acff6bb82891f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c6939f4198c63be4a87e89eddd28f522, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -659,8 +949,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1807990412}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.08, y: -0.1, z: 0}
-  m_LocalScale: {x: 13, y: 10, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1

Assets/Scripts/AudioSystem.cs

@@ -28,7 +28,7 @@ public class AudioSystem : MonoBehaviour, IAction
     public void React(EventType type) {
         if (type == EventType.GameStarts)
         {
-            StartCoroutine("GameStartsClip");
+           GameStartsClip();
         }
         if (type == EventType.CitySmall)
         {
@@ -66,33 +66,38 @@ public class AudioSystem : MonoBehaviour, IAction
         {
             FanfareClip();
         }
-        
+        if (type == EventType.WinMusic)
+        {
+            WinClip();
+        }
+        if (type == EventType.Ultimate)
+        {
+            UltimateClip();
+        }
     }
 
 
-    public IEnumerator GameStartsClip()
+    public void GameStartsClip()
     {
         StartCoroutine("PlayEffect", 6);
-        yield return new WaitForSeconds(2);
-        ac.clip = musics[1];
-        StartCoroutine("FadeIn", 0);
+        StartCoroutine("FadeOutIn", new Timing(1, 1));
         
     }
     public void CitySmallClip()
     {
-        StartCoroutine("FadeOutIn", new Timing(3, 1));
+        StartCoroutine("FadeOutIn", new Timing(2, 1));
     }
     public void CityBigClip()
     {
-        StartCoroutine("FadeOutIn", new Timing(3, 2));
+        StartCoroutine("FadeOutIn", new Timing(1, 2));
     }
     public void HuntingSmallClip()
     {
-        StartCoroutine("FadeOutIn", new Timing(2, 4));
+        StartCoroutine("FadeOutIn", new Timing(1, 3));
     }
     public void HuntingBigClip()
     {
-        StartCoroutine("FadeOutIn", new Timing(2, 5));
+        StartCoroutine("FadeOutIn", new Timing(1, 5));
     }
     public void WoodClip()
     {
@@ -114,7 +119,15 @@ public class AudioSystem : MonoBehaviour, IAction
     {
         StartCoroutine("FadeOutIn", new Timing(0, 0));
     }
+    public void WinClip()
+    {
+        StartCoroutine("FadeOutIn", new Timing(1, 10));
+    }
+    public void UltimateClip()
+    {
+        StartCoroutine("FadeOutIn", new Timing(1, 11));
 
+    }
     IEnumerator FadeOutIn(Timing t) {
         //yield return FadeOut(t.duration);
         yield return StartCoroutine("FadeOut", t.duration);

Assets/Scripts/City.meta

+fileFormatVersion: 2
+guid: c45a1140d8e06dd4c8f916b8a8d9b63d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/City.cs → Assets/Scripts/City/City.cs

@@ -5,6 +5,16 @@ using UnityEngine;
 
 public class City : MonoBehaviour
 {
+    [SerializeField]
+    Sprite[] sprites;
+    private int spriteIndex = 0;
+
+    [SerializeField]
+    GameObject respanelPrefab;
+
+    [SerializeField]
+    GameObject resrowPrefab;
+
     [SerializeField]
     List<GameObject> workerlista;
 
@@ -23,8 +33,11 @@ public class City : MonoBehaviour
     [SerializeField]
     public int roadLevel = 0;
 
+    public int paneelienmaara = 0;
+
+    [SerializeField]
+    GameObject shopPreFab;
 
-    
     // Start is called before the first frame update
     void Start()
     {
@@ -63,8 +76,8 @@ public class City : MonoBehaviour
 
         GameObject go = Instantiate<GameObject>(worker);
         this.workerlista.Add(go);
-
-        go.transform.position = new Vector3();
+        
+        go.transform.position = new Vector3(gameObject.transform.position.x, gameObject.transform.position.y);
 
         
         this.population++;
@@ -75,28 +88,53 @@ public class City : MonoBehaviour
      *  Kayttaa resurssia r, maaran 'amount' verran (amount >= 0).
      *  Voidaan kayttaa maximissaan sen verran resursseja mita niita on kaytossa.
      */
-    public void UseResource(Resource r, int amount)
+    public int UseResource(Resource r, int amount)
     {
         if (amount<0)
         {
-            return;
+            return 0;
         }
+        int otettuMaara = 0;
         ResourcePool[] lista = gameObject.GetComponents<ResourcePool>();
         for (int i = 0; i < lista.Length; i++)
         {
             if (lista[i].GetResource().GetType().Equals(r.GetType()))
             {
-                lista[i].UseResource(amount);
+                otettuMaara = lista[i].UseResource(amount);
             }
         }
+        return otettuMaara;
     }
 
     public void AddPopulation(int v)
     {
+        spriteIndex = Math.Min(spriteIndex+1, sprites.Length-1);
         this.population += v;
+        gameObject.GetComponent<SpriteRenderer>().sprite = sprites[spriteIndex];
+
+        if(spriteIndex == 1)
+            EventSystem.EventHappened(EventType.CityBig);
+        else if (spriteIndex == 2)
+            EventSystem.EventHappened(EventType.HuntingSmall);
+        else if (spriteIndex == 3)
+            EventSystem.EventHappened(EventType.HuntingBig);
+        else if (spriteIndex == 4)
+            EventSystem.EventHappened(EventType.Ultimate);
     }
 
+    private void Update()
+    {
+        if (Input.GetKey(KeyCode.S))
+        {
+            GameObject go = new GameObject();
+            Quarry q = go.AddComponent<Quarry>();
+           
+            AddResource(q, 4000);
+            AddResource(go.AddComponent<Forest>(), 4000);
+            AddResource(go.AddComponent<BerryBush>(), 4000);
 
+        }
+    }
     /** 
 *  Lisaa resurssia r, maaran 'amount' verran (amount >= 0).
 *  Voidaan lisata maximissaan resurssin maximikapasiteettiin asti,
@@ -105,12 +143,12 @@ public class City : MonoBehaviour
 */
     public void AddResource(Resource r, int amount)
     {
-        if (amount<0)
+        if (r == null || amount < 0)
         {
             return;
         }
         ResourcePool[] lista = gameObject.GetComponents<ResourcePool>();
-       
+
         for (int i = 0; i < lista.Length; i++)
         {
             if (lista[i].GetResource().GetType().Equals(r.GetType()))
@@ -122,8 +160,49 @@ public class City : MonoBehaviour
         ResourcePool respool = gameObject.AddComponent<ResourcePool>();
         respool.SetResource(r);
         respool.AddResource(amount);
+        if (paneelienmaara == 0)
+        {
+            GameObject respanel = Instantiate<GameObject>(respanelPrefab);
+            paneelienmaara++;
+        }
+        float x = gameObject.transform.position.x;
+        float y = gameObject.transform.position.y + 1f - lista.Length * 0.5f;
+        float z = gameObject.transform.position.z;
+        GameObject resrow = Instantiate<GameObject>(resrowPrefab);
+        resrow.GetComponent<ResourceRow>().SetRow(r, x - 2f, y, z);
+    }
+
+    public void UpgradeWorkerSpeed() {
+        foreach (GameObject go in workerlista) {
+            go.GetComponent<Collector>().speed += 1;
+        }
     }
 
+    public bool IsSufficientResources(List<Resource> lista, int amount)
+    {
+        ResourcePool[] poolit = gameObject.GetComponents<ResourcePool>();
+        List<Resource> resurssit = new List<Resource>(lista);
+        for (int i = 0; i < lista.Count; i++)
+        {
+            for (int j = 0; j < poolit.Length; j++)
+            {
+                if (poolit[j].GetResource().GetType().Equals(lista[i].GetType()))
+                {
+                    for(int k = 0; k<resurssit.Count; k++)
+                    {
+                        if (resurssit[k].GetType().Equals(lista[i].GetType()))
+                            resurssit.RemoveAt(k);
+                    }
+
+                    if (poolit[j].GetAmount() < amount)
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        return resurssit.Count == 0;
+    }
     /**
      * Lisaa kaikkien resurssipoolien maxKapasiteettia x:n verran
      */
@@ -145,4 +224,13 @@ public class City : MonoBehaviour
             UseResource(lista[i].GetResource(), a[0]);
         }
     }
+    public List<GameObject> GetWorkerList()
+    {
+        return workerlista;
+    }
+    private void OnMouseEnter()
+    {
+        GameObject go = Instantiate<GameObject>(shopPreFab);
+        go.transform.SetParent(transform);
+    }
 }

Assets/Scripts/City.cs.meta → Assets/Scripts/City/City.cs.meta

 fileFormatVersion: 2
-guid: dfe928a858872424991e927606dd4bc3
+guid: f67208887d2c19940b9afdc55a275b38
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/City/ResourcePanel.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ResourcePanel : MonoBehaviour
+{
+
+    // Start is called before the first frame update
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        ResourcePool[] lista = gameObject.GetComponents<ResourcePool>();
+        for (int i = 0; i < lista.Length; i++)
+        {
+            UpdatePanel(lista[i]);
+        }
+    }
+
+    public void UpdatePanel(ResourcePool respool)
+    {
+
+    }
+}

Assets/Scripts/City/ResourcePanel.cs.meta

+fileFormatVersion: 2
+guid: 8430aaccc9adbd74c93d8d100f8d421a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/ResourcePool.cs → Assets/Scripts/City/ResourcePool.cs

@@ -14,13 +14,30 @@ public class ResourcePool : MonoBehaviour
     [SerializeField]
     private int maxCapacity = 100;
 
+    private int oneBar = 25;
+
+    private Sprite icon;
+
+    public int CalcBars()
+    {
+        return maxCapacity / oneBar;
+    }
+
+
+
     // Start is called before the first frame update
     void Start()
     {
+
     }
     public void SetResource(Resource r)
     {
+        if (r == null)
+        {
+            return;
+        }
         this.r = r;
+        icon = r.getResourceImg();
     }
 
     public Resource GetResource()
@@ -30,15 +47,19 @@ public class ResourcePool : MonoBehaviour
     /**
      * Kayttaa resurssia maaran X verran
      */
-    public void UseResource(int x)
+    public int UseResource(int x)
     {
+        int otettuMaara = 0;
         if (this.amount - x <= 0)
         {
+            otettuMaara = this.amount;
             this.amount = 0;
+            return otettuMaara;
         }
         else
         {
             this.amount -= x;
+            return x;
         }
     }
     /**
@@ -63,5 +84,9 @@ public class ResourcePool : MonoBehaviour
     {
         return this.maxCapacity;
     }
+    public int GetAmount()
+    {
+        return amount;
+    }
     
 }

Assets/Scripts/ResourcePool.cs.meta → Assets/Scripts/City/ResourcePool.cs.meta

 fileFormatVersion: 2
-guid: d5f9cff662cdcb44d9481366eacfa431
+guid: 1553b23dd4cf4794a91e075e2f2478f9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/City/ResourceRow.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ResourceRow : MonoBehaviour
+{
+    private Resource r;
+
+    private Sprite sprite;
+
+    [SerializeField]
+    private Sprite[] sprites;
+
+    [SerializeField]
+    private Sprite[] upgradesprites;
+
+
+    // Start is called before the first frame update
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        UpdateBars();
+    }
+
+    public void SetRow(Resource r, float x, float y, float z)
+    {
+        this.r = r;
+        this.GetComponent<SpriteRenderer>().sprite = r.getResourceImg();
+        this.GetComponent<SpriteRenderer>().transform.position = new Vector3(x, y, z);
+        //this.GetComponent<SpriteRenderer>().transform.localScale = new Vector3(0.35f, 0.35f, 1f);
+    }
+    public void UpdateBars()
+    {
+        GameObject city = GameObject.FindGameObjectWithTag("Home");
+        ResourcePool[] lista = city.GetComponents<ResourcePool>();
+
+        for (int i = 0; i < lista.Length; i++)
+        {
+            if (lista[i].GetResource().GetType().Equals(r.GetType()))
+            {
+                int amount = lista[i].GetAmount();
+                int max = lista[i].GetMaxCapacity();
+                float pros = amount*1f / max*1f;
+                if (max<110)
+                {
+                    SetSpritesForLevel1(pros);
+                } else
+                {
+                    SetSpritesForLevel2(pros);
+                }
+                
+            }
+        }
+    }
+    private void SetSpritesForLevel1(float pros)
+    {
+        if (pros <= 0.125)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[0];
+        }
+        else if (pros <= 0.375)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[1];
+        }
+        else if (pros <= 0.625)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[2];
+        }
+        else if (pros <= 0.875)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[3];
+        }
+        else
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[4];
+        }
+        
+    }
+    private void SetSpritesForLevel2(float pros)
+    {
+        if (pros <= 0.167)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[0];
+        }
+        else if (pros <= 0.333)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[1];
+        }
+        else if (pros <= 0.5)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[2];
+        }
+        else if (pros <= 0.667)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[3];
+        }
+        else if (pros <= 0.833)
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[4];
+        }
+        else
+        {
+            transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[5];
+        }
+        //transform.GetChild(0).GetComponent<SpriteRenderer>().transform.localScale = new Vector3(0.35f, 0.35f, 1f);
+    }
+
+
+}

Assets/Scripts/City/ResourceRow.cs.meta

+fileFormatVersion: 2
+guid: bd508a1c9a5505c498ef74ef59a55518
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Cloud.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Cloud : MonoBehaviour
+{
+
+    private void Start()
+    {
+        transform.localScale = new Vector3(Random.Range(2f, 5f), Random.Range(2f, 5f), 1);
+    }
+
+    void Update()
+    {
+        float x = transform.position.x;
+        transform.position = new Vector3(x-0.1f, transform.position.y, transform.position.z);
+        
+    }
+
+    private void OnBecameInvisible()
+    {
+        Destroy(gameObject);
+    }
+}

Assets/Scripts/Cloud.cs.meta

+fileFormatVersion: 2
+guid: fc89ba7face02fd46bb95930a9f0fb6e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/CloudSpawner.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CloudSpawner : MonoBehaviour
+{
+    [SerializeField]
+    private GameObject cloudPrefab = null;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        StartCoroutine("StartSpawning");   
+    }
+
+    private IEnumerator StartSpawning() {
+        while (true)
+        {
+            GameObject go = Instantiate<GameObject>(cloudPrefab);
+            Vector3 min = Camera.main.ScreenToWorldPoint(new Vector3(Camera.main.pixelWidth, 0, -10));
+            Vector3 max = Camera.main.ScreenToWorldPoint(new Vector3(Camera.main.pixelWidth, Camera.main.pixelHeight, -10));
+            go.transform.position = new Vector3(max.x+10, Random.Range(min.y,max.y),-5);
+            yield return new WaitForSeconds(Random.Range(2, 7));
+        }
+    }
+}

Assets/Scripts/CloudSpawner.cs.meta

+fileFormatVersion: 2
+guid: a991ff8c67bd56d448502bfbce3b0a4e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Collector.cs

@@ -13,6 +13,15 @@ public class Collector : MonoBehaviour
     [SerializeField]
     private int max_amount = 10;
 
+    [SerializeField]
+    private int Requested_amount;
+
+    [SerializeField]
+    private Resource Requested_resource;
+
+    [SerializeField]
+    private bool OnkoVapaa;
+
     [SerializeField]
     private int amount;
 
@@ -26,6 +35,8 @@ public class Collector : MonoBehaviour
     [SerializeField]
     private GameObject target_flag;
 
+    [SerializeField]
+    private bool send_to_resource;
     public GameObject flag;
     // Start is called before the first frame update
     void Start()
@@ -33,6 +44,17 @@ public class Collector : MonoBehaviour
         home = GameObject.FindGameObjectWithTag("Home");
     }
 
+    public GameObject GetMoveToTarget() {
+        return move_to;
+    }
+    public void SetOnkoVapaa(bool vapaa)
+    {
+        this.OnkoVapaa = vapaa;
+    }
+    public bool tarkistaVapaus()
+    {
+        return this.OnkoVapaa;
+    }
     public void SetTarget(GameObject target)
     {
         this.target = target;
@@ -41,18 +63,37 @@ public class Collector : MonoBehaviour
     {
         this.move_to = target;
     }
-    
+    public Resource getResource()
+    {
+        return this.resource;
+    }
+    public void SetSend_to_resource(bool r)
+    {
+        this.send_to_resource = r;
+    }
     // Update is called once per frame
     void Update()
     {
+        
         if (Input.GetMouseButtonDown(0))
         {
             Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
             Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y);
 
             RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero);
-            if (hit.collider != null)
+            if (hit.collider != null && hit.collider.gameObject != null)
             {
+
+                this.Requested_resource = null;
+                this.Requested_amount = 0;
+                if (hit.collider.gameObject.GetComponent<Outcrop>() != null && hit.collider.gameObject.tag == "Buildable")
+                {
+                    this.send_to_resource = true;
+                }
+                else
+                {
+                    this.send_to_resource = false;
+                }
                 DestroyImmediate(target_flag);
                 target_flag = Instantiate(flag, hit.point, Quaternion.identity);
                 target_flag.GetComponent<Flag>().SetWorker(this.gameObject);
@@ -69,33 +110,71 @@ public class Collector : MonoBehaviour
 
         if (target_flag != null)
         {
-            if(collision.gameObject.transform.position == target_flag.transform.position) { 
-                if(resource == null)
+            if(collision.gameObject.transform.position == target_flag.transform.position)
+            {
+
+                if (resource == null)
                 {
-                    /*if(target.GetComponent<Resource>().vie_tavaraa())
+                    if (home.GetComponent<BoxCollider2D>().bounds.Contains(new Vector3(target_flag.transform.position.x, target_flag.transform.position.y,home.transform.position.z)))
                     {
-                        
+                        Destroy(target_flag);
+                        this.resource = null;
+                        this.amount = 0;
+                    }
+                    else if (send_to_resource && target.GetComponent<Outcrop>() && target.tag == "Buildable")
+                    {
+                        if(this.amount > 0) { }
+                            target.GetComponent<Outcrop>().addResource(this.amount);
+                        Requested_resource = target.GetComponent<Outcrop>().getNeededResource();
+                        Requested_amount = target.GetComponent<Outcrop>().stillNeeded();
+                        if (this.Requested_amount == 0)
+                        {
+                            this.Requested_resource = null;
+                            this.target = null;
+                        }
+                        StartCoroutine("goHome");
                     }
                     else
-                    {*/
-                        //Amount of resources worker is carrying right now
-                        this.amount = target.GetComponent<Resource>().extractResource(this.max_amount);
-                        //Gives target resource to resource variable
-                        this.resource = this.target.GetComponent<Resource>();
-                    //}
-                   
+                    {
+                        if(target != null)
+                        {
+                            //Amount of resources worker is carrying right now
+                            this.amount = target.GetComponent<Resource>().extractResource(this.max_amount);
+                            //Gives target resource to resource variable
+                            this.resource = this.target.GetComponent<Resource>();
+                        }
+                        StartCoroutine("goHome");
+                    }
+
+                    
+                }
+                else
+                {
+                    StartCoroutine("goHome");
+                }               
+            }
+            else
+            {
+                if (collision.gameObject.GetComponent<BoxCollider2D>().bounds.Contains(new Vector3(home.transform.position.x, home.transform.position.y, collision.gameObject.transform.position.z)))
+                {
+                    if (target.GetComponent<Outcrop>() && this.Requested_resource != null)
+                    {
+                        if(this.Requested_amount < this.max_amount)
+                            this.amount = home.GetComponent<City>().UseResource(this.Requested_resource, this.Requested_amount);
+                        else
+                            this.amount = home.GetComponent<City>().UseResource(this.Requested_resource, this.max_amount);
+                    }
+                    else
+                    {
+                        //resets amount and resource variables
+                        collision.gameObject.GetComponent<City>().AddResource(this.resource, this.amount);
+                        this.amount = 0;
+                    }
+
+                    this.resource = null;
+                    MoveTo(this.target);
                 }
-                StartCoroutine("goHome");
             }
-        }
-         if (collision.gameObject.tag == "Home" && this.resource != null)
-        {
-            //resets amount and resource variables
-            collision.gameObject.GetComponent<City>().AddResource(this.resource, this.amount);
-            this.amount = 0;
-            this.resource = null;
-            MoveTo(this.target);
-            
         }
     }
     IEnumerator goHome()