Reworked code, Code cleanup, No new Version

.vscode/settings.json

@@ -0,0 +1,55 @@
+{
+    "files.exclude":
+    {
+        "**/.DS_Store":true,
+        "**/.git":true,
+        "**/.gitmodules":true,
+        "**/*.booproj":true,
+        "**/*.pidb":true,
+        "**/*.suo":true,
+        "**/*.user":true,
+        "**/*.userprefs":true,
+        "**/*.unityproj":true,
+        "**/*.dll":true,
+        "**/*.exe":true,
+        "**/*.pdf":true,
+        "**/*.mid":true,
+        "**/*.midi":true,
+        "**/*.wav":true,
+        "**/*.gif":true,
+        "**/*.ico":true,
+        "**/*.jpg":true,
+        "**/*.jpeg":true,
+        "**/*.png":true,
+        "**/*.psd":true,
+        "**/*.tga":true,
+        "**/*.tif":true,
+        "**/*.tiff":true,
+        "**/*.3ds":true,
+        "**/*.3DS":true,
+        "**/*.fbx":true,
+        "**/*.FBX":true,
+        "**/*.lxo":true,
+        "**/*.LXO":true,
+        "**/*.ma":true,
+        "**/*.MA":true,
+        "**/*.obj":true,
+        "**/*.OBJ":true,
+        "**/*.asset":true,
+        "**/*.cubemap":true,
+        "**/*.flare":true,
+        "**/*.mat":true,
+        "**/*.meta":true,
+        "**/*.prefab":true,
+        "**/*.unity":true,
+        "build/":true,
+        "Build/":true,
+        "Library/":true,
+        "library/":true,
+        "obj/":true,
+        "Obj/":true,
+        "ProjectSettings/":true,
+        "temp/":true,
+        "Temp/":true
+    }
+}

Assets/Prefabs/PineTree.prefab

@@ -9,9 +9,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6403671343560478198}
-  - component: {fileID: 6403671343560478197}
   - component: {fileID: 8376604988453278612}
   - component: {fileID: 1614156360672071162}
+  - component: {fileID: 5116785560581361872}
   m_Layer: 0
   m_Name: PineTree
   m_TagString: Object:Tree
@@ -29,11 +29,41 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 6, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6403671343560478197
+--- !u!54 &8376604988453278612
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6403671343560478196}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 90
+  m_CollisionDetection: 0
+--- !u!65 &1614156360672071162
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6403671343560478196}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.28, y: 1.28, z: 0.2}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!212 &5116785560581361872
 SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,9 +71,10 @@ SpriteRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6403671343560478196}
   m_Enabled: 1
-  m_CastShadows: 1
+  m_CastShadows: 0
-  m_ReceiveShadows: 1
+  m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -84,32 +115,3 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!54 &8376604988453278612
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6403671343560478196}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 90
-  m_CollisionDetection: 0
---- !u!65 &1614156360672071162
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6403671343560478196}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1.28, y: 1.28, z: 0.2}
-  m_Center: {x: 0, y: 0, z: 0}

Assets/Prefabs/craftable.prefab

@@ -1,183 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1447051553155802074
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1447051553155802073}
-  - component: {fileID: 1447051553155802079}
-  - component: {fileID: 1447051553155802072}
-  m_Layer: 5
-  m_Name: icon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1447051553155802073
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447051553155802074}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1447051553851155087}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -10, y: -10}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1447051553155802079
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447051553155802074}
-  m_CullTransparentMesh: 1
---- !u!114 &1447051553155802072
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447051553155802074}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
---- !u!1 &1447051553616085063
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1447051553616085062}
-  - component: {fileID: 1447051553616085060}
-  - component: {fileID: 1447051553616085061}
-  m_Layer: 5
-  m_Name: background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1447051553616085062
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447051553616085063}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1447051553851155087}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -10, y: -10}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1447051553616085060
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447051553616085063}
-  m_CullTransparentMesh: 1
---- !u!114 &1447051553616085061
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447051553616085063}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
---- !u!1 &1447051553851155080
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1447051553851155087}
-  m_Layer: 5
-  m_Name: craftable
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1447051553851155087
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447051553851155080}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1447051553616085062}
-  - {fileID: 1447051553155802073}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 75, y: 0}
-  m_SizeDelta: {x: 100, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/craftable.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9897f5d0e84917342828166d8fce361c
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/craftingRecipe.prefab

@@ -1,74 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1237241787062479250
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3230771289994164044}
-  - component: {fileID: 4593984540951252618}
-  - component: {fileID: 561032699250191462}
-  m_Layer: 5
-  m_Name: craftingRecipe
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3230771289994164044
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1237241787062479250}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, 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}
-  m_AnchorMin: {x: 0, y: 0.1}
-  m_AnchorMax: {x: 0.1, y: 0.9}
-  m_AnchoredPosition: {x: 7.5, y: 0}
-  m_SizeDelta: {x: -15, y: -10}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4593984540951252618
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1237241787062479250}
-  m_CullTransparentMesh: 1
---- !u!114 &561032699250191462
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1237241787062479250}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1

Assets/Prefabs/craftingRecipe.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e0c3446688e484b41b344561c53a3245
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/GameScene.unity

@@ -935,7 +935,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &66523172
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1988,7 +1988,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &125253396
 RectTransform:
   m_ObjectHideFlags: 0
@@ -20206,6 +20206,7 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &1469570407
 GameObject:
   m_ObjectHideFlags: 0
@@ -21807,10 +21808,18 @@ PrefabInstance:
       propertyPath: m_StaticEditorFlags
       value: 4294967295
       objectReference: {fileID: 0}
+    - target: {fileID: 6403671343560478197, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
+      propertyPath: m_DrawMode
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6403671343560478197, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
       propertyPath: m_ReceiveShadows
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6403671343560478197, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
+      propertyPath: m_MaskInteraction
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6403671343560478198, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
       propertyPath: m_RootOrder
       value: 1
@@ -21829,7 +21838,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6403671343560478198, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 4.5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 6403671343560478198, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
       propertyPath: m_LocalPosition.z
@@ -21863,6 +21872,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7190563918972443284, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
 --- !u!1 &1623671172
@@ -22226,7 +22239,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 681295929}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.4374999
+  m_Size: 0.43750003
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Scripts/Controls.cs

@@ -59,7 +59,7 @@ public class Controls : MonoBehaviour
                             Destroy(target);
                             break;
                         case "Stone":
-                            GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Stone"));
+                            GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Rock"));
                             Destroy(target);
                             break;
                         case "NPC":

Assets/Scripts/Handler.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 64c2f7c4937560c4e91a13674c1677fe
+guid: 71efee93c90768be4812cb603d42dc98
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/Handler/SceneHandler.cs

@@ -29,18 +29,6 @@ namespace Assets.Scripts
             }
         }
 
-        // Start is called before the first frame update
-        void Start()
-        {
-
-        }
-
-        // Update is called once per frame
-        void Update()
-        {
-
-        }
-
         public void openMenuScene()
         {
             SceneManager.LoadSceneAsync("MenuScene", LoadSceneMode.Single);

Assets/Scripts/House.cs

@@ -33,11 +33,17 @@ namespace Assets.Scripts
             }
             else
             {
-                playerPosition = GameObject.Find("Player").transform.position;
+                int openChance = new System.Random().Next(4);
-                houseInstance = Instantiate(houseObject);
+                if(openChance == 0){
-                houseInstance.transform.position = new Vector3(playerPosition.x, 50, playerPosition.z);
+                    playerPosition = GameObject.Find("Player").transform.position;
-                houseInstance.transform.localScale = new Vector3(1, 1, 1);
+                    houseInstance = Instantiate(houseObject);
-                GameObject.Find("Player").transform.position = new Vector3(playerPosition.x, 51, playerPosition.z);
+                    houseInstance.transform.position = new Vector3(playerPosition.x, 50, playerPosition.z);
+                    houseInstance.transform.localScale = new Vector3(1, 1, 1);
+                    GameObject.Find("Player").transform.position = new Vector3(playerPosition.x, 51, playerPosition.z);
+                }
+                else{
+                    GameObject.Find("UIHandler").GetComponent<UIHandler>().showMessage("ERROR;This house is locked.");
+                }
             }
             hasInteracted = true;
         }
@@ -56,6 +62,7 @@ namespace Assets.Scripts
                 switch (type)
                 {
                     case 0:
+                        // Maybe add luck to increase chance for equipment
                         item = new Equipment(luck);
                         break;
                     case 1:

Assets/Scripts/Inventory.cs

@@ -187,7 +187,7 @@ namespace Assets.Scripts
             return startDrag;
         }
 
-        public Item getEquip(ItemPlace place)
+        /*public Item getEquip(ItemPlace place)
         {
             switch (place)
             {
@@ -210,7 +210,7 @@ namespace Assets.Scripts
                 default:
                     return null;
             }
-        }
+        }*/
 
         public void calculateStatBoost(Dictionary<string, int> attributes, bool isAddition)
         {

Assets/Scripts/Items/Item.cs

@@ -89,7 +89,7 @@ namespace Assets.Scripts
                 case "Wood":
                     image = Resources.Load<Texture>("Items/Inv_Wood");
                     break;
-                case "Stone":
+                case "Rock":
                     image = Resources.Load<Texture>("Items/Inv_Stone");
                     break;
             }
@@ -129,8 +129,8 @@ namespace Assets.Scripts
                 case "Wood":
                     result = "Quite a nice piece of wood";
                     break;
-                case "Stone":
+                case "Rock":
-                    result = "A small stone to craft with";
+                    result = "Is it... Dwayne?";
                     break;
             }
             return result;

Assets/Scripts/Menu/UIHandlerMenu.cs

@@ -23,11 +23,6 @@ namespace Assets.Scripts.Menu
             SteamWorksHandler.getStandardAchievement("StartAchievement");
         }
 
-        void Update()
-        {
-
-        }
-
         public void startGame(SceneHandler sceneHandler)
         {
             int cityAmount = 0;

Assets/Scripts/NewTileScript.cs

@@ -1,203 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class NewTileScript : MonoBehaviour
-{
-    Vector3 position;
-    float borderNorth;
-    float borderEast;
-    float borderSouth;
-    float borderWest;
-    System.Random rand = new System.Random();
-    string tilename;
-    GameObject contentGenerator;
-
-    List<GameObject> aliveEnemies = new List<GameObject>();
-    List<GameObject> deadEnemies = new List<GameObject>();
-
-    public void generateTile(Vector3 pos, string name)
-    {
-        tilename = name;
-        //contentGenerator = GameObject.Find("ContentGenerator");
-        setPosition(pos);
-        setBorders();
-        //generateContent();
-    }
-
-    public void setBorders()
-    {
-        borderNorth = position.z * 100 + 50;
-        borderEast = position.x * 100 + 50;
-        borderSouth = position.z * 100 - 50;
-        borderWest = position.x * 100 - 50;
-    }
-
-    public void generateContent()
-    {
-        if (!tilename.ToLower().Equals("City"))
-        {
-            foreach (Vector3 position in getSpawnLocations())
-            {
-                spawnObject(position);
-            }
-        }
-    }
-
-    public List<Vector3> getSpawnLocations()
-    {
-        List<Vector3> list = new List<Vector3>();
-        int xChange = 0;
-        int zChange = 0;
-        for (float i = borderNorth - 10; i >= borderSouth + 10; i = i - 10)
-        {
-            for (float j = borderWest + 10; j <= borderEast - 10; j = j + 10)
-            {
-                xChange = rand.Next(-4, +4);
-                zChange = rand.Next(-4, +4);
-                list.Add(new Vector3(j + xChange, 5, i + zChange));
-            }
-        }
-        return list;
-    }
-
-    public void spawnObject(Vector3 position)
-    {
-        int chance = rand.Next(1, 101);
-        if (chance >= 50)
-        {
-            GameObject content = contentGenerator.GetComponent<ContentGenerator>().generateContent(tilename);
-            if (content != null)
-            {
-                GameObject obj = Instantiate(content, position, Quaternion.identity);
-                obj.transform.parent = gameObject.transform;
-                if (obj.tag.Contains("Enemy"))
-                {
-                    aliveEnemies.Add(obj);
-                }
-            }
-        }
-    }
-
-    public void setPosition(Vector3 position)
-    {
-        this.position = position;
-    }
-
-    public Vector3 getPosition()
-    {
-        return position;
-    }
-
-    public bool leftTile(float playerX, float playerZ)
-    {
-        bool result = false;
-        if (playerX >= borderEast + 10 || playerX <= borderWest - 10 || playerZ >= borderNorth + 10 || playerZ <= borderSouth - 10)
-        {
-            changeRenderer();
-            result = true;
-        }
-        return result;
-    }
-
-    public void changeRenderer()
-    {
-        foreach (Rigidbody rigid in gameObject.GetComponentsInChildren<Rigidbody>())
-        {
-            if (!deadEnemies.Contains(rigid.gameObject))
-            {
-                rigid.useGravity = !rigid.useGravity;
-            }
-        }
-
-        foreach (Renderer rend in gameObject.GetComponentsInChildren<Renderer>())
-        {
-            if (!deadEnemies.Contains(rend.gameObject))
-            {
-                rend.enabled = !rend.enabled;
-            }
-        }
-
-        foreach (Collider col in gameObject.GetComponentsInChildren<Collider>())
-        {
-            if (!deadEnemies.Contains(col.gameObject))
-            {
-                col.enabled = !col.enabled;
-            }
-        }
-    }
-
-    public void resetSpawn()
-    {
-        foreach (Rigidbody rigid in gameObject.GetComponentsInChildren<Rigidbody>())
-        {
-            rigid.useGravity = true;
-        }
-
-        foreach (Renderer rend in gameObject.GetComponentsInChildren<Renderer>())
-        {
-            rend.enabled = true;
-        }
-
-        foreach (Collider col in gameObject.GetComponentsInChildren<Collider>())
-        {
-            col.enabled = true;
-        }
-    }
-
-    public bool enteredTile(float playerX, float playerZ)
-    {
-        bool result = false;
-        if (playerX <= borderEast && playerX >= borderWest && playerZ <= borderNorth && playerZ >= borderSouth)
-        {
-            result = true;
-        }
-        return result;
-    }
-
-    public Vector3 needConnectedTile(float playerX, float playerZ)
-    {
-        Vector3 result = new Vector3(position.x, 1, position.z);
-        if (playerX >= borderEast - 10)
-        {
-            result.x = result.x + 1;
-            result.y = 0;
-        }
-        else if (playerX <= borderWest + 10)
-        {
-            result.x = result.x - 1;
-            result.y = 0;
-        }
-
-        if (playerZ >= borderNorth - 10)
-        {
-            result.z = result.z + 1;
-            result.y = 0;
-        }
-        else if (playerZ <= borderSouth + 10)
-        {
-            result.z = result.z - 1;
-            result.y = 0;
-        }
-        return result;
-    }
-
-    public bool removeConnectedTiles(float playerX, float playerZ)
-    {
-        bool result = false;
-        if (playerX <= borderEast - 10 && playerX >= borderWest + 10 && playerZ <= borderNorth - 10 && playerZ >= borderSouth + 10)
-        {
-            result = true;
-        }
-        return result;
-    }
-
-    public void enemyKilled(GameObject enemy)
-    {
-        deadEnemies.Add(enemy);
-        enemy.GetComponent<Rigidbody>().useGravity = false;
-        enemy.GetComponent<Renderer>().enabled = false;
-        enemy.GetComponent<Collider>().enabled = false;
-        aliveEnemies.Remove(enemy);
-    }
-}

Assets/Scripts/NewTileScript.cs.meta

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

Assets/Scripts/PlayerCamera.cs

@@ -53,7 +53,7 @@ namespace Assets.Scripts
                             displayInformation("Tree");
                             break;
                         case "stone":
-                            displayInformation("Stone");
+                            displayInformation("Rock");
                             break;
                         case "npc":
                             displayInformation("NPC");

Assets/Scripts/Quests/CollectQuest.cs

@@ -20,8 +20,8 @@ namespace Assets.Scripts
                     keyword = "Slimeball";
                     break;
                 case 1:
-                    questname = questname + "stones";
+                    questname = questname + "rocks";
-                    keyword = "Stone";
+                    keyword = "Rock";
                     break;
                 case 2:
                     questname = questname + "wood";
@@ -102,7 +102,7 @@ namespace Assets.Scripts
             {
                 return true;
             }
-            if (keyword == "Stone" && item.getName().ToLower().Contains("stone"))
+            if (keyword == "Rock" && item.getName().ToLower().Contains("rock"))
             {
                 return true;
             }

Assets/Storage.meta

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

Packages/Newtonsoft.Json.13.0.1/LICENSE.md

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2007 James Newton-King
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Packages/manifest.json

@@ -1,12 +1,13 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.17.7",
+    "com.unity.collab-proxy": "2.0.1",
-    "com.unity.ide.rider": "3.0.16",
+    "com.unity.ide.rider": "3.0.18",
-    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.ide.visualstudio": "2.0.17",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
+    "com.unity.toolchain.linux-x86_64": "2.0.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
@@ -38,6 +39,8 @@
     "com.unity.modules.video": "1.0.0",
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
-    "com.unity.modules.xr": "1.0.0"
+    "com.unity.modules.xr": "1.0.0",
+    "com.unity.nuget.newtonsoft-json": "3.1.0",
+    "com.rlabrecque.steamworks.net": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net#20.1.0"
   }
 }

Packages/packages-lock.json

@@ -1,12 +1,17 @@
 {
   "dependencies": {
+    "com.rlabrecque.steamworks.net": {
+      "version": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net#20.1.0",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "53d17180582752d7d8c9a757742da3a52dfc33d4"
+    },
     "com.unity.collab-proxy": {
-      "version": "1.17.7",
+      "version": "2.0.1",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
+      "dependencies": {},
-        "com.unity.services.core": "1.0.1"
-      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
@@ -17,7 +22,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.16",
+      "version": "3.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -26,7 +31,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.16",
+      "version": "2.0.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -42,20 +47,25 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "3.0.2",
+      "version": "3.1.0",
-      "depth": 2,
+      "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.services.core": {
+    "com.unity.sysroot": {
-      "version": "1.6.0",
+      "version": "2.0.5",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.sysroot.linux-x86_64": {
+      "version": "2.0.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.sysroot": "2.0.5"
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -91,6 +101,16 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.toolchain.linux-x86_64": {
+      "version": "2.0.4",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.5",
+        "com.unity.sysroot.linux-x86_64": "2.0.4"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ugui": {
       "version": "1.0.0",
       "depth": 0,

ProjectSettings/PackageManagerSettings.asset

@@ -12,10 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 0
+  m_EnablePreReleasePackages: 0
   m_EnablePackageDependencies: 0
   m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
   oneTimeWarningShown: 0
   m_Registries:
   - m_Id: main
@@ -24,20 +25,12 @@ MonoBehaviour:
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
+    m_ConfigSource: 0
   m_UserSelectedRegistryName: 
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
-    m_ErrorMessage: 
-    m_Original:
-      m_Id: 
-      m_Name: 
-      m_Url: 
-      m_Scopes: []
-      m_IsDefault: 0
-      m_Capabilities: 0
     m_Modified: 0
-    m_Name: 
+    m_ErrorMessage: 
-    m_Url: 
+    m_UserModificationsInstanceId: -824
-    m_Scopes:
+    m_OriginalInstanceId: -826
-    - 
+  m_LoadAssets: 0
-    m_SelectedScopeIndex: 0

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.16f1
+m_EditorVersion: 2021.3.22f1
-m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f)
+m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3)

ProjectSettings/QualitySettings.asset

@@ -229,6 +229,7 @@ QualitySettings:
     Nintendo Switch: 5
     PS4: 5
     PSP2: 2
+    Server: 0
     Stadia: 5
     Standalone: 5
     WebGL: 3

ProjectSettings/TimelineSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60

ProjectSettings/UnityConnectSettings.asset

@@ -9,6 +9,7 @@ UnityConnectSettings:
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
   m_ConfigUrl: https://config.uca.cloud.unity3d.com
+  m_DashboardUrl: https://dashboard.unity3d.com
   m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity3d.com
@@ -22,6 +23,7 @@ UnityConnectSettings:
     m_Enabled: 0
     m_TestMode: 0
     m_InitializeOnStartup: 1
+    m_PackageRequiringCoreStatsPresent: 0
   UnityAdsSettings:
     m_Enabled: 0
     m_InitializeOnStartup: 1

UserSettings/EditorUserSettings.asset

@@ -8,6 +8,9 @@ EditorUserSettings:
     RecentlyUsedSceneGuid-0:
       value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
       flags: 0
+    RecentlyUsedSceneGuid-1:
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      flags: 0
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0

UserSettings/Layouts/default-2021.dwlt

@@ -15,15 +15,15 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 43
+    y: 64
     width: 1920
-    height: 1037
+    height: 989
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: Hierarchy
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 1
+  m_Maximized: 0
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -44,11 +44,11 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 1920
-    height: 987
+    height: 939
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 16
+  controlID: 82
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -64,12 +64,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1530
+    x: 1529
     y: 0
-    width: 390
+    width: 391
-    height: 987
+    height: 939
-  m_MinSize: {x: 276, y: 71}
+  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -93,9 +93,9 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 240
-    height: 682
+    height: 649
-  m_MinSize: {x: 201, y: 221}
+  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -117,9 +117,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 682
+    y: 649
-    width: 1530
+    width: 1529
-    height: 305
+    height: 290
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 13}
@@ -149,7 +149,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1920
-    height: 1037
+    height: 989
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -194,7 +194,7 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1017
+    y: 969
     width: 1920
     height: 20
   m_MinSize: {x: 0, y: 0}
@@ -218,12 +218,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1530
+    width: 1529
-    height: 987
+    height: 939
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 17
+  controlID: 83
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -243,12 +243,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1530
+    width: 1529
-    height: 682
+    height: 649
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 18
+  controlID: 84
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -266,10 +266,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 240
     y: 0
-    width: 1290
+    width: 1289
-    height: 682
+    height: 649
-  m_MinSize: {x: 202, y: 221}
+  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -305,6 +305,7 @@ MonoBehaviour:
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+    m_OverlaysVisible: 1
 --- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -326,13 +327,14 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 755
+    y: 770
-    width: 1529
+    width: 1528
-    height: 284
+    height: 269
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+    m_OverlaysVisible: 1
   m_SearchFilter:
     m_NameFilter: 
     m_ClassNames: []
@@ -346,22 +348,22 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts
+    - Assets/Sounds
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Scripts
+  - Assets/Sounds
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: C:\Users\testaccount\Desktop\TalesOfNovariel
+  m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 12}
+    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 385b0000
+    m_SelectedIDs: a6580000
-    m_LastClickedID: 23352
+    m_LastClickedID: 22694
-    m_ExpandedIDs: 00000000d45a000000ca9a3b
+    m_ExpandedIDs: 000000004458000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -377,7 +379,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 5}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -389,7 +391,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d45a0000
+    m_ExpandedIDs: 0000000044580000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -416,8 +418,8 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000
+    m_ExpandedInstanceIDs: c623000000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -465,14 +467,15 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1530
+    x: 1529
-    y: 73
+    y: 121
-    width: 389
+    width: 390
-    height: 966
+    height: 918
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+    m_OverlaysVisible: 1
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
@@ -507,19 +510,20 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 73
+    y: 121
     width: 239
-    height: 661
+    height: 628
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+    m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: c0670000
+      m_SelectedIDs: 804d0000
-      m_LastClickedID: 26560
+      m_LastClickedID: 19840
-      m_ExpandedIDs: 44f7ffff36fbffffba5400001266000062660000
+      m_ExpandedIDs: 36fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -564,9 +568,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 240
-    y: 73
+    y: 121
-    width: 1288
+    width: 1287
-    height: 661
+    height: 628
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -791,6 +795,7 @@ MonoBehaviour:
       id: Scene View/Tilemap Palette Helper
       index: 12
       layout: 4
+    m_OverlaysVisible: 1
   m_WindowGUID: b85945ae8dd2cea46915e8777ee5c800
   m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
@@ -801,9 +806,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 337.69574, y: 398.7556, z: -594.9133}
+    m_Target: {x: 9.49, y: 3.9999998, z: 19.03}
     speed: 2
-    m_Value: {x: 337.69574, y: 398.7556, z: -594.9133}
+    m_Value: {x: 9.49, y: 3.9999998, z: 19.03}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -850,13 +855,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.08257358, y: 0.058262125, z: -0.004835765, w: 0.9948688}
+    m_Target: {x: 0.20776509, y: 0.7471252, z: -0.27255636, w: 0.56949925}
     speed: 2
-    m_Value: {x: 0.08406578, y: 0.058254797, z: -0.0049231523, w: 0.9947437}
+    m_Value: {x: 0.2077673, y: 0.74713314, z: -0.27255926, w: 0.5695053}
   m_Size:
-    m_Target: 74.677956
+    m_Target: 29.54632
     speed: 2
-    m_Value: 71.46216
+    m_Value: 29.54632
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -902,20 +907,21 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 240
-    y: 73
+    y: 121
-    width: 1288
+    width: 1287
-    height: 661
+    height: 628
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+    m_OverlaysVisible: 1
   m_SerializedViewNames: []
   m_SerializedViewValues: []
   m_PlayModeViewName: GameView
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1288, y: 640}
+  m_TargetSize: {x: 1287, y: 607}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -930,10 +936,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -644
+    m_HBaseRangeMin: -643.5
-    m_HBaseRangeMax: 644
+    m_HBaseRangeMax: 643.5
-    m_VBaseRangeMin: -320
+    m_VBaseRangeMin: -303.5
-    m_VBaseRangeMax: 320
+    m_VBaseRangeMax: 303.5
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -951,23 +957,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1288
+      width: 1287
-      height: 640
+      height: 607
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 644, y: 320}
+    m_Translation: {x: 643.5, y: 303.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -644
+      x: -643.5
-      y: -320
+      y: -303.5
-      width: 1288
+      width: 1287
-      height: 640
+      height: 607
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1288, y: 661}
+  m_LastWindowPixelSize: {x: 1287, y: 628}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -994,10 +1000,11 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 755
+    y: 770
-    width: 1529
+    width: 1528
-    height: 284
+    height: 269
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+    m_OverlaysVisible: 1

UserSettings/Search.settings

@@ -0,0 +1 @@
+{}

packages.config

@@ -1,4 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net471" />
-</packages>