Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	Assets/Scripts/DayController.cs.meta

Assets/Scenes/SampleScene.unity

@@ -202,7 +202,108 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1535275592
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1535275595}
+  - component: {fileID: 1535275594}
+  - component: {fileID: 1535275593}
+  m_Layer: 0
+  m_Name: Square
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1535275593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535275592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f096d187f76a734fac022700054dfec, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  spriteRenderer: {fileID: 1535275594}
+  selectedSprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+  defaultSprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+--- !u!212 &1535275594
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535275592}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  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_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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 &1535275595
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535275592}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.19512245, y: 0.14398842, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scripts/DayController.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 58c0126592cc1c046b50a775a3fd43b5
+guid: 7dcb0c75c1d32a949af7eb4303f3b6a6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/IUsable.cs

@@ -0,0 +1,5 @@
+using UnityEngine;
+
+public interface IUsable {
+    public void select();
+}

Assets/Scripts/IUsable.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0a43c014841945fcb929ab1fb7198e8f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Item.cs

@@ -0,0 +1,17 @@
+using UnityEngine;
+
+public class Item : MonoBehaviour {
+    private string displayName;
+    private string description;
+    private int id;
+    public SpriteRenderer spriteRenderer;
+    public Sprite selectedSprite;
+    public Sprite defaultSprite;
+
+    public Item(string displayName, string description, int id) {
+        this.displayName = displayName;
+        this.description = description;
+        this.id = id;
+        spriteRenderer.sprite = defaultSprite;   // defaultSprite is set in UnityEditor
+    }
+}

Assets/Scripts/Item.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5f096d187f76a734fac022700054dfec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Items.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd6385a1b78fe80479618d50cf5ff510
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Items/FishingRod.cs

@@ -0,0 +1,6 @@
+using UnityEngine;
+
+namespace Items {
+    public class FishingRod : MonoBehaviour {
+    }
+}

Assets/Scripts/Items/FishingRod.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b08796f3a5662aa43a460c7ddd6796b3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Items/Hoe.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Items {
+    public class Hoe : MonoBehaviour {
+    }
+}

Assets/Scripts/Items/Hoe.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa6ceecfb09ac614997702b2caf66e33
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Items/Scythe.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Items {
+    public class Scythe : MonoBehaviour {
+    }
+}

Assets/Scripts/Items/Scythe.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 641048df0d7668f48a857c454e2bd320
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Items/WateringCan.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Items {
+    public class WateringCan : MonoBehaviour {
+    }
+}

Assets/Scripts/Items/WateringCan.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7e19228f49932534e8af0218c51e5c63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Items/Wheat.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Items {
+    public class Wheat : MonoBehaviour {
+    }
+}

Assets/Scripts/Items/Wheat.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 207be0ed7f8f5714c97b7ac5deb8956d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Items/WheatSeed.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Items {
+    public class WheatSeed : MonoBehaviour {
+    }
+}

Assets/Scripts/Items/WheatSeed.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0808be748388ede4ba57db7d74401617
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/RiderScriptEditorPersistedState.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 0}
   m_Name: 
   m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
-  lastWriteTicks: -8585497851335773342
+  lastWriteTicks: -8585494760213472651