Assets/Prefab/ground/Ground_8.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4464150565554338606
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 11986256192673350}
+  - component: {fileID: 2132359109036544280}
+  m_Layer: 0
+  m_Name: Ground_8
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &11986256192673350
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4464150565554338606}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1.164348, y: -2.5903997, 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 &2132359109036544280
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4464150565554338606}
+  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: 21300016, guid: f17d48e1bf4c3b544a405d8893353fdd, 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

Assets/Prefab/ground/Ground_8.prefab.meta

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

Assets/Prefab/worker.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &548039319383633024
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 548039319383633026}
+  - component: {fileID: 548039319383633027}
+  - component: {fileID: 6298442855940817967}
+  - component: {fileID: 548039319383633029}
+  - component: {fileID: 548039319383633028}
+  - component: {fileID: 548039319383633031}
+  m_Layer: 8
+  m_Name: worker
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &548039319383633026
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 548039319383633024}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.33653903, y: -0.41, 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 &548039319383633027
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 548039319383633024}
+  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: 488af5ae9ee5f2e48b2879b969ebc0a1, 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!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
+  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: 3f37862faf83d5a4f92009ca5d1c00f8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 548039319383633024}
+  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.3, y: 0.3}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.3, y: 0.3}
+  m_EdgeRadius: 0
+--- !u!50 &548039319383633031
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 548039319383633024}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 0
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 4

Assets/Prefab/worker.prefab.meta

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

Assets/Audio/kivikausi_1.bak.meta → Assets/Scenes/MainMenu.unity.meta

 fileFormatVersion: 2
-guid: b3fc5a2829ee9c34d9184cee2b3d9088
+guid: 782780faed4d8b1409a6034453c0627c
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/AudioSystem.cs

@@ -10,8 +10,10 @@ public class AudioSystem : MonoBehaviour, IAction
     private List<AudioClip> musics = new List<AudioClip>();
 
     [SerializeField]
-    private AudioSource ac;
+    private AudioSource ac = null;
+    
     // Start is called before the first frame update
+    
     void Start()
     {
 
@@ -22,16 +24,11 @@ public class AudioSystem : MonoBehaviour, IAction
         React(EventType.GameStarts);
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
+    
     public void React(EventType type) {
         if (type == EventType.GameStarts)
         {
-            GameStartsClip();
+           GameStartsClip();
         }
         if (type == EventType.CitySmall)
         {
@@ -51,36 +48,86 @@ public class AudioSystem : MonoBehaviour, IAction
         }
         if (type == EventType.WoodChopped)
         {
-            
+            WoodClip();
         }
         if (type == EventType.StoneCut)
         {
-            
+            StoneClip();
+        }
+        if (type == EventType.Berrypicked)
+        {
+            BerryClip();
+        }
+        if (type == EventType.UpgradeBuilt)
+        {
+            UpgradeClip();
+        }
+        if (type == EventType.TimePeriodChanged)
+        {
+            FanfareClip();
+        }
+        if (type == EventType.WinMusic)
+        {
+            WinClip();
+        }
+        if (type == EventType.Ultimate)
+        {
+            UltimateClip();
         }
     }
 
 
     public void GameStartsClip()
     {
-        StartCoroutine("FadeOutIn", new Timing(0,0));
+        StartCoroutine("PlayEffect", 6);
+        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, 6));
+        StartCoroutine("FadeOutIn", new Timing(1, 5));
+    }
+    public void WoodClip()
+    {
+        StartCoroutine("PlayEffect", 7);
+    }
+    public void StoneClip()
+    {
+        StartCoroutine("PlayEffect", 8);
+    }
+    public void BerryClip()
+    {
+        StartCoroutine("PlayEffect", 9);
+    }
+    public void UpgradeClip()
+    {
+        StartCoroutine("PlayEffect", 4);
+    }
+    public void FanfareClip()
+    {
+        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);
@@ -115,13 +162,20 @@ public class AudioSystem : MonoBehaviour, IAction
         {
             float current = Time.time - start;
             //(max-current)/(max-min)
-            float volume = (end - Time.time) / (end - start);
+            float volume = (Time.time - start) / (end - start);
             yield return null;
             ac.volume = volume;
         }
         ac.volume = 1;
     }
-
+    public IEnumerator PlayEffect(int clip)
+    {
+        AudioSource v = gameObject.AddComponent<AudioSource>();
+        v.clip = musics[clip];
+        v.Play();
+        yield return new WaitForSeconds(v.clip.length);
+        Destroy(v);
+    }
 
 
 

Assets/Scripts/CameraMover.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CameraMover : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (Input.anyKey) {
+            float x = transform.position.x;
+            float y = transform.position.y;
+            float z = transform.position.z;
+            if (Input.GetKey(KeyCode.LeftArrow)){
+                gameObject.transform.position = new Vector3(x - 0.1f, y, z);
+            }
+            if (Input.GetKey(KeyCode.RightArrow)){
+                gameObject.transform.position = new Vector3(x + 0.1f, y, z);
+            }
+            if (Input.GetKey(KeyCode.UpArrow)){
+                gameObject.transform.position = new Vector3(x, y + 0.1f, z);
+            }
+            if (Input.GetKey(KeyCode.DownArrow)){
+                gameObject.transform.position = new Vector3(x, y - 0.1f, z);
+            }
+        }
+    }
+}

Assets/Scripts/Resources.cs.meta → Assets/Scripts/CameraMover.cs.meta

 fileFormatVersion: 2
-guid: bad3649e66714d14d94d87cd3e47c1a1
+guid: 1d269887e77657841a2e967e56313d5a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/City.meta

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

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.meta

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

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.meta

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