From 666834129de17f45d1faf31925cfbb1c9eaca38e Mon Sep 17 00:00:00 2001 From: jilfranco-unity Date: Tue, 27 Sep 2022 22:48:19 -0400 Subject: [PATCH 1/2] Made it so the char select portrait mouse hover outline is always visible, both when selected and not selected --- Assets/Prefabs/UI/PlayerSeatTemplate.prefab | 43 +++++++++++++------ .../Textures/UI/ui_archer_symbol_inactive.png | 4 +- .../UI/ui_archer_symbol_inactive.png.meta | 25 ++++++++--- .../Textures/UI/ui_mage_symbol_inactive.png | 4 +- .../Textures/UI/ui_rogue_symbol_inactive.png | 4 +- .../Textures/UI/ui_tank_symbol_inactive.png | 4 +- 6 files changed, 58 insertions(+), 26 deletions(-) diff --git a/Assets/Prefabs/UI/PlayerSeatTemplate.prefab b/Assets/Prefabs/UI/PlayerSeatTemplate.prefab index 3fd130f0f..f0342aef9 100644 --- a/Assets/Prefabs/UI/PlayerSeatTemplate.prefab +++ b/Assets/Prefabs/UI/PlayerSeatTemplate.prefab @@ -28,9 +28,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2768642224677944325} - m_RootOrder: 2 + m_Father: {fileID: 628160980191873562} + 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} @@ -103,9 +104,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 628160980191873562} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -178,11 +180,12 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7227755882419628908} - {fileID: 2849120150865561455} m_Father: {fileID: 628160980191873562} - m_RootOrder: 0 + 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} @@ -255,6 +258,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2768642224677944325} m_RootOrder: 0 @@ -329,7 +333,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: + - {fileID: 371197907} - {fileID: 1447857258} - {fileID: 763871755} - {fileID: 2768642224677944325} @@ -346,7 +352,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &6724969306933167588 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -359,6 +365,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -391,6 +398,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1447857258} m_RootOrder: 1 @@ -466,9 +474,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2768642224677944325} - m_RootOrder: 3 + 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} @@ -541,6 +550,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1447857258} m_RootOrder: 0 @@ -617,9 +627,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 628160980191873562} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -748,9 +759,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2768642224677944325} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -823,15 +835,15 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1916582723} - {fileID: 4288405572601731449} - - {fileID: 371197907} - {fileID: 7697377224375302682} - {fileID: 8171136458736705924} - {fileID: 3079994904646502685} m_Father: {fileID: 628160980191873562} - 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} @@ -904,9 +916,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 628160980191873562} - 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} @@ -1038,9 +1051,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2768642224677944325} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1113,6 +1127,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 628160980191873562} m_Father: {fileID: 0} @@ -1182,9 +1197,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 628160980191873562} - 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} @@ -1257,6 +1273,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2768642224677944325} m_RootOrder: 1 diff --git a/Assets/Textures/UI/ui_archer_symbol_inactive.png b/Assets/Textures/UI/ui_archer_symbol_inactive.png index 4d2acbbfa..9bcd105b1 100644 --- a/Assets/Textures/UI/ui_archer_symbol_inactive.png +++ b/Assets/Textures/UI/ui_archer_symbol_inactive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7de3d0778a506a1f2850998efc64f634252ecae2fb265b0096931a54383195fe -size 71759 +oid sha256:70710e071180f37bb966a59ac5020c48927a5781bc1c17b2f5fd53630a6c1bdd +size 71846 diff --git a/Assets/Textures/UI/ui_archer_symbol_inactive.png.meta b/Assets/Textures/UI/ui_archer_symbol_inactive.png.meta index 749a8534b..be0e9890c 100644 --- a/Assets/Textures/UI/ui_archer_symbol_inactive.png.meta +++ b/Assets/Textures/UI/ui_archer_symbol_inactive.png.meta @@ -3,7 +3,7 @@ guid: 7dff3761ce77b954ea946f98d4022c70 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +33,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +114,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Textures/UI/ui_mage_symbol_inactive.png b/Assets/Textures/UI/ui_mage_symbol_inactive.png index 77479ffc0..f681371ec 100644 --- a/Assets/Textures/UI/ui_mage_symbol_inactive.png +++ b/Assets/Textures/UI/ui_mage_symbol_inactive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79cf683f07617eb99076f4d26979f9a86b52049fade0fc337ad2913ec910a5e9 -size 75065 +oid sha256:178afa3e3662eacb9b4903443c4715b5cef795f436002044b6dd1962514dc756 +size 76083 diff --git a/Assets/Textures/UI/ui_rogue_symbol_inactive.png b/Assets/Textures/UI/ui_rogue_symbol_inactive.png index 467ee0d89..765243b66 100644 --- a/Assets/Textures/UI/ui_rogue_symbol_inactive.png +++ b/Assets/Textures/UI/ui_rogue_symbol_inactive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55cc506750892de98d1d74f77f0e46dd8accdbc7bce0be3ad68e7c8aa3c76f2e -size 70529 +oid sha256:4c1fda595e7ded085834b8a967dab30cf353cd424fa25654a3053d6d750235a9 +size 70288 diff --git a/Assets/Textures/UI/ui_tank_symbol_inactive.png b/Assets/Textures/UI/ui_tank_symbol_inactive.png index 55ab3edd4..ec86bccbe 100644 --- a/Assets/Textures/UI/ui_tank_symbol_inactive.png +++ b/Assets/Textures/UI/ui_tank_symbol_inactive.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f10137860a4234ee393a1acef7b44266660d688ab294bf8f6dc8745757179db2 -size 82602 +oid sha256:c537450be1ea6c6679e2e61fd4a6705e940e31c409efb29d098f3b9ad677f33a +size 81170 From 7c509ac67ceb274bfd9c300ef40868b1ef73de5f Mon Sep 17 00:00:00 2001 From: jilfranco-unity Date: Wed, 28 Sep 2022 17:19:57 -0400 Subject: [PATCH 2/2] Adjusted scale of outline slightly so that it aligns with the portrait border --- Assets/Prefabs/UI/PlayerSeatTemplate.prefab | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/UI/PlayerSeatTemplate.prefab b/Assets/Prefabs/UI/PlayerSeatTemplate.prefab index f0342aef9..6b813e7eb 100644 --- a/Assets/Prefabs/UI/PlayerSeatTemplate.prefab +++ b/Assets/Prefabs/UI/PlayerSeatTemplate.prefab @@ -36,7 +36,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: 150, y: 150} + m_SizeDelta: {x: 111.4719, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &371197909 CanvasRenderer: @@ -68,7 +68,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 96ba0f0aaeac03e40be64f748a4f2d1e, type: 3} m_Type: 0 - m_PreserveAspect: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -263,10 +263,10 @@ RectTransform: m_Father: {fileID: 2768642224677944325} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: -2, y: -2} + m_SizeDelta: {x: 103.75, y: 144.5844} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1916582725 CanvasRenderer: @@ -298,7 +298,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: bfc58bd585100d642846bfe41495a631, type: 3} m_Type: 0 - m_PreserveAspect: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1