-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
char select ui, switch between cams at login, loading screen
- Loading branch information
Showing
23 changed files
with
833 additions
and
265 deletions.
There are no files selected for viewing
223 changes: 206 additions & 17 deletions
223
l2-unity/Assets/Resources/Data/UI/Font/tahoma Light.asset
Large diffs are not rendered by default.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
l2-unity/Assets/Resources/Data/UI/_Elements/Lineage2_Login.uxml
This file was deleted.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
30 changes: 30 additions & 0 deletions
30
l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow.uxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False"> | ||
| <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&guid=72e99cc94b130bf4ba100dceaa830b13&type=3#L2StyleSheet" /> | ||
| <ui:VisualElement name="CharSelectWindow" style="flex-grow: 1; width: 100%; height: 100%; justify-content: flex-end; flex-direction: row;"> | ||
| <ui:VisualElement style="flex-grow: 1; width: 33.3%; max-width: 33.3%; min-width: 33.3%;" /> | ||
| <ui:VisualElement name="VisualElement" style="flex-grow: 1; width: 33.3%; min-width: 33.3%; max-width: 33.3%; flex-direction: column-reverse;"> | ||
| <ui:VisualElement name="StartButtonWindow" tabindex="-1" style="flex-grow: 0; width: auto; height: auto; flex-shrink: 0; background-image: resource('Data/UI/Windows/Windows_DF_Drawer_Bg_Darker'); -unity-slice-bottom: 10; -unity-slice-left: 27; -unity-slice-top: 10; -unity-slice-right: 20; margin-right: auto; margin-left: auto; padding-top: 10px; padding-right: 10px; padding-bottom: 12px; padding-left: 10px; margin-bottom: 40px; flex-wrap: nowrap;"> | ||
| <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="StartButton" tabindex="-1" focusable="false" class="l2-button" style="height: 25px;"> | ||
| <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" style="height: 37px;" /> | ||
| <ui:Label tabindex="-1" text="Start" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0; padding-top: 5px; padding-bottom: 0;" /> | ||
| </ui:Button> | ||
| </ui:VisualElement> | ||
| </ui:VisualElement> | ||
| <ui:VisualElement name="VisualElement" style="flex-grow: 1; flex-direction: row-reverse; align-self: auto; align-items: flex-end; justify-content: space-between; flex-wrap: nowrap; width: 33.3%; max-width: 33.3%; min-width: 33.3%;"> | ||
| <ui:VisualElement name="MenuWindow" tabindex="-1" style="flex-grow: 0; width: 130px; height: auto; flex-shrink: 0; background-image: resource('Data/UI/Windows/Windows_DF_Drawer_Bg_Darker'); -unity-slice-bottom: 10; -unity-slice-left: 27; -unity-slice-top: 10; -unity-slice-right: 20; margin-right: 20px; margin-left: 0; padding-top: 20px; padding-right: 10px; padding-bottom: 20px; padding-left: 10px; margin-top: 0; margin-bottom: 30px; align-self: flex-end;"> | ||
| <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="CreateButton" tabindex="-1" focusable="false" class="l2-button" style="height: 20px; width: auto;"> | ||
| <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" /> | ||
| <ui:Label tabindex="-1" text="Create" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" /> | ||
| </ui:Button> | ||
| <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="DeleteButton" tabindex="-1" focusable="false" class="l2-button" style="height: 20px; width: auto; margin-top: 6px;"> | ||
| <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" /> | ||
| <ui:Label tabindex="-1" text="Delete" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" /> | ||
| </ui:Button> | ||
| <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ReloginButton" tabindex="-1" focusable="false" class="l2-button" style="height: 20px; width: auto; margin-top: 25px;"> | ||
| <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" /> | ||
| <ui:Label tabindex="-1" text="Re-Login" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" /> | ||
| </ui:Button> | ||
| </ui:VisualElement> | ||
| </ui:VisualElement> | ||
| </ui:VisualElement> | ||
| </ui:UXML> |
10 changes: 10 additions & 0 deletions
10
l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow.uxml.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
l2-unity/Assets/Resources/Data/UI/_Elements/Login/Lineage2_Login.uxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <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/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&guid=72e99cc94b130bf4ba100dceaa830b13&type=3#L2StyleSheet" /> | ||
| <ui:VisualElement name="UIContainer" class="login-window" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);"> | ||
| <ui:VisualElement name="BG" style="flex-grow: 1; position: absolute; width: 100%; height: 100%; justify-content: flex-start; align-items: center; background-color: rgba(0, 0, 0, 0); top: 1px; left: 0;"> | ||
| <ui:VisualElement name="L2Logo" style="flex-grow: 0; background-image: resource('Data/UI/Login/l2logo-white'); width: 160px; height: 150px; flex-shrink: 0; justify-content: flex-start; margin-top: 5%;" /> | ||
| </ui:VisualElement> | ||
| </ui:VisualElement> | ||
| <ui:VisualElement name="Loading" style="flex-grow: 1; position: absolute; background-color: rgb(0, 0, 0); width: 100%; height: 100%; align-self: center; justify-content: flex-end; visibility: visible; display: none;"> | ||
| <ui:Label tabindex="-1" text="Loading..." parse-escape-sequences="true" display-tooltip-when-elided="true" style="justify-content: space-around; align-items: flex-end; -unity-text-align: upper-right; -unity-font: resource('Data/UI/Font/tahoma'); -unity-font-definition: initial; color: rgb(255, 255, 255); margin-bottom: 17px; margin-left: 3px; margin-right: 19px; font-size: 25px;" /> | ||
| </ui:VisualElement> | ||
| </ui:UXML> |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.