Commit e4ad9cc2 authored by Gerard Gascón's avatar Gerard Gascón
Browse files

feat: rounded corners for display

parent a47aee15

Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset

+6 −6
Original line number Diff line number Diff line
@@ -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

Assets/Prefabs/GardenRose.prefab

+2 −2
Original line number Diff line number Diff line
@@ -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

Assets/Scenes/Main.unity

+179 −17
Original line number Diff line number Diff line
@@ -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}

Assets/Scripts/View/DisplaySetup.cs

+8 −3
Original line number Diff line number Diff line
@@ -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

		}

	}

Assets/Sprites/Rosa/Garden/02.png

0 → 100644LFS
+130 B
Loading image diff...