diff --git a/Assets/NoFriction.physicMaterial b/Assets/NoFriction.physicMaterial new file mode 100644 index 0000000..7f2c685 --- /dev/null +++ b/Assets/NoFriction.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoFriction + dynamicFriction: 0 + staticFriction: 0 + bounciness: 0 + frictionCombine: 0 + bounceCombine: 0 diff --git a/Assets/NoFriction.physicMaterial.meta b/Assets/NoFriction.physicMaterial.meta new file mode 100644 index 0000000..943e13f --- /dev/null +++ b/Assets/NoFriction.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa15d3dbf2db3504eab6d81839f8c74b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab index b1a1f33..0fdac7b 100644 --- a/Assets/Prefabs/Buildings/House.prefab +++ b/Assets/Prefabs/Buildings/House.prefab @@ -52,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -89,7 +90,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795195828905777770} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -148,6 +149,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -213,7 +215,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 494189295979627311} - - component: {fileID: 8068927831030430839} - component: {fileID: 7337432708349338768} m_Layer: 0 m_Name: House @@ -238,22 +239,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8068927831030430839 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5179206290616997027} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!114 &7337432708349338768 MonoBehaviour: m_ObjectHideFlags: 0 @@ -268,3 +253,4 @@ MonoBehaviour: m_EditorClassIdentifier: title: House description: A place for people to live in. + buildingType: 0 diff --git a/Assets/Prefabs/Buildings/HouseConstruction.prefab b/Assets/Prefabs/Buildings/HouseConstruction.prefab index fedf1e8..07b56fb 100644 --- a/Assets/Prefabs/Buildings/HouseConstruction.prefab +++ b/Assets/Prefabs/Buildings/HouseConstruction.prefab @@ -52,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -89,7 +90,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1874134898345004315} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -147,6 +148,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -199,7 +201,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 301781106009560158} - - component: {fileID: 8041566757370854614} - component: {fileID: 1315160238030080861} m_Layer: 0 m_Name: HouseConstruction @@ -224,22 +225,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8041566757370854614 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4975262029746308050} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!114 &1315160238030080861 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d700a97..8bad401 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -135,11 +135,11 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 95348668} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} m_IsTrigger: 0 m_Enabled: 1 m_Radius: 0.8 - m_Height: 3.5 + m_Height: 4 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} --- !u!54 &95348670 @@ -662,6 +662,8 @@ RectTransform: - {fileID: 1690461076} - {fileID: 114639928} - {fileID: 1395840125} + - {fileID: 1218999544} + - {fileID: 1013976303} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -704,6 +706,7 @@ MonoBehaviour: m_EditorClassIdentifier: title: New Building description: A cool new building + buildingType: 0 inventory: [] inventorySpace: 0 --- !u!65 &763358971 @@ -783,6 +786,87 @@ Transform: m_Father: {fileID: 317073667} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1013976302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1013976303} + - component: {fileID: 1013976305} + - component: {fileID: 1013976304} + m_Layer: 5 + m_Name: DebugHelpText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1013976303 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013976302} + 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: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -282.94925, y: 150.14} + m_SizeDelta: {x: 257.1015, y: 68.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1013976304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013976302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '[K] To add wood + + [I] To add Stone' +--- !u!222 &1013976305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013976302} + m_CullTransparentMesh: 1 --- !u!1 &1048269303 GameObject: m_ObjectHideFlags: 0 @@ -875,7 +959,155 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f9379cc95b36d44bd902c97580c107, type: 3} m_Name: m_EditorClassIdentifier: - GamerManager: {fileID: 1861247503} +--- !u!1 &1218999543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1218999544} + - component: {fileID: 1218999547} + - component: {fileID: 1218999546} + - component: {fileID: 1218999545} + m_Layer: 5 + m_Name: ResourceText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1218999544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218999543} + 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: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -311.5, y: -12.2304} + m_SizeDelta: {x: 200, y: 324.4608} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1218999545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218999543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcb96c8b7ecf3554ab9aea050b13d5b1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1218999546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218999543} + 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 Wood + + 187 Stone' + 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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: 1.1531982} + 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 &1218999547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218999543} + m_CullTransparentMesh: 1 --- !u!4 &1238304666 stripped Transform: m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} @@ -1147,6 +1379,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 36.7 objectReference: {fileID: 0} + - target: {fileID: 4737916247134474313, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} propertyPath: m_Name value: House @@ -1413,7 +1649,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: timePeriod: 0.0002 - secondsOfDay: 60000 + secondsOfDay: 30000 --- !u!4 &1861247505 Transform: m_ObjectHideFlags: 0 @@ -1599,7 +1835,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.y - value: 25.47 + value: 22.1 objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.z @@ -1635,7 +1871,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537189371922023, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.z - value: -18.4 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3} diff --git a/Assets/Scripts/Character/PlayerMovement.cs b/Assets/Scripts/Character/PlayerMovement.cs index e11bc10..59dbc69 100644 --- a/Assets/Scripts/Character/PlayerMovement.cs +++ b/Assets/Scripts/Character/PlayerMovement.cs @@ -30,6 +30,8 @@ public class PlayerMovement : MonoBehaviour Vector3 movement; + + private void Start() { rb = GetComponent();