diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index 900688db..807b7ad4 100644 Binary files a/.plastic/plastic.changes and b/.plastic/plastic.changes differ diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 106c9f63..9e47da7d 100644 Binary files a/.plastic/plastic.wktree and b/.plastic/plastic.wktree differ diff --git a/Assets/Animations/BG_level_02.anim b/Assets/Animations/BG_level_02.anim new file mode 100644 index 00000000..0f362749 --- /dev/null +++ b/Assets/Animations/BG_level_02.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BG_level_02 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/BG_level_02.anim.meta b/Assets/Animations/BG_level_02.anim.meta new file mode 100644 index 00000000..1dfca38f --- /dev/null +++ b/Assets/Animations/BG_level_02.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a588bc6d227af58469dc09c3da178e68 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Background_level_02.controller b/Assets/Animations/Background_level_02.controller new file mode 100644 index 00000000..2f3ee00d --- /dev/null +++ b/Assets/Animations/Background_level_02.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8624292883514956560 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BG_level_02 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a588bc6d227af58469dc09c3da178e68, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-6445294331767715835 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8624292883514956560} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8624292883514956560} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Background_level_02 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6445294331767715835} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Animations/Background_level_02.controller.meta b/Assets/Animations/Background_level_02.controller.meta new file mode 100644 index 00000000..dad7b546 --- /dev/null +++ b/Assets/Animations/Background_level_02.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2577432864cf414dbfc61d3c959e6d4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta b/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta index dc3f2f86..4394aa1a 100644 --- a/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta @@ -22,6 +22,7 @@ PluginImporter: enabled: 1 settings: CPU: x86 + DefaultValueInitialized: true OS: Windows - first: Standalone: Win diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta index 56d89d48..4d979f9c 100644 --- a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta @@ -22,6 +22,7 @@ PluginImporter: enabled: 1 settings: CPU: x86_64 + DefaultValueInitialized: true OS: Windows - first: Standalone: Win64 diff --git a/Assets/Prefabs/LevelChanger.prefab b/Assets/Prefabs/LevelChanger.prefab index b6bf14e9..b7886194 100644 --- a/Assets/Prefabs/LevelChanger.prefab +++ b/Assets/Prefabs/LevelChanger.prefab @@ -218,10 +218,10 @@ 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: 1080, y: 1920} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Resources/TerrabyteSoftware_Logo.png b/Assets/Resources/TerrabyteSoftware_Logo.png new file mode 100644 index 00000000..773864d0 Binary files /dev/null and b/Assets/Resources/TerrabyteSoftware_Logo.png differ diff --git a/Assets/Resources/TerrabyteSoftware_Logo.png.meta b/Assets/Resources/TerrabyteSoftware_Logo.png.meta new file mode 100644 index 00000000..cc98e3b6 --- /dev/null +++ b/Assets/Resources/TerrabyteSoftware_Logo.png.meta @@ -0,0 +1,190 @@ +fileFormatVersion: 2 +guid: dc1fc40f0301f544c8e167fc17dc019f +TextureImporter: + internalIDToNameTable: + - first: + 213: 671047073568174383 + second: TerrabyteSoftware_Logo_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Win + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Win64 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Linux64 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: TerrabyteSoftware_Logo_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1382 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f21b89f02c9005900800000000000000 + internalID: 671047073568174383 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI Element.png.meta b/Assets/Resources/UI Element.png.meta index 4d7fa5da..07446841 100644 --- a/Assets/Resources/UI Element.png.meta +++ b/Assets/Resources/UI Element.png.meta @@ -182,7 +182,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + UI Element_0: -2563248171097983681 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/block_03.png.meta b/Assets/Resources/block_03.png.meta index fbee5620..7af53f65 100644 --- a/Assets/Resources/block_03.png.meta +++ b/Assets/Resources/block_03.png.meta @@ -182,7 +182,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + block_03_0: -4446011695823861371 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scenes/Level_Scenes/Level_01.unity b/Assets/Scenes/Level_Scenes/Level_01.unity index b341f35b..07ddb642 100644 --- a/Assets/Scenes/Level_Scenes/Level_01.unity +++ b/Assets/Scenes/Level_Scenes/Level_01.unity @@ -876,6 +876,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2837300450176305350, guid: 0ce0ac8b4b580bb489d9ef44fdf27af1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2885046831773467211, guid: 0ce0ac8b4b580bb489d9ef44fdf27af1, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -1069,6 +1073,10 @@ PrefabInstance: propertyPath: m_Name value: Pause Menu objectReference: {fileID: 0} + - target: {fileID: 4088486814281227570, guid: 81a4d06b08ab96e4d933ec13423d1ddd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4839037859591187541, guid: 81a4d06b08ab96e4d933ec13423d1ddd, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: diff --git a/Assets/Scenes/Level_Scenes/Level_02.unity b/Assets/Scenes/Level_Scenes/Level_02.unity index bfa78611..08684b8e 100644 --- a/Assets/Scenes/Level_Scenes/Level_02.unity +++ b/Assets/Scenes/Level_Scenes/Level_02.unity @@ -187,8 +187,16 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7925947057591460876, guid: 718ac305d0d3deb4786db56d96b35e79, type: 3} + insertIndex: -1 + addedObject: {fileID: 1465008383} m_SourcePrefab: {fileID: 100100000, guid: 718ac305d0d3deb4786db56d96b35e79, type: 3} +--- !u!1 &11593406 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7925947057591460876, guid: 718ac305d0d3deb4786db56d96b35e79, type: 3} + m_PrefabInstance: {fileID: 11593405} + m_PrefabAsset: {fileID: 0} --- !u!1001 &134310862 PrefabInstance: m_ObjectHideFlags: 0 @@ -2613,12 +2621,34 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2377658873913910921, guid: 718ac305d0d3deb4786db56d96b35e79, type: 3} m_PrefabInstance: {fileID: 11593405} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 11593406} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 250c4c8b4d9ec0240b8e3832c18e1b68, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!95 &1465008383 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11593406} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c2577432864cf414dbfc61d3c959e6d4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &1470396842 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 0f223211..81cf75be 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -217,7 +217,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &57386861 MonoBehaviour: @@ -266,8 +266,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -353,8 +353,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 250, y: 0} - m_SizeDelta: {x: 150, y: 500} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &183738262 MonoBehaviour: @@ -484,8 +484,8 @@ RectTransform: 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: 0, y: -150} - m_SizeDelta: {x: 1080, y: 250} + m_AnchoredPosition: {x: 0, y: -88.5} + m_SizeDelta: {x: 1080, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &342832738 MonoBehaviour: @@ -534,12 +534,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100.95 + m_fontSize: 70.65 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 3000 + m_fontSizeMax: 32767 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -622,8 +622,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 250, y: 150} - m_SizeDelta: {x: 300, y: 100} + m_AnchoredPosition: {x: 150, y: 100} + m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &403452309 MonoBehaviour: @@ -647,8 +647,8 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_HighlightedColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} + m_PressedColor: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 @@ -768,10 +768,10 @@ 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: 1080, y: 1920} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -929,7 +929,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &769048715 MonoBehaviour: @@ -978,8 +978,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1065,7 +1065,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &791899224 MonoBehaviour: @@ -1114,8 +1114,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1201,7 +1201,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &893809447 MonoBehaviour: @@ -1250,8 +1250,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1337,7 +1337,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &920028733 MonoBehaviour: @@ -1386,8 +1386,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1451,7 +1451,7 @@ GameObject: - component: {fileID: 1062601854} - component: {fileID: 1062601853} m_Layer: 5 - m_Name: 2. + m_Name: Back_To_Back m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1475,8 +1475,8 @@ RectTransform: 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: 1500, y: 75} - m_SizeDelta: {x: 600, y: 150} + m_AnchoredPosition: {x: 1500, y: 62} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1062601853 MonoBehaviour: @@ -1606,8 +1606,8 @@ RectTransform: 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: -1.5, y: 0} - m_SizeDelta: {x: 297, y: 100} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1151000239 MonoBehaviour: @@ -1656,7 +1656,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40.35 + m_fontSize: 20.15 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -1743,7 +1743,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 150} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1166385504 MonoBehaviour: @@ -1792,8 +1792,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 95 - m_fontSizeBase: 95 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1879,8 +1879,8 @@ RectTransform: 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: 0, y: -275} - m_SizeDelta: {x: 850, y: 350} + m_AnchoredPosition: {x: 0, y: -175} + m_SizeDelta: {x: 500, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1167090208 MonoBehaviour: @@ -1900,7 +1900,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 50 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1943,7 +1943,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 150} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1194247620 MonoBehaviour: @@ -1992,8 +1992,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 120 - m_fontSizeBase: 120 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2078,8 +2078,8 @@ RectTransform: 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: 6000, y: 75} - m_SizeDelta: {x: 700, y: 200} + m_AnchoredPosition: {x: 6000, y: 8.062511} + m_SizeDelta: {x: 700, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1242335594 MonoBehaviour: @@ -2110,8 +2110,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4282137771 - m_fontColor: {r: 0.6698113, g: 0.23696156, b: 0.23696156, a: 1} + rgba: 4279505997 + m_fontColor: {r: 0.3018868, g: 0.07831969, b: 0.07831969, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2128,12 +2128,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 120 - m_fontSizeBase: 120 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 - m_fontSizeMax: 5555 + m_fontSizeMax: 80 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -2217,8 +2217,8 @@ RectTransform: 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: 3000, y: 75} - m_SizeDelta: {x: 600, y: 150} + m_AnchoredPosition: {x: 3000, y: 62} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1249255864 MonoBehaviour: @@ -2351,8 +2351,8 @@ RectTransform: 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: 0, y: 75} - m_SizeDelta: {x: 600, y: 150} + m_AnchoredPosition: {x: 0, y: 62} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1260277726 MonoBehaviour: @@ -2483,7 +2483,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 150} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1516105527 MonoBehaviour: @@ -2532,8 +2532,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 120 - m_fontSizeBase: 120 + m_fontSize: 75 + m_fontSizeBase: 75 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2619,8 +2619,8 @@ RectTransform: 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: 0, y: -275} - m_SizeDelta: {x: 850, y: 350} + m_AnchoredPosition: {x: 0, y: -175} + m_SizeDelta: {x: 500, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1547368408 MonoBehaviour: @@ -2640,7 +2640,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 50 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -2683,7 +2683,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1782363886 MonoBehaviour: @@ -2732,8 +2732,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2819,8 +2819,8 @@ RectTransform: 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: 0, y: -275} - m_SizeDelta: {x: 850, y: 350} + m_AnchoredPosition: {x: 0, y: -175} + m_SizeDelta: {x: 500, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1795046541 MonoBehaviour: @@ -2840,7 +2840,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 50 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -2883,7 +2883,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 150} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1802254161 MonoBehaviour: @@ -2932,8 +2932,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 90 - m_fontSizeBase: 90 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3102,8 +3102,8 @@ RectTransform: 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: 0, y: -275} - m_SizeDelta: {x: 850, y: 350} + m_AnchoredPosition: {x: 0, y: -175} + m_SizeDelta: {x: 500, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1899877926 MonoBehaviour: @@ -3123,7 +3123,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 50 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -3166,8 +3166,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -250, y: 0} - m_SizeDelta: {x: 150, y: 500} + m_AnchoredPosition: {x: -150, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1903389599 MonoBehaviour: @@ -3298,7 +3298,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1911943596 MonoBehaviour: @@ -3347,8 +3347,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3436,8 +3436,8 @@ RectTransform: 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: 4500, y: 75} - m_SizeDelta: {x: 600, y: 150} + m_AnchoredPosition: {x: 4500, y: 62} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1927029562 MonoBehaviour: @@ -3636,7 +3636,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 150} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2097212523 MonoBehaviour: @@ -3685,8 +3685,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 - m_fontSizeBase: 110 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3850,10 +3850,10 @@ 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: 1080, y: 1920} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Scenes/Start_Menu.unity b/Assets/Scenes/Start_Menu.unity index 459e6d95..0ba86c4b 100644 --- a/Assets/Scenes/Start_Menu.unity +++ b/Assets/Scenes/Start_Menu.unity @@ -291,7 +291,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 275} + m_AnchoredPosition: {x: 300, y: 150} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &525530809 @@ -650,8 +650,8 @@ RectTransform: 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: 0, y: -250} - m_SizeDelta: {x: 1000, y: 400} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 800, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1323256572 MonoBehaviour: @@ -700,7 +700,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 168.75 + m_fontSize: 126.55 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -786,9 +786,9 @@ RectTransform: - {fileID: 435153397} m_Father: {fileID: 1967878216} 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: 0, y: -75} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -300, y: 150} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1446153288 @@ -934,10 +934,10 @@ 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: 1080, y: 1920} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -963,7 +963,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 + m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 00000000..f689092f --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e5b4147e97adea4da47dabb9a82d29f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 4c18179d..cb7c8666 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -387,6 +387,141 @@ MonoBehaviour: m_XAdvance: 0 m_YAdvance: 0 m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -6.3828125 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -6.3828125 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 57 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -3.1914062 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 58 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -6.3828125 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 60 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 89 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 90 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 92 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -6.3828125 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 2020 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 - m_FirstAdjustmentRecord: m_GlyphIndex: 55 m_GlyphValueRecord: @@ -657,141 +792,6 @@ MonoBehaviour: m_XAdvance: 0 m_YAdvance: 0 m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -4.745117 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 3 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -6.3828125 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 55 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -6.3828125 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 57 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -3.1914062 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 58 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -6.3828125 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 60 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.5537109 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 89 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.5537109 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 90 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.5537109 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 92 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 36 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -6.3828125 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 2020 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 m_MarkToBaseAdjustmentRecords: [] m_MarkToMarkAdjustmentRecords: [] m_ShouldReimportFontFeatures: 0 diff --git a/ProjectSettings/BurstAotSettings_StandaloneOSX.json b/ProjectSettings/BurstAotSettings_StandaloneOSX.json new file mode 100644 index 00000000..ca7cf1a1 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneOSX.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 7cb78eb6..22cff8f7 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,15 +5,6 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 - path: Assets/Scenes/Loading_Screen.unity - guid: 6491cb6d9680e214e9404ef479e07b42 - - enabled: 0 - path: Assets/Scenes/Pause_Menu.unity - guid: 87ca1619e6402204c9432061705dd240 - - enabled: 0 - path: Assets/Scenes/Start Menu.unity - guid: 2cda990e2423bbf4892e6590ba056729 - enabled: 1 path: Assets/Scenes/Start_Menu.unity guid: 874d76d26a6763644b4de36e64e9a88c diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8571da3f..33c726a8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,19 +12,19 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: kingjuulian06 + companyName: Terrabyte Software productName: Square Dash defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1} + m_SplashScreenBackgroundColor: {r: 0.735849, g: 0.35751158, b: 0.4520961, a: 1} m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 - m_SplashScreenAnimation: 1 + m_SplashScreenAnimation: 2 m_SplashScreenLogoStyle: 1 m_SplashScreenDrawMode: 0 - m_SplashScreenBackgroundAnimationZoom: 1 - m_SplashScreenLogoAnimationZoom: 1 + m_SplashScreenBackgroundAnimationZoom: 0 + m_SplashScreenLogoAnimationZoom: 0.5 m_SplashScreenBackgroundLandscapeAspect: 1 m_SplashScreenBackgroundPortraitAspect: 1 m_SplashScreenBackgroundLandscapeUvs: @@ -39,7 +39,9 @@ PlayerSettings: y: 0 width: 1 height: 1 - m_SplashScreenLogos: [] + m_SplashScreenLogos: + - logo: {fileID: 671047073568174383, guid: dc1fc40f0301f544c8e167fc17dc019f, type: 3} + duration: 3 m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 @@ -138,7 +140,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.4 + bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -161,7 +163,7 @@ PlayerSettings: androidMaxAspectRatio: 2.1 androidMinAspectRatio: 1 applicationIdentifier: - Standalone: com.DefaultCompany.SquareDash + Standalone: com.Terrabyte-Software.Square-Dash buildNumber: Standalone: 0 VisionOS: 0 @@ -534,8 +536,8 @@ PlayerSettings: ps4IncludedModules: [] ps4attribVROutputEnabled: 0 monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 0} - splashScreenBackgroundSourcePortrait: {fileID: 0} + splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: 5876067cfeb1b4f48bf506461394990b, type: 3} + splashScreenBackgroundSourcePortrait: {fileID: 21300000, guid: 16457efa9d9327b42af5a5153c644385, type: 3} blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 32