Merge branch 'NPC' of https://github.com/DerTyp187/fps-citybuild into NPC

Assets/Prefabs/FirstPerson Player.prefab

@@ -138,7 +138,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8390537188327133022}
-  - component: {fileID: 8390537188327133023}
   - component: {fileID: 8390537188327133020}
   - component: {fileID: 8390537188327132961}
   m_Layer: 0
@@ -165,24 +164,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!143 &8390537188327133023
-CharacterController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8390537188327133021}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Height: 3.8
-  m_Radius: 0.6
-  m_SlopeLimit: 45
-  m_StepOffset: 0.7
-  m_SkinWidth: 0.08
-  m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8390537188327133020
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -195,14 +176,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fcb8e32fc55ebe9478dee06683e84d92, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  controller: {fileID: 8390537188327133023}
   speed: 12
-  airSpeed: 0.7
+  adjustedSpeed: 0
-  sneakSpeed: 0.4
+  sneakSpeed: 0.8
-  sprintSpeed: 1.8
+  sprintSpeed: 1.1
-  sprintAirSpeed: 1.9
+  jumpHeight: 3.5
-  gravity: -19.62
-  jumpHeight: 4
   groundCheck: {fileID: 8390537187855206696}
   groundDistance: 0.4
   groundMask:
@@ -273,6 +251,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1

Assets/Scenes/SampleScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.2277222, g: 0.2251251, b: 0.2237271, a: 1}
+  m_IndirectSpecularColor: {r: 0.5996083, g: 0.5927744, b: 0.588867, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -128,6 +128,36 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
   m_PrefabInstance: {fileID: 8390537188401440993}
   m_PrefabAsset: {fileID: 0}
+--- !u!136 &95348669
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 95348668}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.8
+  m_Height: 3.5
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &95348670
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 95348668}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 112
+  m_CollisionDetection: 0
 --- !u!114 &95348673
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -382,6 +412,7 @@ Transform:
   - {fileID: 1667291200}
   - {fileID: 1238304666}
   - {fileID: 1300620966}
+  - {fileID: 763358974}
   m_Father: {fileID: 0}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -630,6 +661,7 @@ RectTransform:
   - {fileID: 1048269304}
   - {fileID: 1690461076}
   - {fileID: 114639928}
+  - {fileID: 1395840125}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -638,6 +670,119 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1 &763358969
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 763358974}
+  - component: {fileID: 763358973}
+  - component: {fileID: 763358972}
+  - component: {fileID: 763358971}
+  - component: {fileID: 763358970}
+  m_Layer: 0
+  m_Name: Warehouse
+  m_TagString: StorageBuilding
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &763358970
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763358969}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a48bc1459390b4459fbf54ad16b50f9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  title: New Building
+  description: A cool new building
+  inventory: []
+  inventorySpace: 0
+--- !u!65 &763358971
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763358969}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &763358972
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763358969}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &763358973
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763358969}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &763358974
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763358969}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 84.6, y: 21, z: 29.60771}
+  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_Children: []
+  m_Father: {fileID: 317073667}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1048269303
 GameObject:
   m_ObjectHideFlags: 0
@@ -788,6 +933,155 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3}
   m_PrefabInstance: {fileID: 1799643402}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1395840124
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1395840125}
+  - component: {fileID: 1395840128}
+  - component: {fileID: 1395840127}
+  - component: {fileID: 1395840126}
+  m_Layer: 5
+  m_Name: FPSText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1395840125
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1395840124}
+  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: 708126143}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -3.9089966}
+  m_SizeDelta: {x: 78.3094, y: 46.091}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &1395840126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1395840124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1866e0fb446be0342a91f95d71fc2c2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fpsText: {fileID: 0}
+  deltaTime: 0
+--- !u!114 &1395840127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1395840124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 187 FPS
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4278255384
+  m_fontColor: {r: 0.09455109, g: 1, b: 0, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 15
+  m_fontSizeBase: 15
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 1
+  m_HorizontalAlignment: 4
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1395840128
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1395840124}
+  m_CullTransparentMesh: 1
 --- !u!1 &1417065444 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
@@ -849,6 +1143,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1118460100164241581, guid: 613866d46c759a848b2a462973745a74, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 36.7
+      objectReference: {fileID: 0}
     - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3}
       propertyPath: m_Name
       value: House
@@ -1093,6 +1391,8 @@ GameObject:
   - component: {fileID: 1861247505}
   - component: {fileID: 1861247504}
   - component: {fileID: 1861247506}
+  - component: {fileID: 1861247507}
+  - component: {fileID: 1861247508}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -1113,7 +1413,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   timePeriod: 0.0002
-  secondsOfDay: 30000
+  secondsOfDay: 60000
 --- !u!4 &1861247505
 Transform:
   m_ObjectHideFlags: 0
@@ -1143,6 +1443,31 @@ MonoBehaviour:
   eventObject: {fileID: 8681335675325213624, guid: 240f676d062888042ac64a67d71aaa9d, type: 3}
   parentEventObject: {fileID: 1690461076}
   events: []
+--- !u!114 &1861247507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1861247503}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 241231c1be475704d8a3fded0c1a9d63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  storageBuildings: []
+--- !u!114 &1861247508
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1861247503}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f1735c997ccb39408dfa8bf3790319f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &7029954222161724659
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1198,7 +1523,8 @@ PrefabInstance:
       propertyPath: m_Name
       value: Terrain
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 7029954221290272539, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
 --- !u!1001 &8390537188401440993
 PrefabInstance:
@@ -1207,10 +1533,58 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8390537187866079437, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: mouseSensitivityX
+      value: 600
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537187866079437, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: mouseSensitivityY
+      value: 600
+      objectReference: {fileID: 0}
     - target: {fileID: 8390537188327132961, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
       propertyPath: interactionText
       value: 
       objectReference: {fileID: 114639929}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: gravity
+      value: -9.86
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: airSpeed
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: jumpForce
+      value: 3.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: jumpHeight
+      value: 3.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: sneakSpeed
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: sprintSpeed
+      value: 1.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: fallMultiplier
+      value: 1.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: sprintJumpSpeed
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: sneakSpeedModifier
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: jumpSprintSpeedModifier
+      value: 2000
+      objectReference: {fileID: 0}
     - target: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
       propertyPath: m_Name
       value: FirstPerson Player
@@ -1225,7 +1599,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 21.11
+      value: 25.47
       objectReference: {fileID: 0}
     - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
       propertyPath: m_LocalPosition.z
@@ -1259,5 +1633,9 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8390537189371922023, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -18.4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3}

Assets/Scripts/Building/Building.cs

@@ -4,9 +4,15 @@ using UnityEngine;
 
 public abstract class Building : MonoBehaviour
 {
+    public string title = "New Building";
+    public string description = "A cool new building";
 
-    public abstract string GetTitle();
+    public enum BuildingType
-    public abstract string GetDescription();
+    {
-
+        Housing,
+        Storage,
+        Decoration
+    }
 
+    public BuildingType buildingType;
 }

Assets/Scripts/Building/BuildingBlueprint.cs

@@ -14,6 +14,7 @@ public abstract class BuildingBlueprint : MonoBehaviour
     Ray ray;
 
     public abstract void Init();
+
     public abstract void WhileColliding();
     public abstract void WhileNotColliding();
 

Assets/Scripts/Building/Buildings.meta

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

Assets/Scripts/Building/Buildings/House/HouseBlueprint.cs

@@ -4,23 +4,29 @@ using UnityEngine;
 
 public class HouseBlueprint : BuildingBlueprint
 {
-    public Material collisionMat;
     
+    public Material collisionMat;
     public Material blueprintMat;
+
+
     private Transform houseCube;
 
     public override void Init()
     {
+        //Haus cube ím Obj -> hier wird es benutzt zum material ändern
         houseCube = gameObject.transform.Find("HouseCube");
     }
 
     public override void WhileColliding()
     {        
+        //Wenn es collidet soll der HouseCube IM Object verändert werden!
+        //Das ist bei jedem Building anders
         houseCube.GetComponent<MeshRenderer>().material = collisionMat;
     }
 
     public override void WhileNotColliding()
     {
+        //Das selbe wie bei "WhileColliding"
         houseCube.GetComponent<MeshRenderer>().material = blueprintMat;
     }
 }

Assets/Scripts/Building/Buildings/House/HouseBuildingScript.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class HouseBuildingScript : Building
+{
+    private void Start()
+    {
+        title = "House";
+        description = "A place to live in";
+        buildingType = BuildingType.Housing;
+    }
+
+}

Assets/Scripts/Building/Buildings/Warehouse.meta

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

Assets/Scripts/Building/Buildings/Warehouse/WarehouseBuilding.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WarehouseBuilding : StorageBuilding
+{
+
+    private void Start()
+    {
+        inventorySpace = 500;
+    }
+
+}

Assets/Scripts/Building/Buildings/Warehouse/WarehouseBuilding.cs.meta

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

Assets/Scripts/Building/House/HouseBuildingScript.cs

@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class HouseBuildingScript : Building
-{
-    [SerializeField] private string title = "House";
-    [SerializeField] private string description = "A place for people to live in.";
-
-    public override string GetTitle()
-    {
-        return title;
-    }
-    public override string GetDescription()
-    {
-        return description;
-    }
-}

Assets/Scripts/Building/InfoSign.cs

@@ -19,8 +19,6 @@ public class InfoSign : Interactable
 
     public override void Interact()
     {
-        Debug.Log(parentBuilding.GetTitle());
-
         Debug.Log("interact");
     }
 }

Assets/Scripts/Building/Types.meta

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

Assets/Scripts/Building/Types/StorageBuilding.cs

@@ -0,0 +1,102 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class StorageBuilding : Building
+{
+    [SerializeField] private List<Item> inventory = new List<Item>();
+    public int inventorySpace;
+
+    public void Start()
+    {
+        buildingType = BuildingType.Storage;
+    }
+    public void Add(Item item)
+    {
+        if(GetFreeSpace() >= item.count)
+        {
+            bool added = false;
+            //Check if the Item can get stacked
+            foreach (Item i in inventory)
+            {
+                if (i.uuid == item.uuid)
+                {
+                    i.count += item.count;
+                    added = true;
+                    return;
+                }
+                added = false;
+
+
+            }
+
+            //If foreach does not work just ADD (List is empty)
+            if (!added)
+            {
+                inventory.Add(item);
+            }
+           
+        }
+        else
+        {
+            Debug.Log("Inventory Full");
+        }
+        
+        //TODO mach wenn nicht ganz voll, dass dann so viele items added werden wie platz ist
+        //Sonst wird bei 20 Holz KOMPLETT nein gesagt weil/obowhl 19 Space noch da ist
+    }
+
+    public void Remove(Item item)
+    {
+        //Check if the Item can get stacked
+        foreach (Item i in inventory)
+        {
+            if (i.uuid == item.uuid)
+            {
+                if(i.count > item.count)
+                {
+                    i.count -= item.count;
+                }else if(i.count <= item.count)
+                {
+                    //!!!Muss eventuell später anders gehandelt werden!!!
+                    inventory.Remove(i); //Wenn du mehr entfernst als im Inventar ist, dann wird das Item einfach komplett removed
+                }
+            }
+        } 
+    }
+
+    public int GetCountOfItem(Item item)
+    {
+        int count = 0;
+        foreach(Item i in inventory)
+        {
+            if(i.uuid == item.uuid)
+            {
+                count += i.count;
+            }
+        }
+        return count;
+
+    }
+
+    public int GetUsedSpace()
+    {
+        int usedSpace = 0;
+
+        foreach(Item item in inventory)
+        {
+            usedSpace += item.count;
+        }
+
+        return usedSpace;
+    }
+
+    public int GetFreeSpace()
+    {
+        return inventorySpace - GetUsedSpace();
+    }
+    public List<Item> Getinventory()
+    {
+        return inventory;
+    }
+}

Assets/Scripts/Building/Types/StorageBuilding.cs.meta

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

Assets/Scripts/Character.meta

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

Assets/Scripts/Character/PlayerMovement.cs

@@ -0,0 +1,108 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerMovement : MonoBehaviour
+{
+    [Header("Force Modifier")]
+    [SerializeField] private float speed = 12f;
+    
+    [SerializeField] private float sneakSpeedModifier = 0.7f;
+    [SerializeField] private float sprintSpeedModifier = 1.4f;
+    [SerializeField] private float jumpSprintSpeedModifier = 20f;
+    [SerializeField] private float jumpForce = 3.5f;
+    [SerializeField] private float fallMultiplier = 2.5f;
+
+    [Header("Ground Check")]
+    [SerializeField] private Transform groundCheck;
+    [SerializeField] private float groundDistance = 0.4f;
+    [SerializeField] private LayerMask groundMask;
+
+    public bool isSprinting = false;
+    public bool isSneaking = false;
+
+    private Rigidbody rb;
+    private bool isGrounded;
+    private float modifiedSpeed;
+    private bool isJumpSprinting = false;
+    float x;
+    float z;
+
+    Vector3 movement;
+
+    private void Start()
+    {
+        rb = GetComponent<Rigidbody>();
+    }
+
+    private void Update()
+    {
+        Grounded();
+        Jump();
+        MovementSpeed();
+    }
+
+    private void FixedUpdate()
+    {  
+        rb.velocity = movement;
+        
+    }
+
+    private void Grounded()
+    {
+        //Check every frame if the player stands on the ground
+        isGrounded = Physics.CheckSphere(groundCheck.position, groundDistance, groundMask);
+
+        if (isGrounded)
+        {
+            isJumpSprinting = false;
+        }
+
+    }
+    private void MovementSpeed()
+    {
+        modifiedSpeed = speed; //RESET speed
+
+
+        //Sprint
+        if (Input.GetButton("Sprint") && isGrounded)
+        {
+            isSprinting = true;
+            modifiedSpeed *= sprintSpeedModifier;
+        }
+        else
+        {
+            isSprinting = false;
+            //Sneak
+            if (Input.GetButton("Sneak") && isGrounded)
+            {
+                isSneaking = true;
+                modifiedSpeed *= sneakSpeedModifier;
+            }
+            else
+            {
+                isSneaking = false;
+            }
+        }    
+
+        x = Input.GetAxis("Horizontal");
+        z = Input.GetAxis("Vertical");
+
+        movement = x * modifiedSpeed * transform.right + new Vector3(0, rb.velocity.y, 0) + z * modifiedSpeed * transform.forward;
+    }
+
+    private void Jump()
+    {
+        //Better Falling
+        if(rb.velocity.y < 0)
+        {
+            rb.velocity += Vector3.up * Physics.gravity.y * (fallMultiplier - 1) * Time.deltaTime;
+        }
+
+        if (Input.GetButtonDown("Jump") && isGrounded)
+        {
+            //Add Force Up To Jump
+            rb.AddForce(Vector3.up * jumpForce * 100); //Times 100 -> so we can use smaller numbers in the editor
+        }
+    }
+}

Assets/Scripts/FPSCounter.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+public class FPSCounter : MonoBehaviour
+{
+    public TMPro.TextMeshProUGUI fpsText;
+    public float deltaTime;
+    void Start()
+    {
+        fpsText = gameObject.GetComponent<TMPro.TextMeshProUGUI>();
+    }
+
+    void Update()
+    {
+        deltaTime += (Time.deltaTime - deltaTime) * 0.1f;
+        float fps = 1.0f / deltaTime;
+        fpsText.text = Mathf.Ceil(fps).ToString() + "FPS";
+    }
+}

Assets/Scripts/FPSCounter.cs.meta

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

Assets/Scripts/NPC/TerrainGenerator.cs

@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TerrainGenerator : MonoBehaviour
+{    
+    public (float y, bool isTerrain) GetTerrainHit(float x, float z)
+    {
+        float y = 0;
+        bool isTerrain = false;
+        Vector3 position = new Vector3(x, 50, z);
+        
+
+        RaycastHit hit;
+
+        if(Physics.Raycast(position, Vector3.down, out hit, Mathf.Infinity))
+        {
+            if(hit.transform.tag == "Terrain")
+            {
+                Debug.Log("Terrain Hit");
+                y = hit.point.y;
+                Debug.Log(hit.point.y);
+                isTerrain = true;
+            }
+            else
+            {
+                y = hit.point.y;
+            }
+            
+        }
+        else
+        {
+            Debug.Log("Terrain not Hit");
+        }
+
+            
+
+        return (y, isTerrain);
+    }
+}

Assets/Scripts/NPC/TerrainGenerator.cs.meta

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

Assets/Scripts/PlayerMovement.cs

@@ -1,102 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PlayerMovement : MonoBehaviour
-{
-
-    [SerializeField] private CharacterController controller;
-    //[SerializeField] private Transform playerTransform;
-    [SerializeField] private float speed = 12f;
-    [SerializeField] private float airSpeed = 0.6f;
-    [SerializeField] private float sneakSpeed = 0.4f;
-    [SerializeField] private float sprintSpeed = 1.8f;
-    [SerializeField] private float sprintAirSpeed = 1.4f;
-    [SerializeField] private float gravity = -9.81f;
-    [SerializeField] private float jumpHeight = 3f;
-    
-
-    [SerializeField] private Transform groundCheck;
-    [SerializeField] private float groundDistance = 0.4f;
-    [SerializeField] private LayerMask groundMask;
-
-    private Vector3 velocity;
-    private bool isGrounded;
-    private bool isSprinting = false;
-    private bool isSneaking = false;
-
-    void Update()
-    {
-        //GROUND CHECK
-        //Creates an invisible sphere on the bottom of our player
-        //And checks if it's colliding with something !with the "ground"-Mask in Unity!
-        isGrounded = Physics.CheckSphere(groundCheck.position, groundDistance, groundMask);
-
-        //Reset velocity if grounded
-        if (isGrounded && velocity.y < 0)
-        {
-            velocity.y = -2f;
-        }
-       
-           
-        //MOVEMENT
-        //Input.GetAxis is based on the Unity Input settings (edit -> Project Settings -> Input Manager)
-        float x = Input.GetAxis("Horizontal");
-        float z = Input.GetAxis("Vertical");
-        //Create move vector !in look direction!
-        Vector3 move;
-
-        if (isGrounded)//for air control
-        {
-             move = transform.right * x + transform.forward * z;
-
-            //SPRINT
-            if (Input.GetButton("Sprint"))
-            {
-                move *= sprintSpeed;
-                isSprinting = true;
-            }
-            else
-            {
-                //SNEAK
-                if (Input.GetButton("Sneak"))
-                {
-                    move *= sneakSpeed;
-                    isSneaking = true;
-                    //Kommt mit character model und animations
-                }
-                else
-                {
-                    isSneaking = false;
-                }
-                isSprinting = false;
-            }
-
-            //JUMP
-            if (Input.GetButtonDown("Jump"))
-            {
-                velocity.y = Mathf.Sqrt(jumpHeight * -2f * gravity);
-            }            
-        }
-        else//Air control
-        {
-            if (isSprinting)
-            {
-                move = transform.right * x * airSpeed * sprintAirSpeed + transform.forward * z * airSpeed * sprintAirSpeed;
-            }
-            else
-            {
-                move = transform.right * x * airSpeed + transform.forward * z * airSpeed;
-            }
-        }
-
-        //Apply move vector
-        controller.Move(move * speed * Time.deltaTime);
-
-        //Add gravity to current velocity
-        velocity.y += gravity * Time.deltaTime;
-        //apply gravity
-        controller.Move(velocity * Time.deltaTime);//nochmal time.deltatime wegen irgendwas mit physikalischer Formel und so
-
-    }
-}

Assets/Scripts/ResourceUiTextScript.cs

@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ResourceUiTextScript : MonoBehaviour
+{
+    private ResourceManager resourceManager;
+
+
+    private string str = "";
+    private TMPro.TextMeshProUGUI textResource;
+
+    private void Start()
+    {
+        resourceManager = GameObject.Find("GameManager").GetComponent<ResourceManager>();
+        textResource = GetComponent<TMPro.TextMeshProUGUI>();
+    }
+    void Update()
+    {
+        List<Item> inventory = new List<Item>();
+        inventory = resourceManager.GetAllResources();
+        str = "";
+        foreach(Item i in inventory)
+        {
+            if(i != null)
+            {
+                str += i.count.ToString() + " " + i.name + "\n";
+            }
+            
+        }
+
+        textResource.text = str;
+    }
+}

Assets/Scripts/ResourceUiTextScript.cs.meta

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

Assets/Scripts/Resources.meta

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

Assets/Scripts/Resources/Items.meta

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

Assets/Scripts/Resources/Items/StoneItem.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class StoneItem : Item
+{
+    public StoneItem(int c = 1)
+    {
+        count = c;
+        name = "Stone";
+        uuid = "item_stone";
+    }
+}

Assets/Scripts/Resources/Items/StoneItem.cs.meta

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

Assets/Scripts/Resources/Items/WoodItem.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WoodItem : Item
+{
+    public WoodItem(int c = 1)
+    {
+        count = c;
+        name = "Wood";
+        uuid = "item_wood"; 
+    }
+}

Assets/Scripts/Resources/Items/WoodItem.cs.meta

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

Assets/Scripts/Resources/Scripts.meta

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

Assets/Scripts/Resources/Scripts/Item.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[System.Serializable]
+public class Item
+{
+    public string name = "New Item";
+    public string uuid = "new_item";
+    public Sprite icon = null;
+    public int count = 1;
+
+    public Item(int c = 1)
+    {
+        count = c;
+    }
+}

Assets/Scripts/Resources/Scripts/Item.cs.meta

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

Assets/Scripts/Resources/Scripts/ResourceManager.cs

@@ -0,0 +1,72 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ResourceManager: MonoBehaviour
+{
+    [SerializeField] private GameObject[] storageBuildings;
+    
+    private void Start()
+    {
+        storageBuildings = GameObject.FindGameObjectsWithTag("StorageBuilding");
+    }
+
+    
+    private void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.K))
+        {
+            Item wood = new WoodItem(10);
+            storageBuildings[0].GetComponent<StorageBuilding>().Add(wood);
+        }
+
+        if (Input.GetKeyDown(KeyCode.I))
+        {
+            Item stone = new StoneItem(12);
+            storageBuildings[0].GetComponent<StorageBuilding>().Add(stone);
+        }
+
+        if (Input.GetKeyDown(KeyCode.L))
+        {
+            GetAllResources();
+        }
+    }
+
+
+    public List<Item> GetAllResources()
+    {
+        List<Item> inventory = new List<Item>();
+
+        //Für jedes StorageBuilding
+        foreach(GameObject b in storageBuildings)
+        {
+            List<Item> buildingInv = b.GetComponent<StorageBuilding>().Getinventory();
+
+            //Add items to already existing item +=
+            foreach (Item item in buildingInv)
+            { 
+                foreach(Item i in inventory)
+                {
+                    if(i.uuid == item.uuid)
+                    {
+                        i.count += item.count;
+                        buildingInv.Remove(item);
+                    }
+                }
+            }
+
+            //Add den Rest
+            foreach(Item item in buildingInv)
+            {
+                inventory.Add(item);
+            }
+        }
+
+        /*
+        Debug.Log(inventory);
+        Debug.Log(inventory[0].count);
+        Debug.Log(inventory[1].count);*/
+
+        return inventory;
+    }
+}

Assets/Scripts/Resources/Scripts/ResourceManager.cs.meta

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

Assets/Scripts/TimeTextScript.cs

@@ -5,18 +5,19 @@ using UnityEngine.UI;
 
 public class TimeTextScript : MonoBehaviour
 {
-    [SerializeField] private GameObject GamerManager;
+    private GameObject GameManager;
 
     private string timeStr = "";
     private Text timeText;
 
     private void Start()
     {
+        GameManager = GameObject.Find("GameManager");
         timeText = GetComponent<Text>();
     }
     void Update()
     {
-        timeStr = GamerManager.GetComponent<TimeManager>().GetTimeString();
+        timeStr = GameManager.GetComponent<TimeManager>().GetTimeString();
         timeText.text = timeStr;
     }
 }

Packages/manifest.json

@@ -1,12 +1,12 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": "1.9.0",
-    "com.unity.ide.rider": "2.0.7",
+    "com.unity.ide.rider": "3.0.7",
     "com.unity.ide.visualstudio": "2.0.11",
-    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.ide.vscode": "1.2.4",
     "com.unity.test-framework": "1.1.29",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.4.8",
+    "com.unity.timeline": "1.5.6",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

@@ -15,11 +15,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "2.0.7",
+      "version": "3.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.1"
+        "com.unity.ext.nunit": "1.0.6"
       },
       "url": "https://packages.unity.com"
     },
@@ -33,7 +33,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.3",
+      "version": "1.2.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -60,7 +60,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.4.8",
+      "version": "1.5.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {

ProjectSettings/DynamicsManager.asset

@@ -3,10 +3,11 @@
 --- !u!55 &1
 PhysicsManager:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 13
-  m_Gravity: {x: 0, y: -9.81, z: 0}
+  m_Gravity: {x: 0, y: -12, z: 0}
   m_DefaultMaterial: {fileID: 0}
   m_BounceThreshold: 2
+  m_DefaultMaxDepenetrationVelocity: 10
   m_SleepThreshold: 0.005
   m_DefaultContactOffset: 0.01
   m_DefaultSolverIterations: 6
@@ -22,6 +23,7 @@ PhysicsManager:
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1
   m_ClothInterCollisionSettingsToggle: 0
+  m_ClothGravity: {x: 0, y: -9.81, z: 0}
   m_ContactPairsMode: 0
   m_BroadphaseType: 0
   m_WorldBounds:
@@ -31,4 +33,5 @@ PhysicsManager:
   m_FrictionType: 0
   m_EnableEnhancedDeterminism: 0
   m_EnableUnifiedHeightmaps: 1
-  m_DefaultMaxAngluarSpeed: 7
+  m_SolverType: 0
+  m_DefaultMaxAngularSpeed: 7

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.18f1
+m_EditorVersion: 2021.1.22f1
-m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c)
+m_EditorVersionWithRevision: 2021.1.22f1 (a137e5fb0427)

ProjectSettings/TagManager.asset

@@ -9,6 +9,7 @@ TagManager:
   - Building
   - Terrain
   - Blueprint
+  - StorageBuilding
   layers:
   - Default
   - TransparentFX