diff --git a/Assets/Prefabs/Environment.meta b/Assets/Prefabs/Environment.meta new file mode 100644 index 0000000..0e504cd --- /dev/null +++ b/Assets/Prefabs/Environment.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a900e8d399e60d48b2bd25f5262a63a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Dead_tree.prefab b/Assets/Prefabs/Environment/Dead_tree.prefab similarity index 57% rename from Assets/Prefabs/Dead_tree.prefab rename to Assets/Prefabs/Environment/Dead_tree.prefab index fec8faf..b55cb88 100644 --- a/Assets/Prefabs/Dead_tree.prefab +++ b/Assets/Prefabs/Environment/Dead_tree.prefab @@ -9,8 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3166060144221640604} - - component: {fileID: 6245116447582154154} - - component: {fileID: 402954765394153811} + - component: {fileID: 5341687097576871250} m_Layer: 0 m_Name: Dead_tree m_TagString: Untagged @@ -25,28 +24,73 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2137876346625107343} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -1.6339722, y: 0.038012344, z: -0.3002777} - m_LocalScale: {x: 100, y: 100, z: 100} - m_Children: [] + 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: 4616236479771704966} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6245116447582154154 +--- !u!114 &5341687097576871250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137876346625107343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 049498ca6910d2d4d915c7a47791a4dc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6637954899673181019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4616236479771704966} + - component: {fileID: 9029510604829603663} + - component: {fileID: 4717565708862088803} + m_Layer: 0 + m_Name: Tree + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4616236479771704966 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6637954899673181019} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_Children: [] + m_Father: {fileID: 3166060144221640604} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &9029510604829603663 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2137876346625107343} + m_GameObject: {fileID: 6637954899673181019} m_Mesh: {fileID: 2534964839176971238, guid: ae19706e422d48b4384dd004bef022d4, type: 3} ---- !u!23 &402954765394153811 +--- !u!23 &4717565708862088803 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2137876346625107343} + m_GameObject: {fileID: 6637954899673181019} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 diff --git a/Assets/Prefabs/Dead_tree.prefab.meta b/Assets/Prefabs/Environment/Dead_tree.prefab.meta similarity index 100% rename from Assets/Prefabs/Dead_tree.prefab.meta rename to Assets/Prefabs/Environment/Dead_tree.prefab.meta diff --git a/Assets/Prefabs/Leaf_tree.prefab b/Assets/Prefabs/Environment/Leaf_tree.prefab similarity index 90% rename from Assets/Prefabs/Leaf_tree.prefab rename to Assets/Prefabs/Environment/Leaf_tree.prefab index 3cbc56d..2fb288b 100644 --- a/Assets/Prefabs/Leaf_tree.prefab +++ b/Assets/Prefabs/Environment/Leaf_tree.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 406921540526134496} + - component: {fileID: -5668215921841812939} m_Layer: 0 m_Name: Leaf_tree m_TagString: Untagged @@ -23,15 +24,27 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3746701478695610099} - m_LocalRotation: {x: -0, y: 0.999904, z: -0, w: -0.01385765} - m_LocalPosition: {x: -1.2794775, y: 0, z: -0.516605} + 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: 4203266783660374525} - {fileID: 6913806443210402374} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 181.588, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-5668215921841812939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3746701478695610099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 049498ca6910d2d4d915c7a47791a4dc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5331336565524747940 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Leaf_tree.prefab.meta b/Assets/Prefabs/Environment/Leaf_tree.prefab.meta similarity index 100% rename from Assets/Prefabs/Leaf_tree.prefab.meta rename to Assets/Prefabs/Environment/Leaf_tree.prefab.meta diff --git a/Assets/Prefabs/Player.meta b/Assets/Prefabs/Player.meta new file mode 100644 index 0000000..9bc564e --- /dev/null +++ b/Assets/Prefabs/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a00e77ddfd42ef4d900eaa30591b07b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab new file mode 100644 index 0000000..957657a --- /dev/null +++ b/Assets/Prefabs/Player/Player.prefab @@ -0,0 +1,230 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6125707628839966531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6125707628839966534} + - component: {fileID: 6125707628839966529} + - component: {fileID: 6125707628839966528} + - component: {fileID: 6125707628839966535} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6125707628839966534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707628839966531} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6125707630481988396} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &6125707628839966529 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707628839966531} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.1 + far clip plane: 200 + field of view: 75 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: 1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &6125707628839966528 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707628839966531} + m_Enabled: 1 +--- !u!114 &6125707628839966535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707628839966531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 6125707628839966534} + volumeLayer: + serializedVersion: 2 + m_Bits: 256 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 3 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] +--- !u!1 &6125707630481988399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6125707630481988396} + - component: {fileID: 6125707630481988370} + - component: {fileID: 6125707630481988397} + - component: {fileID: 6125707630481988371} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6125707630481988396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707630481988399} + m_LocalRotation: {x: -0, y: -0.13947806, z: -0, w: 0.9902252} + m_LocalPosition: {x: 0.62, y: 0.08, z: -1.93} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6125707628839966534} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -16.035, z: 0} +--- !u!114 &6125707630481988370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707630481988399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b656f92dbeaf1784786c317df80ca152, type: 3} + m_Name: + m_EditorClassIdentifier: + BodyTransform: {fileID: 6125707630481988396} + HeadTransform: {fileID: 6125707628839966534} +--- !u!114 &6125707630481988397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707630481988399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b513dcf57a19464b92ff712f770f105, type: 3} + m_Name: + m_EditorClassIdentifier: + MovementSpeed: 4 + JumpVelocity: 4 + JumpGracePeriod: 0.2 + Antislipperiness: 10 + AntislipperinessInAir: 3 + Grounded: 0 +--- !u!143 &6125707630481988371 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6125707630481988399} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 1.8 + m_Radius: 0.25 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.9, z: 0} diff --git a/Assets/Prefabs/Player/Player.prefab.meta b/Assets/Prefabs/Player/Player.prefab.meta new file mode 100644 index 0000000..dd85638 --- /dev/null +++ b/Assets/Prefabs/Player/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 558201eae20fa5540a826edb23937665 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI.meta b/Assets/Prefabs/UI.meta new file mode 100644 index 0000000..5ae39d5 --- /dev/null +++ b/Assets/Prefabs/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6398d32a06ca4a84ebb67a8fb3508046 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/Pause Menu.prefab b/Assets/Prefabs/UI/Pause Menu.prefab new file mode 100644 index 0000000..1a6bbdb --- /dev/null +++ b/Assets/Prefabs/UI/Pause Menu.prefab @@ -0,0 +1,142 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5400695019851472733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5400695019851472732} + - component: {fileID: 5400695019851472734} + - component: {fileID: 5400695019851472735} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5400695019851472732 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5400695019851472733} + 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: 5400695020334462789} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5400695019851472734 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5400695019851472733} + m_CullTransparentMesh: 0 +--- !u!114 &5400695019851472735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5400695019851472733} + 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: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 72 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Paused +--- !u!1 &5400695020334462842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5400695020334462789} + - component: {fileID: 5400695020334462788} + - component: {fileID: 5400695020334462791} + m_Layer: 5 + m_Name: Pause Menu + m_TagString: Pause Menu + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5400695020334462789 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5400695020334462842} + 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: 5400695019851472732} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &5400695020334462788 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5400695020334462842} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &5400695020334462791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5400695020334462842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6829428ba845e44e915027851669930, type: 3} + m_Name: + m_EditorClassIdentifier: + Paused: 0 diff --git a/Assets/Prefabs/UI/Pause Menu.prefab.meta b/Assets/Prefabs/UI/Pause Menu.prefab.meta new file mode 100644 index 0000000..aaee11e --- /dev/null +++ b/Assets/Prefabs/UI/Pause Menu.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2cd64e49ad7ad1c4bb4a4264703d7915 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 8560e6d..45dc37e 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -570,227 +570,6 @@ Light: m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!1 &890724280 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 890724281} - - component: {fileID: 890724283} - - component: {fileID: 890724282} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &890724281 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 890724280} - 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: 1344354208} - m_RootOrder: 0 - 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: 0, y: 0} - m_SizeDelta: {x: 400, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &890724282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 890724280} - 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: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 48 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 72 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Paused ---- !u!222 &890724283 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 890724280} - m_CullTransparentMesh: 0 ---- !u!1 &963194225 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 963194228} - - component: {fileID: 963194227} - - component: {fileID: 963194226} - - component: {fileID: 963194229} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &963194226 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 ---- !u!20 &963194227 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.1 - far clip plane: 200 - field of view: 75 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: 1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &963194228 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1195794718} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &963194229 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} - m_Name: - m_EditorClassIdentifier: - volumeTrigger: {fileID: 963194228} - volumeLayer: - serializedVersion: 2 - m_Bits: 256 - stopNaNPropagation: 1 - finalBlitToCameraTarget: 0 - antialiasingMode: 3 - temporalAntialiasing: - jitterSpread: 0.75 - sharpness: 0.25 - stationaryBlending: 0.95 - motionBlending: 0.85 - subpixelMorphologicalAntialiasing: - quality: 2 - fastApproximateAntialiasing: - fastMode: 0 - keepAlpha: 0 - fog: - enabled: 1 - excludeSkybox: 1 - debugLayer: - lightMeter: - width: 512 - height: 256 - showCurves: 1 - histogram: - width: 512 - height: 256 - channel: 3 - waveform: - exposure: 0.12 - height: 256 - vectorscope: - size: 256 - exposure: 0.12 - overlaySettings: - linearDepth: 0 - motionColorIntensity: 4 - motionGridSize: 64 - colorBlindnessType: 0 - colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} - m_ShowToolkit: 0 - m_ShowCustomSorter: 0 - breakBeforeColorGrading: 0 - m_BeforeTransparentBundles: [] - m_BeforeStackBundles: [] - m_AfterStackBundles: [] --- !u!1 &1161135095 GameObject: m_ObjectHideFlags: 0 @@ -826,153 +605,18 @@ Transform: m_Father: {fileID: 1660514110} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1195794717 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1195794718} - - component: {fileID: 1195794720} - - component: {fileID: 1195794719} - - component: {fileID: 1195794721} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1195794718 +--- !u!4 &1195794718 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + m_PrefabInstance: {fileID: 6125707629521091122} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195794717} - m_LocalRotation: {x: -0, y: -0.13947806, z: -0, w: 0.9902252} - m_LocalPosition: {x: 0.62, y: 0.08, z: -1.93} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 963194228} - m_Father: {fileID: 1660514110} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: -16.035, z: 0} ---- !u!114 &1195794719 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195794717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b513dcf57a19464b92ff712f770f105, type: 3} - m_Name: - m_EditorClassIdentifier: - MovementSpeed: 4 - JumpVelocity: 4 - JumpGracePeriod: 0.2 - Antislipperiness: 10 - AntislipperinessInAir: 3 - Grounded: 0 ---- !u!114 &1195794720 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195794717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b656f92dbeaf1784786c317df80ca152, type: 3} - m_Name: - m_EditorClassIdentifier: - BodyTransform: {fileID: 1195794718} - HeadTransform: {fileID: 963194228} ---- !u!143 &1195794721 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195794717} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 1.8 - m_Radius: 0.25 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0.9, z: 0} ---- !u!1 &1344354207 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1344354208} - - component: {fileID: 1344354209} - - component: {fileID: 1344354210} - m_Layer: 5 - m_Name: Pause Menu - m_TagString: Pause Menu - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1344354208 +--- !u!224 &1344354208 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + m_PrefabInstance: {fileID: 5400695019531174117} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1344354207} - 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: 890724281} - m_Father: {fileID: 1921606960} - m_RootOrder: 0 - 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: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &1344354209 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1344354207} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1344354210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1344354207} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6829428ba845e44e915027851669930, type: 3} - m_Name: - m_EditorClassIdentifier: - Paused: 0 --- !u!1 &1660514109 GameObject: m_ObjectHideFlags: 0 @@ -1701,3 +1345,191 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5400695019531174117 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1921606960} + m_Modifications: + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5400695020334462842, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, + type: 3} + propertyPath: m_Name + value: Pause Menu + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3} +--- !u!1001 &6125707629521091122 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1660514110} + m_Modifications: + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.62 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.08 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.93 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.13947806 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9902252 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -16.035 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6125707630481988399, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 558201eae20fa5540a826edb23937665, type: 3} diff --git a/Assets/Scripts/TerrainModelPlacer.cs b/Assets/Scripts/TerrainModelPlacer.cs new file mode 100644 index 0000000..40339bf --- /dev/null +++ b/Assets/Scripts/TerrainModelPlacer.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[ExecuteAlways] +public class TerrainModelPlacer : MonoBehaviour { + private void Update() { + if (Application.isEditor) { + // Update is called in editor when values change + Terrain Terrain = GameObject.FindObjectOfType(); + Vector3 Pos = transform.position; + Pos.y = Terrain.transform.position.y + Terrain.SampleHeight(Pos); + transform.position = Pos; + } + } +} diff --git a/Assets/Scripts/TerrainModelPlacer.cs.meta b/Assets/Scripts/TerrainModelPlacer.cs.meta new file mode 100644 index 0000000..ef5b51d --- /dev/null +++ b/Assets/Scripts/TerrainModelPlacer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 049498ca6910d2d4d915c7a47791a4dc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Terrains/Forest Terrain.asset b/Assets/Terrains/Forest Terrain.asset index d54f9eb..a4f94e5 100644 Binary files a/Assets/Terrains/Forest Terrain.asset and b/Assets/Terrains/Forest Terrain.asset differ