feat: rounded corners for display

This commit is contained in:
Gerard Gascón 2024-04-18 11:16:43 +02:00
parent a47aee1561
commit e4ad9cc2f1
23 changed files with 337 additions and 282 deletions

View file

@ -600,15 +600,15 @@ MonoBehaviour:
HasValue: 0
displaySortOrder: 0
childIdentifiers:
- 52eb9df5db46521439908db3a29a1bbb
- b7716510a1f36934c87976f3a81dbf3d
- 0f8eb3f400726694eb47beb1a9f94ce8
- 2fea114e74ecf3c4f920e1d5cc1c4c40
- e7a046c753c3c3d4aacc91f6597f310d
- fd7c55dab0fce234b8c25f6ffca523c1
- 2c5177b11d81d824dbb064f9ac8527da
- c88d16e5272a4e241b0ef0ac2e53b73d
- b7716510a1f36934c87976f3a81dbf3d
- 52eb9df5db46521439908db3a29a1bbb
- 46fbfdf3fc43db0458918377fd40293e
- e7a046c753c3c3d4aacc91f6597f310d
- 2fea114e74ecf3c4f920e1d5cc1c4c40
- 0f8eb3f400726694eb47beb1a9f94ce8
- c88d16e5272a4e241b0ef0ac2e53b73d
codecChannels:
Value: []
HasValue: 0

View file

@ -74,8 +74,8 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 7f14bf47782e5564ea486633b6b3f504, type: 3}
m_Color: {r: 1, g: 0.18510345, b: 0, a: 1}
m_Sprite: {fileID: 21300000, guid: 623c2050f13889e4fa065a0f5ed3d46b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0

View file

@ -613,7 +613,6 @@ MonoBehaviour:
musicToggle: {fileID: 557112855}
sfxToggle: {fileID: 1000034091}
alwaysOnTopToggle: {fileID: 2076377159}
mainMixer: {fileID: 24100000, guid: fd8d4f04926f4a641b45bf06667f3761, type: 2}
--- !u!1 &379057220
GameObject:
m_ObjectHideFlags: 0
@ -930,7 +929,6 @@ GameObject:
- component: {fileID: 501733678}
- component: {fileID: 501733677}
- component: {fileID: 501733679}
- component: {fileID: 501733680}
- component: {fileID: 501733681}
m_Layer: 0
m_Name: Main Camera
@ -949,7 +947,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.5686275, g: 0.57254905, b: 0.5686275, a: 0}
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@ -1018,20 +1016,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mouseButton: 0
--- !u!114 &501733680
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 501733675}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0d779b53ae5c4644b516e84fdc31fcdc, type: 3}
m_Name:
m_EditorClassIdentifier:
mouseButton: 0
aspectRatio: {x: 10, y: 15}
--- !u!114 &501733681
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1318,6 +1302,81 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &767862262
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 767862263}
- component: {fileID: 767862265}
- component: {fileID: 767862264}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &767862263
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767862262}
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: 1650688415}
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: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &767862264
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767862262}
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: 0.043137256, g: 0.078431375, b: 0.11764706, 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_Sprite: {fileID: 21300000, guid: 4610f229d90028b409340b3f89a93e6c, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2
--- !u!222 &767862265
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767862262}
m_CullTransparentMesh: 1
--- !u!1 &902566661
GameObject:
m_ObjectHideFlags: 0
@ -2737,6 +2796,108 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1640794862}
m_CullTransparentMesh: 1
--- !u!1 &1650688411
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1650688415}
- component: {fileID: 1650688414}
- component: {fileID: 1650688413}
- component: {fileID: 1650688412}
m_Layer: 5
m_Name: MarginCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1650688412
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1650688411}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &1650688413
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1650688411}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1000, y: 1500}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &1650688414
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1650688411}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 501733677}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: -32768
m_TargetDisplay: 0
--- !u!224 &1650688415
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1650688411}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 767862263}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1652443526
GameObject:
m_ObjectHideFlags: 0
@ -3427,6 +3588,7 @@ SceneRoots:
- {fileID: 501733678}
- {fileID: 311490072}
- {fileID: 1050150012}
- {fileID: 1650688415}
- {fileID: 1333164888}
- {fileID: 1652443528}
- {fileID: 902566663}

View file

@ -9,10 +9,15 @@ namespace View {
#if !UNITY_EDITOR
AppWindowUtility.AlwaysOnTop = true;
AppWindowUtility.FrameVisibility = false;
AppWindowUtility.Transparent = true;
//Vector2Int resolution = new(360, 640);
Vector2Int resolution = new(360, 540);
AppWindowUtility.ResizeWindow(resolution.x, resolution.y);
Vector2Int displaySize = new(Screen.currentResolution.width, Screen.currentResolution.height);
const float aspect = 10f / 15f;
int windowHeight = (int)(displaySize.y * .45f);
int windowWidth = (int)(windowHeight * aspect);
int margin = (int)(displaySize.x * .01f);
AppWindowUtility.ResizeWindow(windowWidth, windowHeight);
AppWindowUtility.MoveWindow(displaySize.x - windowWidth - margin, margin);
#endif
}
}

BIN
Assets/Sprites/Rosa/Garden/02.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7f14bf47782e5564ea486633b6b3f504
guid: 623c2050f13889e4fa065a0f5ed3d46b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -47,8 +47,8 @@ TextureImporter:
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0}
spritePixelsToUnits: 192
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 225
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -113,7 +113,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
internalID: 0
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

BIN
Assets/Sprites/UI/UI_Margin.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 4610f229d90028b409340b3f89a93e6c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 140, y: 140, z: 140, w: 140}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.