Skip to content

Commit

Permalink
屏幕适配
Browse files Browse the repository at this point in the history
  • Loading branch information
purofle committed Feb 5, 2023
1 parent a66fc80 commit 0db3040
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 46 deletions.
6 changes: 3 additions & 3 deletions Assets/Scenes/MainScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -477,12 +477,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ReferenceResolution: {x: 2160, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_MatchWidthOrHeight: 0.44
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
Expand Down
86 changes: 43 additions & 43 deletions UserSettings/Layouts/default-2021.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 104
controlID: 76
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -141,12 +141,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1087
width: 1104
height: 934
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 69
controlID: 96
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -162,9 +162,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1087
x: 1104
y: 0
width: 188
width: 207
height: 934
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
Expand All @@ -188,9 +188,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1275
x: 1311
y: 0
width: 374
width: 338
height: 934
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
Expand Down Expand Up @@ -242,7 +242,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1087
width: 1104
height: 479
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
Expand All @@ -269,7 +269,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 479
width: 1087
width: 1104
height: 455
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
Expand Down Expand Up @@ -300,7 +300,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 126
width: 1086
width: 1103
height: 458
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
Expand All @@ -326,9 +326,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1087
x: 1104
y: 126
width: 186
width: 205
height: 913
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
Expand All @@ -337,23 +337,23 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 8c600000
m_LastClickedID: 24716
m_ExpandedIDs: 24fbffff8c600000
m_SelectedIDs: 10820000
m_LastClickedID: 33296
m_ExpandedIDs: eccfffffc2f2ffff22f4ffff1afbffffd4790000e4790000ee7900001c7a0000687a00008a7a0000947a0000447c0000947c0000c07c0000727e0000b47e000010820000528200009e820000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: Image
m_OriginalName: Image
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 24702
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 4
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 7}
m_SearchString:
Expand Down Expand Up @@ -424,9 +424,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1275
x: 1311
y: 126
width: 372
width: 336
height: 913
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
Expand All @@ -445,36 +445,36 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scripts/ElectronicFish
- Assets/Scripts/ElectronicFish/mine
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scripts/ElectronicFish
- Assets/Scripts/ElectronicFish/mine
m_LastFoldersGridSize: -1
m_LastProjectPath: /home/purofle/projects/electronic-wooden-fish
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 54600000
m_LastClickedID: 24660
m_ExpandedIDs: 000000003e600000406000004260000000ca9a3b
m_SelectedIDs: 207d0000
m_LastClickedID: 32032
m_ExpandedIDs: 0000000086610000886100008a6100003e6200004262000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_Name: Scenes
m_OriginalName: Scenes
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_UserData: 25152
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_OriginalEventType: 0
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 8}
m_SearchString:
Expand All @@ -488,7 +488,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000003e6000004060000042600000
m_ExpandedIDs: 0000000086610000886100008a610000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -566,7 +566,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 126
width: 1086
width: 1103
height: 458
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
Expand Down Expand Up @@ -791,9 +791,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 540, y: 1080, z: 0}
m_Target: {x: 190.28685, y: 2133.988, z: 0.29774702}
speed: 2
m_Value: {x: 540, y: 1080, z: 0}
m_Value: {x: 192.97588, y: 2133.5547, z: 0.2439659}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
Expand Down Expand Up @@ -844,9 +844,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 1207.4767
m_Target: 114.13437
speed: 2
m_Value: 1207.4767
m_Value: 119.51243
m_Ortho:
m_Target: 1
speed: 2
Expand Down Expand Up @@ -893,7 +893,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 605
width: 1086
width: 1103
height: 434
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
Expand All @@ -902,7 +902,7 @@ MonoBehaviour:
m_SerializedViewNames:
- UnityEditor.DeviceSimulation.SimulatorWindow
m_SerializedViewValues:
- /home/purofle/projects/electronic-wooden-fish/Library/PlayModeViewStates/4d42ad1e604922a6e8d803f9615d7779
- /home/purofle/projects/electronic-wooden-fish/Library/PlayModeViewStates/47f1a2e05a55360d3a4c7804f3cd414f
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
Expand Down Expand Up @@ -943,23 +943,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1086
width: 1103
height: 413
m_Scale: {x: 0.1912037, y: 0.1912037}
m_Translation: {x: 543, y: 206.5}
m_Translation: {x: 551.5, y: 206.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -2839.9033
x: -2884.3584
y: -1080
width: 5679.8066
width: 5768.717
height: 2160
m_MinimalGUI: 1
m_defaultScale: 0.1912037
m_LastWindowPixelSize: {x: 1086, y: 434}
m_LastWindowPixelSize: {x: 1103, y: 434}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000001000000000000
Expand Down

0 comments on commit 0db3040

Please sign in to comment.