diff options
Diffstat (limited to 'Assets')
4 files changed, 79 insertions, 42 deletions
diff --git a/Assets/Packages/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat b/Assets/Packages/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat index 403fbaf..36fb849 100644 --- a/Assets/Packages/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat +++ b/Assets/Packages/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat @@ -4,11 +4,12 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: LiberationSans SDF - Drop Shadow m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} - m_ShaderKeywords: OUTLINE_ON UNDERLAY_ON + m_ShaderKeywords: UNDERLAY_ON m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -69,7 +70,7 @@ Material: - _Reflectivity: 10 - _ScaleRatioA: 0.9 - _ScaleRatioB: 0.73125 - - _ScaleRatioC: 0.64125 + - _ScaleRatioC: 0.42749998 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -84,7 +85,7 @@ Material: - _UnderlayDilate: 0 - _UnderlayOffsetX: 0.5 - _UnderlayOffsetY: -0.5 - - _UnderlaySoftness: 0.05 + - _UnderlaySoftness: 1 - _VertexOffsetX: 0 - _VertexOffsetY: 0 - _WeightBold: 0.75 diff --git a/Assets/Scenes/Main Menu/MainMenu.unity b/Assets/Scenes/Main Menu/MainMenu.unity index 65dee5d..767842a 100644 --- a/Assets/Scenes/Main Menu/MainMenu.unity +++ b/Assets/Scenes/Main Menu/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -137,16 +137,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 471477666} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1115240055} - m_RootOrder: 3 + m_Father: {fileID: 1430528654} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 230.23, y: 88.5} + m_AnchoredPosition: {x: 230.21875, y: 88.339} m_SizeDelta: {x: 373.05, y: 126.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &471477668 @@ -452,17 +452,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 914570444} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - {fileID: 1014234272} - m_Father: {fileID: 1115240055} - m_RootOrder: 4 + m_Father: {fileID: 1430528654} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225.34998, y: -303} + m_AnchoredPosition: {x: 225.34375, y: -302.84088} m_SizeDelta: {x: 297.3, y: 78.099976} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &914570446 @@ -550,7 +550,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -689,6 +689,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1014234271} m_CullTransparentMesh: 0 +--- !u!1 &1030991977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1030991978} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1030991978 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1030991977} + 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: + - {fileID: 1430528654} + m_Father: {fileID: 1115240055} + 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_AnchoredPosition: {x: -959.8, y: -462.4} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1115240051 GameObject: m_ObjectHideFlags: 0 @@ -779,11 +815,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 1430528654} - - {fileID: 1244813969} - - {fileID: 1242155459} - - {fileID: 471477667} - - {fileID: 914570445} + - {fileID: 1030991978} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -819,17 +851,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1242155458} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - {fileID: 1474680999} - m_Father: {fileID: 1115240055} - m_RootOrder: 2 + m_Father: {fileID: 1430528654} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225.34998, y: -212} + m_AnchoredPosition: {x: 225.34375, y: -211.84094} m_SizeDelta: {x: 297.3, y: 78.099976} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1242155460 @@ -894,7 +926,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -967,16 +999,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1244813968} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1115240055} - m_RootOrder: 1 + m_Father: {fileID: 1430528654} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 236.9, y: -115} + m_AnchoredPosition: {x: 236.90625, y: -114.84094} m_SizeDelta: {x: 359.7, y: 60.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1244813970 @@ -1193,17 +1225,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430528653} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1115240055} + m_Children: + - {fileID: 1244813969} + - {fileID: 1242155459} + - {fileID: 471477667} + - {fileID: 914570445} + m_Father: {fileID: 1030991978} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -723.1, y: 0.0009765625} - m_SizeDelta: {x: -1446.2, y: -0.32006836} + m_AnchoredPosition: {x: 236.73138, y: 462.40005} + m_SizeDelta: {x: 373.86255, y: 824.87805} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1430528655 MonoBehaviour: @@ -1218,14 +1254,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.37248862, g: 0.745283, b: 0.36912602, a: 1} + m_Color: {r: 0.30545673, g: 0.754717, b: 0.2990388, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/TestDemo/TestSimulation.unity b/Assets/Scenes/TestDemo/TestSimulation.unity index 0634bfa..76e7146 100644 --- a/Assets/Scenes/TestDemo/TestSimulation.unity +++ b/Assets/Scenes/TestDemo/TestSimulation.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 170076734} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -485,7 +485,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -873,7 +873,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: 'Project SimLife - Experimental 2 - Please note that this is a working progress game.' + Please note that this is a work in progress game.' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} @@ -944,8 +944,8 @@ MonoBehaviour: textComponent: {fileID: 0} characterCount: 82 spriteCount: 0 - spaceCount: 13 - wordCount: 14 + spaceCount: 14 + wordCount: 15 linkCount: 0 lineCount: 2 pageCount: 1 diff --git a/Assets/Scripts/UI/ExitApplication.cs b/Assets/Scripts/UI/ExitApplication.cs index 05bf5e0..272cec1 100644 --- a/Assets/Scripts/UI/ExitApplication.cs +++ b/Assets/Scripts/UI/ExitApplication.cs @@ -25,7 +25,7 @@ public class ExitApplication : MonoBehaviour { public void ExitGame() { - Debug.Log("Successfully Exited the Game"); + Debug.Log("Game has closed."); Application.Quit(); } } |
