Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-04-26 02:00:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

More UI stuff Bro I don't remember Ui hell rn

Browse Source
This commit is contained in:
Melbyj1125 2022-04-20 02:34:25 -05:00
parent 7791d79d18
commit abf0c7b8fd
6 changed files with 4374 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Prefabs/Lobby/LobbyPlayerCard.prefab
View File

@ -102,17 +102,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 164869310498232978}
m_LocalRotation: {x: 0, y: 0, z: -0.026176924, w: 0.99965733}
m_LocalRotation: {x: -0, y: -0, z: -0.022464242, w: 0.9997477}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4327595082631380924}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -3}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -2.574}
m_AnchorMin: {x: 0, y: 0.85}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -32.400024, y: -25.599976}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 19, y: -17}
m_SizeDelta: {x: -111.8631, y: 0.877}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6704025555102986816
CanvasRenderer:
@ -145,7 +145,7 @@ MonoBehaviour:
m_text: Display Name
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -169,11 +169,11 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 15.9
m_fontSizeBase: 40
m_fontSize: 25
m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 0
m_fontSizeMin: 25
m_fontSizeMax: 40
m_fontStyle: 0
m_HorizontalAlignment: 2
@ -208,7 +208,7 @@ MonoBehaviour:
m_margin: {x: 19.98816, y: 10, z: 10, w: 10}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 1
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3555119561119790297
@ -584,7 +584,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0.15}
m_AnchoredPosition: {x: -84, y: 36}
m_AnchoredPosition: {x: -77, y: 36}
m_SizeDelta: {x: 52, y: 51.399}
m_Pivot: {x: 0.5, y: 0.49999997}
--- !u!114 &7093129836083058353

4496
Assets/Prefabs/Lobby/LobbyUI.prefab
View File

File diff suppressed because it is too large Load Diff

22
Assets/Scenes/Lobby.unity
View File

@ -260,7 +260,7 @@ Light:
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.5
m_Intensity: 0.8
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
@ -622,14 +622,6 @@ PrefabInstance:
propertyPath: player
value:
objectReference: {fileID: 1129569236}
- target: {fileID: 2240580173848419138, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240580173848419138, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2890392181480129907, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
propertyPath: m_Camera
value:
@ -754,17 +746,5 @@ PrefabInstance:
propertyPath: runnerBodyModifiers.Array.data[17]
value:
objectReference: {fileID: 1129569243}
- target: {fileID: 7203582894680926279, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7203582894680926279, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7203582894680926279, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}

40
Assets/Scenes/TitleScene.unity
View File

@ -252,10 +252,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: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
@ -379,7 +379,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 750, y: -460}
m_SizeDelta: {x: 300, y: 300}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &422304961
MonoBehaviour:
@ -560,7 +560,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -750, y: -460}
m_SizeDelta: {x: 300, y: 300}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!61 &485393294
BoxCollider2D:
@ -872,7 +872,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 28}
m_SizeDelta: {x: 579.7236, y: 230.7526}
m_SizeDelta: {x: 579.72363, y: 230.75256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &627060240
MonoBehaviour:
@ -988,11 +988,11 @@ MonoBehaviour:
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -7005677058688560667, guid: 6f81bdd0a5c7c0946bf59a2f2d299bf2, type: 3}
m_Sprite: {fileID: -9183974432431927198, guid: 32029ffa3d1f9ff4486840a730a390c9, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@ -1741,7 +1741,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 281.25, y: -460}
m_SizeDelta: {x: 300, y: 300}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!61 &1054788710
BoxCollider2D:
@ -1921,7 +1921,7 @@ 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.000022173, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1924, y: 1617}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1166003626
@ -2126,10 +2126,10 @@ RectTransform:
m_Father: {fileID: 1306950217}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 1.5843964}
m_SizeDelta: {x: 0, y: -3.1688}
m_AnchorMin: {x: 0, y: 0.19039038}
m_AnchorMax: {x: 1, y: 0.72120327}
m_AnchoredPosition: {x: 0, y: 3.2275}
m_SizeDelta: {x: 25.3594, y: -1.0779}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1268511103
MonoBehaviour:
@ -2263,7 +2263,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000030517578, y: -14.664497}
m_AnchoredPosition: {x: 0, y: -14.66449}
m_SizeDelta: {x: -85.1804, y: -83.6243}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1306950218
@ -2318,7 +2318,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -281.25, y: -460}
m_SizeDelta: {x: 300, y: 300}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!50 &1467566891
Rigidbody2D:
@ -2494,10 +2494,10 @@ RectTransform:
m_Father: {fileID: 1306950217}
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: 0, y: 0.000015258789}
m_SizeDelta: {x: 0, y: 0.000053406}
m_AnchorMin: {x: 0, y: 0.238}
m_AnchorMax: {x: 1, y: 0.72120327}
m_AnchoredPosition: {x: -6.339798, y: -0.27490234}
m_SizeDelta: {x: 12.68, y: 5.9268036}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1483540419
MonoBehaviour:
@ -2602,7 +2602,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: 0, y: 0, z: -8.814087, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0

16
Assets/Scripts/UI/Lobby/ControlsUI.cs
View File

@ -8,8 +8,8 @@ public class ControlsUI : MonoBehaviour
public GameObject controlsMenu;
public TMP_Text ControlsHeader;
public TMP_Text ControlsButtonText;
public TMP_Text ControlsText;
private bool isViewingRunnerControls = true;
public GameObject runnerControls;
public GameObject kingControls;
@ -29,19 +29,21 @@ public class ControlsUI : MonoBehaviour
public void ToggleControlsScreen()
{
if (isViewingRunnerControls)
if (runnerControls.active)
{
isViewingRunnerControls = false;
ControlsHeader.text = "King Controls";
ControlsButtonText.text = "Runner Controls";
ControlsText.text = "To-Do: Put the King's Controls here";
runnerControls.SetActive(false);
kingControls.SetActive(true);
}
else
{
isViewingRunnerControls = true;
ControlsHeader.text = "Runner Controls";
ControlsButtonText.text = "King Controls";
ControlsText.text = "To-Do: Put the Runner's Controls here";
runnerControls.SetActive(true);
kingControls.SetActive(false);
}
}
}

20
UserSettings/EditorUserSettings.asset
View File

@ -6,34 +6,34 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe
flags: 0
RecentlyUsedScenePath-3:
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-4:
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25
flags: 0
RecentlyUsedScenePath-5:
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c731f1415016439262f2434
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650