diff --git a/Minecraft Client/Assets/Scenes/Login.unity b/Minecraft Client/Assets/Scenes/Login.unity index d723639..14f65aa 100644 --- a/Minecraft Client/Assets/Scenes/Login.unity +++ b/Minecraft Client/Assets/Scenes/Login.unity @@ -236,11 +236,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2033099004} - m_RootOrder: 3 + m_RootOrder: 4 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: -149.2, y: -78.60002} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 115.600006, y: -79.4} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &71764842 @@ -315,7 +315,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2033099004} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -476,11 +476,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2033099004} - m_RootOrder: 4 + 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: -149.19998, y: -124.000015} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 115.600006, y: -124.79999} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &854417905 @@ -557,11 +557,11 @@ RectTransform: m_Children: - {fileID: 1486495034} m_Father: {fileID: 2033099004} - m_RootOrder: 6 + m_RootOrder: 7 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: 105.799995, y: -78.60001} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 370.59998, y: -79.39999} m_SizeDelta: {x: 297.6238, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1047272871 @@ -790,11 +790,11 @@ RectTransform: m_Children: - {fileID: 1578575450} m_Father: {fileID: 2033099004} - m_RootOrder: 5 + 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: 105.80006, y: -33.200016} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 370.60004, y: -33.999992} m_SizeDelta: {x: 297.6238, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1174182476 @@ -912,6 +912,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1174182474} m_CullTransparentMesh: 1 +--- !u!1 &1245606520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1245606521} + - component: {fileID: 1245606523} + - component: {fileID: 1245606522} + m_Layer: 5 + m_Name: Background (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1245606521 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245606520} + 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: 2033099004} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 1.8013916, y: 0} + m_SizeDelta: {x: 3.6027832, y: -0.54000854} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1245606522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245606520} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.15686275} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1245606523 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245606520} + m_CullTransparentMesh: 1 --- !u!1 &1279274158 GameObject: m_ObjectHideFlags: 0 @@ -944,11 +1019,11 @@ RectTransform: m_Children: - {fileID: 1747497270} m_Father: {fileID: 2033099004} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -105.899994, y: 43} + m_AnchoredPosition: {x: -87.9, y: 31.533} m_SizeDelta: {x: 160, y: 45.3632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1279274160 @@ -1235,11 +1310,11 @@ RectTransform: m_Children: - {fileID: 1055915759} m_Father: {fileID: 2033099004} - m_RootOrder: 7 + m_RootOrder: 8 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: 105.80001, y: -124} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 370.6, y: -124.79997} m_SizeDelta: {x: 297.6238, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1603203176 @@ -1529,11 +1604,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2033099004} - m_RootOrder: 2 + m_RootOrder: 3 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: -149.19998, y: -33.200016} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 115.600006, y: -33.999992} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1783690559 @@ -1670,6 +1745,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1661573148} + - {fileID: 1245606521} - {fileID: 557944438} - {fileID: 1783690558} - {fileID: 71764841} diff --git a/Minecraft Client/Assets/Scripts/Game/Player.cs b/Minecraft Client/Assets/Scripts/Game/Player.cs index b608c36..25293b5 100644 --- a/Minecraft Client/Assets/Scripts/Game/Player.cs +++ b/Minecraft Client/Assets/Scripts/Game/Player.cs @@ -180,6 +180,7 @@ public class Player : MonoBehaviour int currentSlot = (int)hotbar.GetSelectedSlot(); currentSlot += (int)(-Input.GetAxisRaw("Mouse ScrollWheel") * 10); + if (currentSlot > 8) currentSlot = 0; if (currentSlot < 0) currentSlot = 8; hotbar.SelectSlot((byte)currentSlot); diff --git a/Minecraft Client/ProjectSettings/InputManager.asset b/Minecraft Client/ProjectSettings/InputManager.asset index f28496c..50fd043 100644 --- a/Minecraft Client/ProjectSettings/InputManager.asset +++ b/Minecraft Client/ProjectSettings/InputManager.asset @@ -373,3 +373,19 @@ InputManager: type: 0 axis: 8 joyNum: 0 + - serializedVersion: 3 + m_Name: LB + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 4 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 8 + joyNum: 0