Use new fonts on menu buttons

This commit is contained in:
Jason Durand 01 2022-04-03 22:08:06 -04:00
parent 2000f0859c
commit ad25e11cf7
5 changed files with 2502 additions and 2126 deletions

File diff suppressed because it is too large Load Diff

View File

@ -160,7 +160,7 @@ PrefabInstance:
- target: {fileID: 1599369357879094150, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} - target: {fileID: 1599369357879094150, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_FirstSelected propertyPath: m_FirstSelected
value: value:
objectReference: {fileID: 1492315807} objectReference: {fileID: 1484020797}
- target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} - target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_Follow propertyPath: m_Follow
value: value:
@ -372,9 +372,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aadb67b8f73573a44b31b015f38561ee, type: 3} m_Script: {fileID: 11500000, guid: aadb67b8f73573a44b31b015f38561ee, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &1492315807 stripped --- !u!1 &1484020797 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 4394421821813469862, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} m_CorrespondingSourceObject: {fileID: 3138207168594500655, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
m_PrefabInstance: {fileID: 1896701250} m_PrefabInstance: {fileID: 1896701250}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &1551362086 --- !u!1001 &1551362086
@ -541,10 +541,18 @@ PrefabInstance:
propertyPath: eventSystem propertyPath: eventSystem
value: value:
objectReference: {fileID: 775644865} objectReference: {fileID: 775644865}
- target: {fileID: 1568061621804763920, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: gameFlowManager
value:
objectReference: {fileID: 171858601}
- target: {fileID: 2702070852302166608, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} - target: {fileID: 2702070852302166608, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_text propertyPath: m_text
value: Windowed value: Windowed
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2702070852302166608, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3281526541317417273, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} - target: {fileID: 3281526541317417273, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
@ -673,6 +681,34 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8875728551819254536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8875728551819254536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8875728551819254536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 171858601}
- target: {fileID: 8875728551819254536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8875728551819254536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ToStartFlowState
objectReference: {fileID: 0}
- target: {fileID: 8875728551819254536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameFlowManager, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8875728551819254536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
--- !u!1001 &1942557562 --- !u!1001 &1942557562

View File

@ -15,6 +15,9 @@ public class MainMenuManager : MonoBehaviour {
Options, Options,
} }
[SerializeField] [Required]
GameFlowManager gameFlowManager;
[SerializeField] [Required] [SerializeField] [Required]
TMP_Text titleLabel; TMP_Text titleLabel;
@ -96,6 +99,10 @@ public class MainMenuManager : MonoBehaviour {
public void ResetHighScore() => gameTimer.ResetHighScore(); public void ResetHighScore() => gameTimer.ResetHighScore();
public void ToStartFlowState() => gameFlowManager.ToStartFlowState();
public void ToGameplayFlowState() => gameFlowManager.ToGameplayFlowState();
public void DisplayModeChange() { public void DisplayModeChange() {
Screen.fullScreenMode = displayModeDropdown.value switch { Screen.fullScreenMode = displayModeDropdown.value switch {
0 => FullScreenMode.Windowed, 0 => FullScreenMode.Windowed,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long