diff --git a/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab b/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab index c49dfe0c..12b0305f 100644 --- a/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab +++ b/Assets/LoadedAssets/Joystick Pack/Prefabs/Floating Joystick.prefab @@ -56,17 +56,17 @@ MonoBehaviour: m_GameObject: {fileID: 8170153791668043269} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -76,6 +76,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &8170153791668043265 MonoBehaviour: m_ObjectHideFlags: 0 @@ -95,6 +96,9 @@ MonoBehaviour: snapY: 0 background: {fileID: 8170153792821263258} handle: {fileID: 8170153791961219456} + backToStartOnTouchUp: 0 + _idleStateOpacity: 1 + _activeStateOpacity: 1 --- !u!1 &8170153791961219457 GameObject: m_ObjectHideFlags: 0 @@ -130,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: 128, y: 128} + m_SizeDelta: {x: 600, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8170153791961219458 CanvasRenderer: @@ -149,17 +153,17 @@ MonoBehaviour: m_GameObject: {fileID: 8170153791961219457} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 010a6e5305fa7004f89c5d317b7b47d4, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -169,6 +173,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8170153792821263259 GameObject: m_ObjectHideFlags: 0 @@ -202,10 +207,10 @@ RectTransform: m_Father: {fileID: 8170153791668043268} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 256, y: 256} - m_SizeDelta: {x: 256, y: 256} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8170153792821263255 CanvasRenderer: @@ -224,17 +229,17 @@ MonoBehaviour: m_GameObject: {fileID: 8170153792821263259} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 5b56d9fa0e8bd6e409ed188db38a692c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -244,3 +249,4 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/DynamicJoystickEditor.cs b/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/DynamicJoystickEditor.cs index 48033947..4e953a54 100644 --- a/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/DynamicJoystickEditor.cs +++ b/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/DynamicJoystickEditor.cs @@ -20,8 +20,6 @@ public class DynamicJoystickEditor : OpacityJoystickEditor if (background != null) { RectTransform backgroundRect = (RectTransform)background.objectReferenceValue; - backgroundRect.anchorMax = Vector2.zero; - backgroundRect.anchorMin = Vector2.zero; backgroundRect.pivot = center; } } diff --git a/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/FloatingJoystickEditor.cs b/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/FloatingJoystickEditor.cs index bdd06014..4839200c 100644 --- a/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/FloatingJoystickEditor.cs +++ b/Assets/LoadedAssets/Joystick Pack/Scripts/Editor/FloatingJoystickEditor.cs @@ -12,8 +12,6 @@ public class FloatingJoystickEditor : OpacityJoystickEditor if (background != null) { RectTransform backgroundRect = (RectTransform) background.objectReferenceValue; - backgroundRect.anchorMax = Vector2.zero; - backgroundRect.anchorMin = Vector2.zero; backgroundRect.pivot = center; } } diff --git a/Assets/Prefabs_NEW/UI/GameCanvas.prefab b/Assets/Prefabs_NEW/UI/GameCanvas.prefab index f7e44e42..5215a740 100644 --- a/Assets/Prefabs_NEW/UI/GameCanvas.prefab +++ b/Assets/Prefabs_NEW/UI/GameCanvas.prefab @@ -23,6 +23,42 @@ MonoBehaviour: _idleStateOpacity: 0.3 _activeStateOpacity: 1 moveThreshold: 1 +--- !u!1 &5953339672019602395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6945461968636884593} + m_Layer: 5 + m_Name: Left Joysticks Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6945461968636884593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5953339672019602395} + 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: 1415495982521125428} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7117637457422693166 GameObject: m_ObjectHideFlags: 0 @@ -207,18 +243,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1415495983215601309} - - {fileID: 1415495983578749257} - - {fileID: 5359326300257515046} - - {fileID: 5359326301570881754} - - {fileID: 1415495982521125428} + - {fileID: 6945461968636884593} + - {fileID: 743109405994407194} m_Father: {fileID: 7117637459326710719} 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: 0, y: 120} - m_SizeDelta: {x: 0, y: -240} + m_AnchoredPosition: {x: 0, y: 267.898} + m_SizeDelta: {x: 0, y: -535.797} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7117637458024167129 CanvasRenderer: @@ -1742,6 +1775,44 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &7590811892506906700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 743109405994407194} + m_Layer: 5 + m_Name: Right Joysticks Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &743109405994407194 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590811892506906700} + 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: 1415495983578749257} + - {fileID: 5359326300257515046} + - {fileID: 5359326301570881754} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &4110273104893304282 PrefabInstance: m_ObjectHideFlags: 0 @@ -1877,7 +1948,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7117637458024167135} + m_TransformParent: {fileID: 743109405994407194} m_Modifications: - target: {fileID: 2929252283123773937, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -1898,12 +1969,12 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -1913,7 +1984,7 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -1923,12 +1994,12 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -1953,27 +2024,27 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchoredPosition.x - value: 1721 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchoredPosition.y - value: 236 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2008,12 +2079,12 @@ PrefabInstance: - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252285020698103, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2146,31 +2217,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_Spacing.x - value: 79.2 - objectReference: {fileID: 0} - - target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_CellSize.x - value: 242 - objectReference: {fileID: 0} - - target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_CellSize.y - value: 262 - objectReference: {fileID: 0} - - target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_Padding.m_Top - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_Padding.m_Left - value: 163 - objectReference: {fileID: 0} - target: {fileID: 3858971544782492864, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_Name @@ -2219,7 +2265,7 @@ PrefabInstance: - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_SizeDelta.y - value: 280 + value: 535.9 objectReference: {fileID: 0} - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} @@ -2264,7 +2310,7 @@ PrefabInstance: - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_AnchoredPosition.y - value: 139.89703 + value: 267.85 objectReference: {fileID: 0} - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} @@ -2281,31 +2327,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_Spacing.x - value: 79.2 - objectReference: {fileID: 0} - - target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_CellSize.x - value: 242 - objectReference: {fileID: 0} - - target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_CellSize.y - value: 262 - objectReference: {fileID: 0} - - target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_Padding.m_Top - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0, - type: 3} - propertyPath: m_Padding.m_Left - value: 58 - objectReference: {fileID: 0} - target: {fileID: 5665143410171049482, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_Enabled @@ -2354,7 +2375,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7117637458024167135} + m_TransformParent: {fileID: 6945461968636884593} m_Modifications: - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2364,37 +2385,37 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Pivot.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2404,7 +2425,7 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 700 + value: 3300 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2449,7 +2470,7 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.00012207031 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2469,27 +2490,7 @@ PrefabInstance: - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Name - value: LeftJoystick_Alt - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + value: MoveJoystick objectReference: {fileID: 0} - target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2503,31 +2504,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 91f9be48cf674f14b83df7cc6794692b, type: 3} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 512 - objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2555,204 +2531,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7117637457990202416} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7117637458671556761 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7117637458024167135} - m_Modifications: - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: deadZone - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.x - value: 1080 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.y - value: 700 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_Name - value: LeftJoystick - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: bbc19d5dfa9cfbb40aa9341ff7ea8eae, - type: 3} - - target: {fileID: 8170153792821263252, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 91f9be48cf674f14b83df7cc6794692b, - type: 3} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 512 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} ---- !u!224 &1415495983215601309 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - m_PrefabInstance: {fileID: 7117637458671556761} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7117637458897037608 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7117637458024167135} + m_TransformParent: {fileID: 743109405994407194} m_Modifications: - target: {fileID: 2929252283123773937, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2773,12 +2557,12 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2788,7 +2572,7 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2798,12 +2582,12 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2828,27 +2612,27 @@ PrefabInstance: - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchoredPosition.x - value: 1721 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_AnchoredPosition.y - value: 236 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2883,12 +2667,12 @@ PrefabInstance: - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.x - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} propertyPath: m_SizeDelta.y - value: 350 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2929252285020698103, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} @@ -2909,7 +2693,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7117637458024167135} + m_TransformParent: {fileID: 743109405994407194} m_Modifications: - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2929,37 +2713,37 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Pivot.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMin.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -2969,7 +2753,7 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 700 + value: 3300 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -3009,7 +2793,7 @@ PrefabInstance: - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.x - value: -1080 + value: 0.000061035156 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -3034,17 +2818,7 @@ PrefabInstance: - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Name - value: RightJoystick - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 + value: AttackJoystick objectReference: {fileID: 0} - target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} @@ -3058,31 +2832,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 424a22169c048844bb9b91b90d968754, type: 3} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 512 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} --- !u!224 &1415495983578749257 stripped diff --git a/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab index 92f80b8d..a1aea436 100644 --- a/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab +++ b/Assets/Prefabs_NEW/UI/NewActionsPanel.prefab @@ -152,11 +152,11 @@ RectTransform: m_Father: {fileID: 3858971544782492865} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -392, y: 0} - m_SizeDelta: {x: 784, y: 280} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -100, y: 100} + m_SizeDelta: {x: 1241.863, y: 280} + m_Pivot: {x: 1, y: 0} --- !u!222 &3858971544697504994 CanvasRenderer: m_ObjectHideFlags: 0 @@ -208,15 +208,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 170 + m_Left: 0 m_Right: 0 - m_Top: 10 + m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 8 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 250, y: 270} - m_Spacing: {x: 90, y: 0} + m_CellSize: {x: 375, y: 405} + m_Spacing: {x: 100, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &3858971544782492864 @@ -308,11 +308,11 @@ RectTransform: m_Father: {fileID: 3858971544782492865} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 392, y: 0} - m_SizeDelta: {x: 784, y: 280} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 100} + m_SizeDelta: {x: 1179.142, y: 280} + m_Pivot: {x: 0, y: 0} --- !u!222 &3858971544809907474 CanvasRenderer: m_ObjectHideFlags: 0 @@ -364,15 +364,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 66 + m_Left: 0 m_Right: 0 - m_Top: 10 + m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 250, y: 270} - m_Spacing: {x: 90, y: 0} + m_CellSize: {x: 375, y: 405} + m_Spacing: {x: 100, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!222 &4937010553380683460