Compare revisions

5dc8cff6 · 5dc8cff6 · 5dc8cff6 · 5dc8cff6 · 5dc8cff6 · 5dc8cff6
--- a/Assets/Audio/Ogg/kivikausi_fast_4.ogg.meta
+++ b/Assets/Audio/Ogg/kivikausi_fast_4.ogg.meta
+fileFormatVersion: 2
+guid: a5c5c1c02f056e04ca16e3277134468a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Audio/Ogg/kivikausi_stoneEffect.ogg
+++ b/Assets/Audio/Ogg/kivikausi_stoneEffect.ogg
--- a/Assets/Audio/Ogg/kivikausi_stoneEffect.ogg.meta
+++ b/Assets/Audio/Ogg/kivikausi_stoneEffect.ogg.meta
+fileFormatVersion: 2
+guid: 865d4c2b00bfe8c478c6396b67dadbe1
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Audio/Ogg/kivikausi_woodeffect.ogg
+++ b/Assets/Audio/Ogg/kivikausi_woodeffect.ogg
--- a/Assets/Audio/Ogg/kivikausi_woodeffect.ogg.meta
+++ b/Assets/Audio/Ogg/kivikausi_woodeffect.ogg.meta
+fileFormatVersion: 2
+guid: 61e35e515cbaa5c47b3e76f5ed99017b
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Audio/Ogg/lautanen.ogg
+++ b/Assets/Audio/Ogg/lautanen.ogg
--- a/Assets/Audio/Ogg/lautanen.ogg.meta
+++ b/Assets/Audio/Ogg/lautanen.ogg.meta
+fileFormatVersion: 2
+guid: 40d9a3c7b9ef0db47bae90209c9aabfa
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Audio/kivikausi.bak
+++ b/Assets/Audio/kivikausi.bak
--- a/Assets/Audio/kivikausi.it
+++ b/Assets/Audio/kivikausi.it
--- a/Assets/Audio/kivikausi_1.bak
+++ b/Assets/Audio/kivikausi_1.bak
--- a/Assets/Audio/kivikausi_1.it
+++ b/Assets/Audio/kivikausi_1.it
--- a/Assets/Audio/kivikausi_2.it
+++ b/Assets/Audio/kivikausi_2.it
--- a/Assets/Audio/kivikausi_4.it
+++ b/Assets/Audio/kivikausi_4.it
--- a/Assets/Audio/kivikausi_5.it
+++ b/Assets/Audio/kivikausi_5.it
--- a/Assets/Audio/kivikausi_5.it.meta
+++ b/Assets/Audio/kivikausi_5.it.meta
-fileFormatVersion: 2
-guid: d9b37223090a0a94bad400813c2f713d
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 1
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Audio/kivikausi_6.it
+++ b/Assets/Audio/kivikausi_6.it
--- a/Assets/Audio/kivikausi_6.it.meta
+++ b/Assets/Audio/kivikausi_6.it.meta
-fileFormatVersion: 2
-guid: 92c3c637aed077f43ab264957eba75d5
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 1
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Prefab/City.prefab
+++ b/Assets/Prefab/City.prefab
@@ -11,10 +11,10 @@ GameObject:
  - component: {fileID: 7607310651946833764}
  - component: {fileID: 7607310651946833763}
  - component: {fileID: 7607310651946833765}
-  - component: {fileID: 7607310651946833766}
+  - component: {fileID: 2939609430767332389}
  m_Layer: 0
  m_Name: City
-  m_TagString: Untagged
+  m_TagString: Home
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -29,7 +29,8 @@ Transform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0.3698252, y: 0.5438592, z: -0.01}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 3746671060121448619}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -70,7 +71,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: a69243cd6bee5c34497418b7bbea1e20, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4ffb6badf0a2c454c990a42fe64e9d03, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
@@ -98,7 +99,7 @@ BoxCollider2D:
  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}
+    oldSize: {x: 1, y: 1}
    newSize: {x: 1.28, y: 1.28}
    adaptiveTilingThreshold: 0.5
    drawMode: 0
@@ -107,7 +108,7 @@ BoxCollider2D:
  serializedVersion: 2
  m_Size: {x: 1.28, y: 1.28}
  m_EdgeRadius: 0
--- !u!114 &7607310651946833766
+--- !u!114 &2939609430767332389
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -116,12 +117,120 @@ MonoBehaviour:
  m_GameObject: {fileID: 7607310651946833762}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dfe928a858872424991e927606dd4bc3, type: 3}
+  m_Script: {fileID: 11500000, guid: f67208887d2c19940b9afdc55a275b38, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  worker: {fileID: 0}
+  sprites:
+  - {fileID: 21300000, guid: 4ffb6badf0a2c454c990a42fe64e9d03, type: 3}
+  - {fileID: 21300002, guid: 4ffb6badf0a2c454c990a42fe64e9d03, type: 3}
+  - {fileID: 21300004, guid: 4ffb6badf0a2c454c990a42fe64e9d03, type: 3}
+  - {fileID: 21300006, guid: 4ffb6badf0a2c454c990a42fe64e9d03, type: 3}
+  - {fileID: 21300008, guid: 4ffb6badf0a2c454c990a42fe64e9d03, type: 3}
+  respanelPrefab: {fileID: 3345454733487414898, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+    type: 3}
+  resrowPrefab: {fileID: 5085001290068357248, guid: 72232997f27e3c2448b5ad647af22a35,
+    type: 3}
+  workerlista: []
+  worker: {fileID: 548039319383633024, guid: 7dc194a2047a39340a91ca7636a56290, type: 3}
  population: 0
  populationLevel: 0
  resourcePoolLevel: 0
  roadLevel: 0
-  collectorLevel: 0
+  paneelienmaara: 0
+  shopPreFab: {fileID: 7162492650952366835, guid: f0354d4d550e4994cb346ed8fce67111,
+    type: 3}
+--- !u!1001 &5416443199572362591
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7607310651946833764}
+    m_Modifications:
+    - target: {fileID: 3345454733487414898, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_Name
+      value: ResourcePanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.048
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 570719359789660831, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.266
+      objectReference: {fileID: 0}
+    - target: {fileID: 570719359789660831, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.311
+      objectReference: {fileID: 0}
+    - target: {fileID: 6645068624957739557, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.274
+      objectReference: {fileID: 0}
+    - target: {fileID: 6645068624957739557, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.06
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 588b79ebfef5a2c4887615dc4856cc0c, type: 3}
+--- !u!4 &3746671060121448619 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8707088784372610548, guid: 588b79ebfef5a2c4887615dc4856cc0c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5416443199572362591}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefab/Cloud.prefab
+++ b/Assets/Prefab/Cloud.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6668825413784912564
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3688115099138184988}
+  - component: {fileID: 6429550116959099573}
+  - component: {fileID: 71507196037364545}
+  m_Layer: 0
+  m_Name: Cloud
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3688115099138184988
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6668825413784912564}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.5467253, y: 2.434422, z: 0}
+  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 &6429550116959099573
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6668825413784912564}
+  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: 038ab914524b2d64a93a0e9c7e9ca39f, type: 3}
+  m_Color: {r: 0.6320754, g: 0.5933161, b: 0.5933161, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.28, y: 1.28}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &71507196037364545
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6668825413784912564}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc89ba7face02fd46bb95930a9f0fb6e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/Prefab/Tree.prefab.meta
+++ b/Assets/Prefab/Tree.prefab.meta
 fileFormatVersion: 2
-guid: 3d8a1dd57f0015c4093d8bfb80c3c303
+guid: 2babd10b31bdc6d428669be0be6eb6df
 PrefabImporter:
  externalObjects: {}
  userData:
No results found