From b38582660d33267c536c6db2a6d3b1d9bc946d91 Mon Sep 17 00:00:00 2001 From: Maxim-Godovikov Date: Wed, 20 Oct 2021 23:15:18 +0300 Subject: [PATCH] =?UTF-8?q?1.5=20=D0=9F=D0=BE=D1=80=D1=82=D1=80=D0=B5?= =?UTF-8?q?=D1=82=D0=BD=D0=B0=D1=8F=20=D0=BE=D1=80=D0=B8=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F:=20=D0=9A=D0=B0=D0=BD=D0=B2=D0=B0?= =?UTF-8?q?=D1=81=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD=D0=B5=D0=B9=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BD=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D1=80=D0=B5=D1=82=D0=BD=D1=83=D1=8E=20?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Floating Joystick.prefab | 6 +- Assets/Prefabs_NEW/UI/GameCanvas.prefab | 65 ++++++++++--------- Assets/Prefabs_NEW/UI/NewActionsPanel.prefab | 12 ++-- 3 files changed, 44 insertions(+), 39 deletions(-) diff --git a/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab b/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab index 12b0305f..4e5b823e 100644 --- a/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab +++ b/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab @@ -134,7 +134,7 @@ RectTransform: 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: 600, y: 600} + m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8170153791961219458 CanvasRenderer: @@ -209,8 +209,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 600} - m_SizeDelta: {x: 600, y: 600} + m_AnchoredPosition: {x: 0, y: 300} + m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8170153792821263255 CanvasRenderer: diff --git a/Assets/Prefabs_NEW/UI/GameCanvas.prefab b/Assets/Prefabs_NEW/UI/GameCanvas.prefab index 5215a740..be4d311a 100644 --- a/Assets/Prefabs_NEW/UI/GameCanvas.prefab +++ b/Assets/Prefabs_NEW/UI/GameCanvas.prefab @@ -54,10 +54,10 @@ RectTransform: m_Father: {fileID: 7117637458024167135} 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: -540, y: -0.0024414} - m_SizeDelta: {x: 1080, y: 3300.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7117637457422693166 GameObject: @@ -250,8 +250,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 267.898} - m_SizeDelta: {x: 0, y: -535.797} + m_AnchoredPosition: {x: 0, y: 130.05} + m_SizeDelta: {x: 0, y: -260.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7117637458024167129 CanvasRenderer: @@ -1439,9 +1439,9 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 2160, y: 1080} + m_ReferenceResolution: {x: 1080, y: 1920} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1808,10 +1808,10 @@ RectTransform: m_Father: {fileID: 7117637458024167135} m_RootOrder: 1 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: 540, y: -0.00073242} - m_SizeDelta: {x: 1080, y: 3300.2} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0.000030517578} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &4110273104893304282 PrefabInstance: @@ -1994,12 +1994,12 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2044,7 +2044,7 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchoredPosition.y - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2079,12 +2079,12 @@ PrefabInstance: - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252285020698103, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2222,6 +2222,11 @@ PrefabInstance: propertyPath: m_Name value: NewActionsPanel objectReference: {fileID: 0} + - target: {fileID: 3858971544782492864, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_Pivot.x @@ -2265,7 +2270,7 @@ PrefabInstance: - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_SizeDelta.y - value: 535.9 + value: 260.1982 objectReference: {fileID: 0} - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} @@ -2310,7 +2315,7 @@ PrefabInstance: - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_AnchoredPosition.y - value: 267.85 + value: 129.99908 objectReference: {fileID: 0} - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} @@ -2420,12 +2425,12 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.x - value: 1080 + value: 540 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 3300 + value: 1660.2 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2470,7 +2475,7 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00012207031 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2582,12 +2587,12 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2632,7 +2637,7 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchoredPosition.y - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2667,12 +2672,12 @@ PrefabInstance: - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 600 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929252285020698103, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2748,12 +2753,12 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.x - value: 1080 + value: 540 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 3300 + value: 1660.2 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2793,7 +2798,7 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000061035156 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} diff --git a/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab index a1aea436..da571394 100644 --- a/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab +++ b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab @@ -154,7 +154,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -100, y: 100} + m_AnchoredPosition: {x: -50, y: 50} m_SizeDelta: {x: 1241.863, y: 280} m_Pivot: {x: 1, y: 0} --- !u!222 &3858971544697504994 @@ -215,8 +215,8 @@ MonoBehaviour: m_ChildAlignment: 8 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 375, y: 405} - m_Spacing: {x: 100, y: 0} + m_CellSize: {x: 188, y: 203} + m_Spacing: {x: 50, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &3858971544782492864 @@ -310,7 +310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 100, y: 100} + m_AnchoredPosition: {x: 50, y: 50} m_SizeDelta: {x: 1179.142, y: 280} m_Pivot: {x: 0, y: 0} --- !u!222 &3858971544809907474 @@ -371,8 +371,8 @@ MonoBehaviour: m_ChildAlignment: 6 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 375, y: 405} - m_Spacing: {x: 100, y: 0} + m_CellSize: {x: 188, y: 203} + m_Spacing: {x: 50, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!222 &4937010553380683460