From 856fe1e1c7c58f59b0e48f458926eca3db740608 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 17 May 2022 23:58:00 +0200 Subject: [PATCH] update --- .gitignore | 1 + Minecraft Client/Assets/Scenes/Game.unity | 82 ++++++++++++++++++- .../Assets/Scripts/Game/Player.cs | 2 +- Minecraft Server/Assets/Game/World.cs | 2 +- Minecraft Server/Assets/save.world | 0 5 files changed, 84 insertions(+), 3 deletions(-) delete mode 100644 Minecraft Server/Assets/save.world diff --git a/.gitignore b/.gitignore index 8af868e..8341636 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ sysinfo.txt # Crashlytics generated file crashlytics-build.properties +Minecraft Server/Assets/save.world diff --git a/Minecraft Client/Assets/Scenes/Game.unity b/Minecraft Client/Assets/Scenes/Game.unity index b62d6b6..e77a814 100644 --- a/Minecraft Client/Assets/Scenes/Game.unity +++ b/Minecraft Client/Assets/Scenes/Game.unity @@ -3879,6 +3879,7 @@ RectTransform: - {fileID: 622656468} - {fileID: 409400361} - {fileID: 2130779238} + - {fileID: 1576412470} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4020,6 +4021,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1575613138} m_CullTransparentMesh: 1 +--- !u!1 &1576412469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1576412470} + - component: {fileID: 1576412472} + - component: {fileID: 1576412471} + m_Layer: 5 + m_Name: Position + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1576412470 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576412469} + 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: 1569967606} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 88, y: -23.5} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1576412471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576412469} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 12800000, guid: c5d381fc55e1650408676b69d87c7d55, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1576412472 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576412469} + m_CullTransparentMesh: 1 --- !u!1 &1727246106 GameObject: m_ObjectHideFlags: 0 @@ -4151,7 +4231,7 @@ MonoBehaviour: jumpForce: 8 world: {fileID: 948138834} hotbar: {fileID: 2130779239} - positionText: {fileID: 0} + positionText: {fileID: 1576412471} --- !u!1 &1849105196 GameObject: m_ObjectHideFlags: 0 diff --git a/Minecraft Client/Assets/Scripts/Game/Player.cs b/Minecraft Client/Assets/Scripts/Game/Player.cs index 04e9f1d..c424681 100644 --- a/Minecraft Client/Assets/Scripts/Game/Player.cs +++ b/Minecraft Client/Assets/Scripts/Game/Player.cs @@ -83,7 +83,7 @@ public class Player : MonoBehaviour if (lastPosition.x != position.x || lastPosition.y != position.y || lastPosition.z != position.z) { client.SendPositionUpdate(transform.position); - positionText.text = position.ToString(); + positionText.text = "X: " + (int) position.x + " Y: " + (int) position.y + " Z: " + (int) position.z; } if (rotation.w != lastRotation.w || rotation.x != lastRotation.x || rotation.y != lastRotation.y || diff --git a/Minecraft Server/Assets/Game/World.cs b/Minecraft Server/Assets/Game/World.cs index 92d1603..4f0acb6 100644 --- a/Minecraft Server/Assets/Game/World.cs +++ b/Minecraft Server/Assets/Game/World.cs @@ -216,7 +216,7 @@ public class World : MonoBehaviour { if (noise.Get3DPerlin(positionInWorld, 5, 0.28f, 0.65f)) { - return 2; + return 12; } } diff --git a/Minecraft Server/Assets/save.world b/Minecraft Server/Assets/save.world deleted file mode 100644 index e69de29..0000000