Skip to content

Feat/cd in game UI backgrounds #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 9, 2022
Merged

Feat/cd in game UI backgrounds #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48a9bda
some UI background updates
jilfranco-unity Dec 8, 2022
eaa23cc
UI Update, backgrounds for the in game UI as well as matching the mai…
jilfranco-unity Dec 9, 2022
8d1fb04
Merge branch 'develop' into feat/cd-in-game-ui-backgrounds
jilfranco-unity Dec 9, 2022
c4f9213
small update to the text color
jilfranco-unity Dec 9, 2022
8b358c0
made in game tutorial text bigger
jilfranco-unity Dec 9, 2022
1c2e23c
re-enabled ui in scene
jilfranco-unity Dec 9, 2022
72ecf89
Removed some in scene overrides
jilfranco-unity Dec 9, 2022
fc8ff5e
Merge branch 'develop' into feat/cd-in-game-ui-backgrounds
jilfranco-unity Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 47 additions & 23 deletions Basic/ClientDriven/Assets/UI Toolkit/ClientDrivenUIStyleSheet.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
* {
color: rgb(167, 173, 255);
color: rgb(227, 177, 255);
font-size: 40px;
letter-spacing: 2px;
-unity-text-align: middle-center;
-unity-font-style: bold;
-unity-text-outline-width: 1px;
-unity-text-outline-width: 0.5px;
-unity-text-outline-color: rgb(26, 9, 31);
text-shadow: 1px 1px 4px rgb(26, 9, 31);
text-shadow: 1px 1px 1px rgb(26, 9, 31);
}

.layout-buttons {
Expand Down Expand Up @@ -50,11 +50,11 @@
}

.button-style:inactive {
border-left-color: rgba(34, 18, 83, 0.7);
border-right-color: rgba(34, 18, 83, 0.7);
border-top-color: rgba(34, 18, 83, 0.7);
border-bottom-color: rgba(34, 18, 83, 0.7);
background-color: rgb(67, 72, 143);
border-left-color: rgb(65, 5, 81);
border-right-color: rgb(65, 5, 81);
border-top-color: rgb(65, 5, 81);
border-bottom-color: rgb(65, 5, 81);
background-color: rgb(125, 60, 143);
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
border-top-right-radius: 10px;
Expand All @@ -63,41 +63,42 @@
border-right-width: 3px;
border-top-width: 3px;
border-bottom-width: 3px;
flex-grow: 1;
}

.button-style:hover {
display: flex;
translate: -1px -1px;
background-color: rgb(91, 95, 166);
background-color: rgb(148, 83, 166);
}

.button-style:active {
display: flex;
translate: 1px 1px;
background-color: rgb(50, 53, 106);
background-color: rgb(106, 39, 124);
border-left-color: rgb(65, 5, 81);
border-right-color: rgb(65, 5, 81);
border-top-color: rgb(65, 5, 81);
border-bottom-color: rgb(65, 5, 81);
border-left-width: 3px;
border-right-width: 3px;
border-top-width: 3px;
border-bottom-width: 3px;
border-left-color: rgba(34, 18, 83, 0.7);
border-right-color: rgba(34, 18, 83, 0.7);
border-top-color: rgba(34, 18, 83, 0.7);
border-bottom-color: rgba(34, 18, 83, 0.7);
}

.button-style:disabled {
background-color: rgb(50, 53, 106);
background-color: rgb(132, 90, 143);
color: rgb(48, 87, 128);
}

.input-field:inactive {
flex-grow: 1;
color: rgb(93, 168, 255);
background-color: rgb(42, 47, 105);
border-left-color: rgba(38, 20, 94, 0.7);
border-right-color: rgba(38, 20, 94, 0.7);
border-top-color: rgba(38, 20, 94, 0.7);
border-bottom-color: rgba(38, 20, 94, 0.7);
background-color: rgb(13, 0, 20);
border-left-color: rgb(65, 5, 81);
border-right-color: rgb(65, 5, 81);
border-top-color: rgb(65, 5, 81);
border-bottom-color: rgb(65, 5, 81);
border-left-width: 3px;
border-right-width: 3px;
border-top-width: 3px;
Expand All @@ -116,7 +117,7 @@
.input-field:hover {
flex-grow: 1;
color: rgb(127, 192, 255);
background-color: rgb(54, 59, 130);
background-color: rgb(33, 2, 47);
font-size: 20px;
margin-left: 6px;
margin-right: 6px;
Expand All @@ -127,7 +128,7 @@
.input-field:focus {
flex-grow: 1;
color: rgb(127, 192, 255);
background-color: rgb(42, 47, 105);
background-color: rgb(33, 2, 47);
font-size: 20px;
margin-left: 6px;
margin-right: 6px;
Expand All @@ -145,7 +146,7 @@
margin-bottom: 6px;
scale: 1 1;
translate: 0 0;
background-color: rgb(42, 47, 105);
background-color: rgb(3, 0, 5);
}

.input-field > .unity-base-text-field__input:inactive {
Expand All @@ -156,3 +157,26 @@
-unity-text-align: middle-center;
-unity-font-style: bold-and-italic;
}

.background {
width: 590px;
height: 119px;
margin-left: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0;
background-color: rgba(65, 5, 81, 0.97);
border-left-color: rgb(65, 5, 81);
border-right-color: rgb(65, 5, 81);
border-top-color: rgb(65, 5, 81);
border-bottom-color: rgb(65, 5, 81);
border-left-width: 3px;
border-right-width: 3px;
border-top-width: 3px;
border-bottom-width: 3px;
border-top-left-radius: 30px;
border-bottom-left-radius: 30px;
border-top-right-radius: 30px;
border-bottom-right-radius: 30px;
justify-content: center;
}
12 changes: 8 additions & 4 deletions Basic/ClientDriven/Assets/UI Toolkit/GameUI/GameUI.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
<Style src="project://database/Assets/UI%20Toolkit/ClientDrivenUIStyleSheet.uss?fileID=7433441132597879392&amp;guid=bcbf16fef3f0e5a40887d466edf9c406&amp;type=3#ClientDrivenUIStyleSheet" />
<ui:VisualElement name="Canvas" style="flex-grow: 1; justify-content: space-between; align-items: stretch; height: 100%; width: 100%; opacity: 1; flex-direction: column;">
<ui:VisualElement name="ScoreHolder" style="flex-grow: 1; height: auto; flex-direction: row; justify-content: flex-end; align-items: flex-start; padding-top: 20px; padding-right: 20px; padding-left: 20px; padding-bottom: 20px;">
<ui:VisualElement name="ScoreHolder" style="flex-direction: row; justify-content: space-between; width: 252px; align-items: flex-start;">
<ui:Label text="Score:" display-tooltip-when-elided="true" name="ScoreDisplay" style="flex-grow: 1; height: auto; width: auto; -unity-text-align: middle-right; color: rgb(167, 173, 255);" />
<ui:Label text="0&#10;" display-tooltip-when-elided="true" name="ScoreText" style="flex-grow: 0; height: auto; width: 55px; -unity-text-align: middle-right; color: rgb(167, 173, 255); flex-direction: row-reverse; justify-content: flex-end;" />
<ui:VisualElement class="background" style="width: 192px; height: 61px;">
<ui:VisualElement name="ScoreHolder" style="flex-direction: row; justify-content: space-between; width: auto; align-items: center; margin-left: 16px; margin-right: 16px; margin-top: 16px; margin-bottom: 16px;">
<ui:Label text="Score:" display-tooltip-when-elided="true" name="ScoreDisplay" style="flex-grow: 1; font-size: 30px; -unity-text-align: middle-left;" />
<ui:Label text="0" display-tooltip-when-elided="true" name="ScoreText" style="flex-grow: 1; flex-direction: row-reverse; justify-content: flex-end; align-items: auto; -unity-text-align: middle-right; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; font-size: 30px;" />
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="TextHolder" style="flex-grow: 1; height: auto; flex-direction: row; justify-content: flex-start; align-items: flex-end; padding-top: 20px; padding-right: 20px; padding-left: 20px; padding-bottom: 20px;">
<ui:Label text="Pick up orbs by pressing E. Change orb color with the converters in the middle of the level. Score points by dropping orbs in matching drop zones." display-tooltip-when-elided="true" name="HowToPlayText" style="height: auto; width: 821px; -unity-text-align: upper-left; white-space: normal; margin-top: 0; margin-left: 0; margin-right: 0; margin-bottom: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; font-size: 30px; color: rgb(167, 173, 255); padding-top: 0; flex-grow: 0; letter-spacing: 0;" />
<ui:VisualElement class="background" style="height: 127px; width: 727px;">
<ui:Label text="Pick up orbs by pressing E. Change orb color with the converters in the middle of the level. Score points by dropping orbs in matching drop zones." display-tooltip-when-elided="true" name="HowToPlayText" style="font-size: 24px; white-space: normal; -unity-text-align: middle-left; padding-left: 18px; padding-right: 18px; padding-top: 18px; padding-bottom: 18px; flex-grow: 1;" />
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:UXML>
6 changes: 3 additions & 3 deletions Basic/ClientDriven/Assets/UI Toolkit/GameUI/MainMenuUI.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<Style src="project://database/Assets/UI%20Toolkit/ClientDrivenUIStyleSheet.uss?fileID=7433441132597879392&amp;guid=bcbf16fef3f0e5a40887d466edf9c406&amp;type=3#ClientDrivenUIStyleSheet" />
<ui:VisualElement name="Canvas" style="flex-grow: 1; justify-content: center; align-items: center; height: 100%; width: 100%; background-image: url(&apos;project://database/Assets/Textures/backgroundGlow.png?fileID=2800000&amp;guid=54479458116cb0b47af67b1eab91865a&amp;type=3#backgroundGlow&apos;); -unity-background-image-tint-color: rgba(127, 136, 255, 0.42); background-color: rgba(238, 130, 227, 0.25); -unity-slice-left: 13; -unity-slice-top: 13; -unity-slice-right: 13; -unity-slice-bottom: 13;">
<ui:VisualElement name="Background" style="align-items: center; justify-content: center; width: 655px; background-image: url(&apos;project://database/Assets/Textures/blockEmissive02.png?fileID=2800000&amp;guid=b0ec8278615a9ce4a869b5587ce910f2&amp;type=3#blockEmissive02&apos;); -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; height: 364px; background-color: rgba(167, 173, 255, 0); -unity-background-image-tint-color: rgba(167, 173, 255, 0.28); border-top-left-radius: 18px; border-bottom-left-radius: 18px; border-top-right-radius: 18px; border-bottom-right-radius: 18px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; border-left-color: rgba(34, 18, 83, 0.7); border-right-color: rgba(34, 18, 83, 0.7); border-top-color: rgba(34, 18, 83, 0.7); border-bottom-color: rgba(34, 18, 83, 0.7);">
<ui:VisualElement name="Canvas" style="flex-grow: 1; justify-content: center; align-items: center; height: 100%; width: 100%; background-color: rgba(237, 143, 198, 0.21);">
<ui:VisualElement name="Background" class="background" style="align-items: center; justify-content: center; width: 655px; height: 364px;">
<ui:VisualElement name="MainMenuUIWrapper" style="height: 326px; width: 569px; align-items: center; justify-content: flex-start; visibility: visible; display: flex; opacity: 1; flex-shrink: 0;">
<ui:VisualElement name="ButtonsLayout" style="height: 266px; width: 560px; justify-content: space-around; align-items: stretch; margin-left: 0; margin-right: 0; margin-top: 31px; margin-bottom: 0; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; flex-shrink: 0;">
<ui:VisualElement name="InputFieldLabelWrapper" class="layout-buttons" style="height: 120px; justify-content: space-around; align-items: stretch; margin-bottom: 8px;">
<ui:Label text="IP Address" display-tooltip-when-elided="true" style="flex-grow: 1; height: 25px; width: 178px;" />
<ui:Label text="Port" display-tooltip-when-elided="true" style="flex-grow: 1; height: 25px; width: 50px;" />
</ui:VisualElement>
<ui:VisualElement name="InputFieldWrapper" class="layout-buttons" style="margin-bottom: 14px; justify-content: space-between;">
<ui:TextField picking-mode="Ignore" text="127.0.0.1" name="IPAddressField" focusable="true" is-delayed="true" class="input-field" style="width: 230px; height: 60px;" />
<ui:TextField picking-mode="Ignore" text="127.0.0.1" name="IPAddressField" focusable="true" is-delayed="true" password="false" class="input-field" style="width: 230px; height: 60px;" />
<ui:TextField picking-mode="Ignore" text="9998" name="PortField" focusable="true" is-delayed="true" class="input-field" style="width: 100px; height: 60px;" />
</ui:VisualElement>
<ui:VisualElement name="HostButtonWrapper" class="layout-buttons" style="margin-bottom: 6px;">
Expand Down