Skip to content

Commit 9e5ff78

Browse files
committed
Menu design update, vic screen fix
1 parent 5be2e26 commit 9e5ff78

File tree

4 files changed

+296
-90
lines changed

4 files changed

+296
-90
lines changed

Assets/Scenes/Credits.unity

+4-4
Original file line numberDiff line numberDiff line change
@@ -9294,7 +9294,7 @@ RectTransform:
92949294
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
92959295
m_AnchorMin: {x: 0.5, y: 0}
92969296
m_AnchorMax: {x: 0.5, y: 0}
9297-
m_AnchoredPosition: {x: 0, y: 30}
9297+
m_AnchoredPosition: {x: 0, y: 90}
92989298
m_SizeDelta: {x: 240, y: 30}
92999299
m_Pivot: {x: 0.5, y: 0.5}
93009300
--- !u!114 &623157598
@@ -9441,7 +9441,7 @@ RectTransform:
94419441
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
94429442
m_AnchorMin: {x: 0.5, y: 0}
94439443
m_AnchorMax: {x: 0.5, y: 0}
9444-
m_AnchoredPosition: {x: 0, y: 80.4}
9444+
m_AnchoredPosition: {x: 0, y: 160.4}
94459445
m_SizeDelta: {x: 240, y: 30}
94469446
m_Pivot: {x: 0.5, y: 0.5}
94479447
--- !u!114 &631844949
@@ -27526,10 +27526,10 @@ MonoBehaviour:
2752627526
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
2752727527
m_Name:
2752827528
m_EditorClassIdentifier:
27529-
m_UiScaleMode: 0
27529+
m_UiScaleMode: 1
2753027530
m_ReferencePixelsPerUnit: 100
2753127531
m_ScaleFactor: 1
27532-
m_ReferenceResolution: {x: 800, y: 600}
27532+
m_ReferenceResolution: {x: 1920, y: 1080}
2753327533
m_ScreenMatchMode: 0
2753427534
m_MatchWidthOrHeight: 0
2753527535
m_PhysicalUnit: 3

Assets/Scenes/DefeatScreen.unity

+2-2
Original file line numberDiff line numberDiff line change
@@ -12034,10 +12034,10 @@ MonoBehaviour:
1203412034
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
1203512035
m_Name:
1203612036
m_EditorClassIdentifier:
12037-
m_UiScaleMode: 0
12037+
m_UiScaleMode: 1
1203812038
m_ReferencePixelsPerUnit: 100
1203912039
m_ScaleFactor: 1
12040-
m_ReferenceResolution: {x: 800, y: 600}
12040+
m_ReferenceResolution: {x: 1920, y: 1080}
1204112041
m_ScreenMatchMode: 0
1204212042
m_MatchWidthOrHeight: 0
1204312043
m_PhysicalUnit: 3

Assets/Scenes/StartScreen.unity

+211-5
Original file line numberDiff line numberDiff line change
@@ -548,10 +548,10 @@ MonoBehaviour:
548548
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
549549
m_Name:
550550
m_EditorClassIdentifier:
551-
m_UiScaleMode: 0
551+
m_UiScaleMode: 1
552552
m_ReferencePixelsPerUnit: 100
553553
m_ScaleFactor: 1
554-
m_ReferenceResolution: {x: 800, y: 600}
554+
m_ReferenceResolution: {x: 1920, y: 1080}
555555
m_ScreenMatchMode: 0
556556
m_MatchWidthOrHeight: 0
557557
m_PhysicalUnit: 3
@@ -1703,6 +1703,56 @@ Transform:
17031703
m_CorrespondingSourceObject: {fileID: 5602020159482954527, guid: f8788e6a63ebafc4cac852f05c253b27, type: 3}
17041704
m_PrefabInstance: {fileID: 1455295102}
17051705
m_PrefabAsset: {fileID: 0}
1706+
--- !u!1 &218499638
1707+
GameObject:
1708+
m_ObjectHideFlags: 0
1709+
m_CorrespondingSourceObject: {fileID: 0}
1710+
m_PrefabInstance: {fileID: 0}
1711+
m_PrefabAsset: {fileID: 0}
1712+
serializedVersion: 6
1713+
m_Component:
1714+
- component: {fileID: 218499640}
1715+
- component: {fileID: 218499639}
1716+
m_Layer: 0
1717+
m_Name: Plant
1718+
m_TagString: Untagged
1719+
m_Icon: {fileID: 0}
1720+
m_NavMeshLayer: 0
1721+
m_StaticEditorFlags: 0
1722+
m_IsActive: 0
1723+
--- !u!114 &218499639
1724+
MonoBehaviour:
1725+
m_ObjectHideFlags: 0
1726+
m_CorrespondingSourceObject: {fileID: 0}
1727+
m_PrefabInstance: {fileID: 0}
1728+
m_PrefabAsset: {fileID: 0}
1729+
m_GameObject: {fileID: 218499638}
1730+
m_Enabled: 1
1731+
m_EditorHideFlags: 0
1732+
m_Script: {fileID: 11500000, guid: 5045ffeee405c49bc9fd405e00821494, type: 3}
1733+
m_Name:
1734+
m_EditorClassIdentifier:
1735+
data: {fileID: 0}
1736+
state: 0
1737+
underground: {fileID: 0}
1738+
pulled: {fileID: 0}
1739+
hole: {fileID: 0}
1740+
quadAnimation: {fileID: 0}
1741+
--- !u!4 &218499640
1742+
Transform:
1743+
m_ObjectHideFlags: 0
1744+
m_CorrespondingSourceObject: {fileID: 0}
1745+
m_PrefabInstance: {fileID: 0}
1746+
m_PrefabAsset: {fileID: 0}
1747+
m_GameObject: {fileID: 218499638}
1748+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1749+
m_LocalPosition: {x: -4.4312596, y: 2.4953122, z: -0.23490927}
1750+
m_LocalScale: {x: 1, y: 1, z: 1}
1751+
m_ConstrainProportionsScale: 0
1752+
m_Children: []
1753+
m_Father: {fileID: 0}
1754+
m_RootOrder: 5
1755+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17061756
--- !u!1001 &222382082
17071757
PrefabInstance:
17081758
m_ObjectHideFlags: 0
@@ -2113,7 +2163,7 @@ Transform:
21132163
- {fileID: 623839012}
21142164
- {fileID: 548978787}
21152165
m_Father: {fileID: 0}
2116-
m_RootOrder: 5
2166+
m_RootOrder: 7
21172167
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
21182168
--- !u!1001 &238671802
21192169
PrefabInstance:
@@ -6086,7 +6136,7 @@ Transform:
60866136
m_Children:
60876137
- {fileID: 1721216715}
60886138
m_Father: {fileID: 0}
6089-
m_RootOrder: 6
6139+
m_RootOrder: 8
60906140
m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
60916141
--- !u!1001 &884080055
60926142
PrefabInstance:
@@ -6202,6 +6252,89 @@ PrefabInstance:
62026252
objectReference: {fileID: 0}
62036253
m_RemovedComponents: []
62046254
m_SourcePrefab: {fileID: 100100000, guid: 4f67e033262949d4c9b851ea7b595c65, type: 3}
6255+
--- !u!1 &884922146
6256+
GameObject:
6257+
m_ObjectHideFlags: 0
6258+
m_CorrespondingSourceObject: {fileID: 0}
6259+
m_PrefabInstance: {fileID: 0}
6260+
m_PrefabAsset: {fileID: 0}
6261+
serializedVersion: 6
6262+
m_Component:
6263+
- component: {fileID: 884922149}
6264+
- component: {fileID: 884922147}
6265+
- component: {fileID: 884922148}
6266+
m_Layer: 0
6267+
m_Name: Tree1
6268+
m_TagString: Untagged
6269+
m_Icon: {fileID: 0}
6270+
m_NavMeshLayer: 0
6271+
m_StaticEditorFlags: 0
6272+
m_IsActive: 1
6273+
--- !u!33 &884922147
6274+
MeshFilter:
6275+
m_ObjectHideFlags: 0
6276+
m_CorrespondingSourceObject: {fileID: 0}
6277+
m_PrefabInstance: {fileID: 0}
6278+
m_PrefabAsset: {fileID: 0}
6279+
m_GameObject: {fileID: 884922146}
6280+
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
6281+
--- !u!23 &884922148
6282+
MeshRenderer:
6283+
m_ObjectHideFlags: 0
6284+
m_CorrespondingSourceObject: {fileID: 0}
6285+
m_PrefabInstance: {fileID: 0}
6286+
m_PrefabAsset: {fileID: 0}
6287+
m_GameObject: {fileID: 884922146}
6288+
m_Enabled: 1
6289+
m_CastShadows: 1
6290+
m_ReceiveShadows: 1
6291+
m_DynamicOccludee: 1
6292+
m_StaticShadowCaster: 0
6293+
m_MotionVectors: 1
6294+
m_LightProbeUsage: 1
6295+
m_ReflectionProbeUsage: 1
6296+
m_RayTracingMode: 2
6297+
m_RayTraceProcedural: 0
6298+
m_RenderingLayerMask: 1
6299+
m_RendererPriority: 0
6300+
m_Materials:
6301+
- {fileID: 2100000, guid: 2ab6beb9638801545995c1b3283c0627, type: 2}
6302+
m_StaticBatchInfo:
6303+
firstSubMesh: 0
6304+
subMeshCount: 0
6305+
m_StaticBatchRoot: {fileID: 0}
6306+
m_ProbeAnchor: {fileID: 0}
6307+
m_LightProbeVolumeOverride: {fileID: 0}
6308+
m_ScaleInLightmap: 1
6309+
m_ReceiveGI: 1
6310+
m_PreserveUVs: 0
6311+
m_IgnoreNormalsForChartDetection: 0
6312+
m_ImportantGI: 0
6313+
m_StitchLightmapSeams: 1
6314+
m_SelectedEditorRenderState: 3
6315+
m_MinimumChartSize: 4
6316+
m_AutoUVMaxDistance: 0.5
6317+
m_AutoUVMaxAngle: 89
6318+
m_LightmapParameters: {fileID: 0}
6319+
m_SortingLayerID: 0
6320+
m_SortingLayer: 0
6321+
m_SortingOrder: 0
6322+
m_AdditionalVertexStreams: {fileID: 0}
6323+
--- !u!4 &884922149
6324+
Transform:
6325+
m_ObjectHideFlags: 0
6326+
m_CorrespondingSourceObject: {fileID: 0}
6327+
m_PrefabInstance: {fileID: 0}
6328+
m_PrefabAsset: {fileID: 0}
6329+
m_GameObject: {fileID: 884922146}
6330+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6331+
m_LocalPosition: {x: 0, y: 1.91, z: -0.002}
6332+
m_LocalScale: {x: 5, y: 5, z: 1}
6333+
m_ConstrainProportionsScale: 0
6334+
m_Children: []
6335+
m_Father: {fileID: 1330428048}
6336+
m_RootOrder: 0
6337+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
62056338
--- !u!1001 &886846404
62066339
PrefabInstance:
62076340
m_ObjectHideFlags: 0
@@ -9224,6 +9357,79 @@ PrefabInstance:
92249357
objectReference: {fileID: 0}
92259358
m_RemovedComponents: []
92269359
m_SourcePrefab: {fileID: 100100000, guid: 5861e58deaf30ba439dc461b5a19b628, type: 3}
9360+
--- !u!1 &1330428044
9361+
GameObject:
9362+
m_ObjectHideFlags: 0
9363+
m_CorrespondingSourceObject: {fileID: 0}
9364+
m_PrefabInstance: {fileID: 0}
9365+
m_PrefabAsset: {fileID: 0}
9366+
serializedVersion: 6
9367+
m_Component:
9368+
- component: {fileID: 1330428048}
9369+
- component: {fileID: 1330428047}
9370+
- component: {fileID: 1330428046}
9371+
- component: {fileID: 1330428045}
9372+
m_Layer: 0
9373+
m_Name: TreeObject
9374+
m_TagString: Untagged
9375+
m_Icon: {fileID: 0}
9376+
m_NavMeshLayer: 0
9377+
m_StaticEditorFlags: 0
9378+
m_IsActive: 0
9379+
--- !u!114 &1330428045
9380+
MonoBehaviour:
9381+
m_ObjectHideFlags: 0
9382+
m_CorrespondingSourceObject: {fileID: 0}
9383+
m_PrefabInstance: {fileID: 0}
9384+
m_PrefabAsset: {fileID: 0}
9385+
m_GameObject: {fileID: 1330428044}
9386+
m_Enabled: 1
9387+
m_EditorHideFlags: 0
9388+
m_Script: {fileID: 11500000, guid: c70215f4d4550b4468d51e1cdd4b18c6, type: 3}
9389+
m_Name:
9390+
m_EditorClassIdentifier:
9391+
meshFilter: {fileID: 884922147}
9392+
--- !u!135 &1330428046
9393+
SphereCollider:
9394+
m_ObjectHideFlags: 0
9395+
m_CorrespondingSourceObject: {fileID: 0}
9396+
m_PrefabInstance: {fileID: 0}
9397+
m_PrefabAsset: {fileID: 0}
9398+
m_GameObject: {fileID: 1330428044}
9399+
m_Material: {fileID: 0}
9400+
m_IsTrigger: 0
9401+
m_Enabled: 1
9402+
serializedVersion: 2
9403+
m_Radius: 1.25
9404+
m_Center: {x: 0, y: 0.27, z: 0.12}
9405+
--- !u!114 &1330428047
9406+
MonoBehaviour:
9407+
m_ObjectHideFlags: 0
9408+
m_CorrespondingSourceObject: {fileID: 0}
9409+
m_PrefabInstance: {fileID: 0}
9410+
m_PrefabAsset: {fileID: 0}
9411+
m_GameObject: {fileID: 1330428044}
9412+
m_Enabled: 1
9413+
m_EditorHideFlags: 0
9414+
m_Script: {fileID: 11500000, guid: 536aa8d91b8ef654586cb827c1ed55fc, type: 3}
9415+
m_Name:
9416+
m_EditorClassIdentifier:
9417+
--- !u!4 &1330428048
9418+
Transform:
9419+
m_ObjectHideFlags: 0
9420+
m_CorrespondingSourceObject: {fileID: 0}
9421+
m_PrefabInstance: {fileID: 0}
9422+
m_PrefabAsset: {fileID: 0}
9423+
m_GameObject: {fileID: 1330428044}
9424+
m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956}
9425+
m_LocalPosition: {x: 0, y: 0, z: 0}
9426+
m_LocalScale: {x: 1, y: 1, z: 1}
9427+
m_ConstrainProportionsScale: 0
9428+
m_Children:
9429+
- {fileID: 884922149}
9430+
m_Father: {fileID: 0}
9431+
m_RootOrder: 6
9432+
m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
92279433
--- !u!1001 &1331477440
92289434
PrefabInstance:
92299435
m_ObjectHideFlags: 0
@@ -13753,7 +13959,7 @@ Transform:
1375313959
m_ConstrainProportionsScale: 0
1375413960
m_Children: []
1375513961
m_Father: {fileID: 0}
13756-
m_RootOrder: 7
13962+
m_RootOrder: 9
1375713963
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1375813964
--- !u!4 &1940336589 stripped
1375913965
Transform:

0 commit comments

Comments
 (0)