Commit da1c0860 authored by mmaluschnig's avatar mmaluschnig
Browse files

fixed scaling issues with daytime, main menu, night menu and performance menu

parent 58efc57f
......@@ -458,7 +458,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e974c821358a54736b845863bbbaef8b, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1010490948063426}
character: {fileID: 1300958883451110}
isCamera: 0
--- !u!114 &114877152380950504
MonoBehaviour:
......@@ -609,6 +609,6 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.029999971, y: 2.915}
m_AnchoredPosition: {x: 0, y: 2.915}
m_SizeDelta: {x: 400, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -418,7 +418,7 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
......
......@@ -428,8 +428,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 9dcfcb216d85dd449816699afb0499e6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
......@@ -452,9 +452,9 @@ Transform:
m_LocalPosition: {x: 10.47, y: 4.16, z: 0}
m_LocalScale: {x: 4, y: 3.7, z: 1}
m_Children:
- {fileID: 920081861}
- {fileID: 764569484}
- {fileID: 164542398}
- {fileID: 2080760845}
- {fileID: 764569484}
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -533,6 +533,82 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 134449645}
m_CullTransparentMesh: 0
--- !u!1 &164542397
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 164542398}
- component: {fileID: 164542399}
m_Layer: 0
m_Name: cloud
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &164542398
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 164542397}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.398, y: 1.16, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 920081861}
m_Father: {fileID: 124138637}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &164542399
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 164542397}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 8b338776702b6024eb97bb58cb15d4f3, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.68, y: 0.91}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &173653532
GameObject:
m_ObjectHideFlags: 0
......@@ -787,10 +863,10 @@ RectTransform:
m_Father: {fileID: 1949598428}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -360, y: -106}
m_SizeDelta: {x: 700, y: 200}
m_AnchoredPosition: {x: 63.5, y: -96.84}
m_SizeDelta: {x: -147, y: 173.57}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &237130076
MonoBehaviour:
......@@ -1438,11 +1514,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 764569483}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.864, y: 1.689, z: 0}
m_LocalPosition: {x: 0.9560001, y: 1.7430003, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 124138637}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!199 &764569485
ParticleSystemRenderer:
......@@ -1478,9 +1554,9 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1020251125
m_SortingLayer: 3
m_SortingOrder: 0
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
......@@ -6216,7 +6292,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -58.99698, y: -15}
m_AnchoredPosition: {x: -58.99695, y: -15}
m_SizeDelta: {x: 100, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &848493752
......@@ -6293,10 +6369,10 @@ RectTransform:
m_Father: {fileID: 237130075}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 55, y: 20}
m_SizeDelta: {x: 570, y: 30}
m_SizeDelta: {x: -130, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &850495251
MonoBehaviour:
......@@ -6364,7 +6440,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 55, y: -100}
m_AnchoredPosition: {x: 54.998962, y: -89.570015}
m_SizeDelta: {x: -130, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &865213187
......@@ -6399,7 +6475,8 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: such text much wow.
m_Text: such text much wow.such text much wow.such text much wow.such text much
wow.
--- !u!222 &865213188
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -6531,11 +6608,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 920081860}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.398, y: 1.099, z: 0}
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: []
m_Father: {fileID: 124138637}
m_Father: {fileID: 164542398}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!199 &920081862
......@@ -6572,9 +6649,9 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1020251125
m_SortingLayer: 3
m_SortingOrder: 0
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 2
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
......@@ -11602,7 +11679,7 @@ RectTransform:
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: 60, y: 0}
m_AnchoredPosition: {x: 60, y: 0.0000059605}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1207186497
......@@ -11814,10 +11891,10 @@ RectTransform:
m_Father: {fileID: 1771409335}
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_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 560, y: 25}
m_SizeDelta: {x: -10, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1350931562
MonoBehaviour:
......@@ -16597,15 +16674,6 @@ Prefab:
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 224962148856270744, guid: a6dd0ddad611645efbc5ef92c67041a7,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1602431506710890, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
m_IsPrefabAsset: 0
......@@ -17054,10 +17122,10 @@ RectTransform:
m_Father: {fileID: 237130075}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 54.00001, y: -22.999985}
m_SizeDelta: {x: 570, y: 30}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 90.64899, y: -22.999985}
m_SizeDelta: {x: -201.3, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1771409336
MonoBehaviour:
......@@ -17344,7 +17412,7 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
......@@ -17402,7 +17470,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 124138637}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!199 &2080760846
ParticleSystemRenderer:
......@@ -17438,9 +17506,9 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1020251125
m_SortingLayer: 3
m_SortingOrder: 0
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
......
......@@ -505,7 +505,7 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
......
......@@ -642,8 +642,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 90}
m_SizeDelta: {x: 400, y: -398}
m_AnchoredPosition: {x: 0, y: 80.456}
m_SizeDelta: {x: 400, y: -378.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1049555957
MonoBehaviour:
......@@ -999,7 +999,7 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
......@@ -1243,8 +1243,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 49}
m_SizeDelta: {x: -640, y: 30}
m_AnchoredPosition: {x: -9, y: 55}
m_SizeDelta: {x: -460, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1770293795
MonoBehaviour:
......
......@@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 13258091c25b8974ab34698da83ba2ae
spriteID: 50273fabc12ed41fbaf9abec2e079c02
vertices: []
indices:
edges: []
......
m_EditorVersion: 2018.2.11f1
m_EditorVersion: 2018.2.12f1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment