diff options
Diffstat (limited to 'Assets')
| -rw-r--r-- | Assets/Scenes/Main Menu/MainMenu.unity | 222 | ||||
| -rw-r--r-- | Assets/Scenes/Simulation/SimulationScene.unity | 44 |
2 files changed, 53 insertions, 213 deletions
diff --git a/Assets/Scenes/Main Menu/MainMenu.unity b/Assets/Scenes/Main Menu/MainMenu.unity index 89078ce..ff2eb1d 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: @@ -120,165 +120,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &471477666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 471477667} - - component: {fileID: 471477669} - - component: {fileID: 471477668} - m_Layer: 5 - m_Name: Copyright - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &471477667 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 471477666} - 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: 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: 198} - m_SizeDelta: {x: 373.05, y: 126.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &471477668 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 471477666} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 'Copyright 2019 - - AleeCorp & Software Elevated' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 258 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: 26 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0.5314175, z: 0.8518966, w: -6.062308} - m_textInfo: - textComponent: {fileID: 471477668} - characterCount: 43 - spriteCount: 0 - spaceCount: 5 - wordCount: 5 - linkCount: 0 - lineCount: 3 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &471477669 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 471477666} - m_CullTransparentMesh: 0 --- !u!1 &604245000 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, @@ -436,7 +277,7 @@ PrefabInstance: - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} @@ -461,7 +302,7 @@ PrefabInstance: - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_AnchoredPosition.y - value: -309.7 + value: -335 objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} @@ -503,21 +344,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 604245002} - - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ExitGame - objectReference: {fileID: 0} - - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -543,6 +369,21 @@ PrefabInstance: propertyPath: m_text value: Exit objectReference: {fileID: 0} + - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 604245002} + - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ExitGame + objectReference: {fileID: 0} + - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} --- !u!1 &814288525 @@ -854,8 +695,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225.34, y: -111} - m_SizeDelta: {x: 173.4, y: 67.3} + m_AnchoredPosition: {x: 226.38, y: -111} + m_SizeDelta: {x: 452.76, y: 67.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1244813970 MonoBehaviour: @@ -877,7 +718,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: UniCity + m_text: Unicity m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} @@ -912,7 +753,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 257 + m_textAlignment: 544 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -1074,7 +915,6 @@ RectTransform: m_Children: - {fileID: 1244813969} - {fileID: 1242155459} - - {fileID: 471477667} - {fileID: 2084687741} - {fileID: 604245001} m_Father: {fileID: 1030991978} @@ -1082,8 +922,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -22.5, y: 461.5} - m_SizeDelta: {x: 352.9, y: 831.8} + m_AnchoredPosition: {x: 124.61751, y: 462.34} + m_SizeDelta: {x: 352.765, y: 913.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1430528655 MonoBehaviour: @@ -1153,12 +993,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1430528654} - m_RootOrder: 3 + m_RootOrder: 2 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: 3.78, y: -406.8} - m_SizeDelta: {x: 293.9, y: 46.8} + m_AnchoredPosition: {x: -0.0017586, y: 357.6} + m_SizeDelta: {x: 452.76, y: 46.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2084687742 MonoBehaviour: @@ -1208,14 +1048,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 257 + m_textAlignment: 544 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -1355,7 +1195,7 @@ PrefabInstance: - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_AnchoredPosition.y - value: -211.84094 + value: -237.14099 objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} diff --git a/Assets/Scenes/Simulation/SimulationScene.unity b/Assets/Scenes/Simulation/SimulationScene.unity index 45982c3..c88e8bf 100644 --- a/Assets/Scenes/Simulation/SimulationScene.unity +++ b/Assets/Scenes/Simulation/SimulationScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 170076734} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1006,10 +1006,10 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 'Project SimLife - Experimental 2 + m_text: 'Unicity - Experimental 2 - Please note that game is under active - development, and features may be incomplete or missing.' + Please note that game is under active development, + and features may be incomplete or missing.' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} @@ -1078,10 +1078,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: -1.4023037, w: -0.0000135531045} m_textInfo: textComponent: {fileID: 617386312} - characterCount: 126 + characterCount: 118 spriteCount: 0 - spaceCount: 19 - wordCount: 20 + spaceCount: 18 + wordCount: 19 linkCount: 0 lineCount: 3 pageCount: 1 @@ -2304,6 +2304,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1687973899} + - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ExitGame + objectReference: {fileID: 0} + - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -2336,21 +2351,6 @@ PrefabInstance: propertyPath: m_textInfo.spaceCount value: 1 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1687973899} - - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ExitGame - objectReference: {fileID: 0} - - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} --- !u!224 &1687973897 stripped |