post uxml update UI tweaks/fixes

shnok · Dec 2, 2024 · abc8c53 · abc8c53
1 parent 4363af2
commit abc8c53
Show file tree

Hide file tree

Showing 27 changed files with 400 additions and 275 deletions.
diff --git a/...ity/Assets/Resources/Data/UI/Assets/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta b/...ity/Assets/Resources/Data/UI/Assets/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/Assets/Windows/Windows_DF_Large_Bg_Darker.png.meta b/l2-unity/Assets/Resources/Data/UI/Assets/Windows/Windows_DF_Large_Bg_Darker.png.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss
@@ -1,6 +1,6 @@
 .l2-bar {
-    height: 14px;
-    max-height: 14px;
+    height: 12px;
+    max-height: 12px;
     flex-direction: row;
     flex-grow: 1;
 }
@@ -59,6 +59,12 @@
     width: 100%;
 }
 
+.l2-bar-container-wrap {
+    flex-grow: 1;
+    min-height: 12px;
+    max-height: 12px;
+}
+
 .l2-bar .l2-bar-bg .l2-bar-left {
     background-image: resource('Data/UI/Assets/Status/Gauge/Gauge_DF_Large_HP/Gauge_DF_Large_HP_bg_Left');
 }
@@ -314,8 +320,26 @@
     -unity-text-outline-color: rgba(0, 0, 0, 0.6);
 }
 
-.l2-bar-container {
-    flex-grow: 1;
-    height: 14px;
-    max-height: 14px;
+.l2-bar.status .l2-bar-status-label {
+    display: flex;
 }
+
+.l2-bar-status-label {
+    position: absolute;
+    display: none;
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 8px;
+    padding-top: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: 0;
+    -unity-font-definition: resource('Data/UI/Assets/Font/asiahm-medium');
+    text-shadow: 0.9px 0.9px 3px rgb(0, 0, 0);
+    -unity-text-outline-width: 0.7px;
+    -unity-text-outline-color: rgb(0, 0, 0);
+    -unity-font-style: bold;
+    letter-spacing: -18px;
+    font-size: 12px;
+}
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uxml
@@ -2,8 +2,8 @@
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss?fileID=7433441132597879392&amp;guid=a56090906dc32294994ed8860c7b159e&amp;type=3#L2Bar" />
     <ui:VisualElement name="L2Bar" template="HpBar" class="bar-container l2-bar">
-        <ui:Label text="Label" name="Label" class="l2-bar-name" />
-        <ui:VisualElement name="Gauge" class="l2-bar-container">
+        <ui:Label text="Label" name="Label" class="l2-bar-name l2-color-3" />
+        <ui:VisualElement name="Gauge" class="l2-bar-container-wrap">
             <ui:GroupBox name="BarBg" class="l2-bar-container l2-bar-bg">
                 <ui:VisualElement name="BGLeft" class="l2-bar-side-ele l2-bar-left" />
                 <ui:VisualElement name="BGCenter" class="l2-bar-center-ele l2-bar-center" />
@@ -17,4 +17,5 @@
             <ui:Label text="1234/1234" name="Text" double-click-selects-word="true" class="bar-label l2-bar-label" />
         </ui:VisualElement>
     </ui:VisualElement>
+    <ui:Label text="HP" name="StatusLabel" class="l2-color-4 l2-bar-status-label" />
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss
@@ -7,7 +7,7 @@
     padding-top: 0;
     margin-bottom: 2px;
     margin-top: 2px;
-    overflow: hidden;
+    overflow: visible;
     margin: 0;
     padding: 0;
     flex-grow: 0;
@@ -27,8 +27,11 @@
 .l2-input-field #unity-text-input {
     background-color: rgba(0, 0, 0, 0);
     background-image: resource('Data/UI/Assets/Login/CharacterPassword_DF_EditBox_Scaled');
+    cursor: resource('Data/UI/Assets/Cursor/Default');
     border-width: 0;
     margin: 0;
+    padding-top: 0;
+    padding-bottom: 0;
     padding-left: 2px;
     padding-right: 2px;
     -unity-slice-left: 10;

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml
@@ -1,5 +1,5 @@
 <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&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss?fileID=7433441132597879392&amp;guid=2fa480f78160edf4a8c4381744578912&amp;type=3#L2Input" />
-    <ui:TextField max-length="64" name="L2Input" tabindex="1" class="l2-input-field" />
+    <ui:TextField max-length="64" name="L2Input" tabindex="1" class="l2-input-field l2-color-4" />
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss
@@ -62,6 +62,10 @@
     border-width: 0;
 }
 
+.l2-scroll-view .unity-base-slider__tracker:hover:enabled {
+    background-color: transparent;
+}
+
 .l2-scroll-view .unity-scroller__high-button {
     background-color: transparent;
     -unity-background-image-tint-color: rgb(255, 255, 255);

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Slot/L2Slot.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Slot/L2Slot.uss
@@ -88,7 +88,7 @@
     padding: 1px;
 }
 
-.inventory-slot.disabled .slot-bg {
+.l2-slot.disabled .slot-bg {
     border-width: 0;
     background-image: resource('Data/UI/Assets/Inventory/ItemWindow_DF_SlotBox_Disable');
 }

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uss
@@ -20,10 +20,7 @@
     padding-right: 0;
     padding-bottom: 0;
     padding-left: 8px;
-    -unity-text-outline-width: 0.1px;
-    color: rgb(240, 240, 240);
     font-size: 11px;
-    letter-spacing: 3px;
 }
 
 .action-window-category-slots {

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uxml
@@ -5,19 +5,19 @@
     <ui:Instance template="WindowTemplate" name="WindowTemplate" class="action-window" style="height: 545px; width: 315px; position: absolute;">
         <ui:VisualElement name="Content" class="action-window-content">
             <ui:VisualElement name="Category" class="action-window-category">
-                <ui:Label tabindex="-1" text="Basic" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Basic" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="BasicSlots" class="action-window-category-slots" />
             </ui:VisualElement>
             <ui:VisualElement name="Category" class="action-window-category" style="margin-top: 4px;">
-                <ui:Label tabindex="-1" text="Party" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Party" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="PartySlots" class="action-window-category-slots" />
             </ui:VisualElement>
             <ui:VisualElement name="Category" class="action-window-category" style="margin-top: 4px;">
-                <ui:Label tabindex="-1" text="Token Action" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Token Action" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="TokenSlots" class="action-window-category-slots" />
             </ui:VisualElement>
             <ui:VisualElement name="Category" class="action-window-category" style="margin-top: 4px;">
-                <ui:Label tabindex="-1" text="Social" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Social" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="SocialSlots" class="action-window-category-slots" />
             </ui:VisualElement>
         </ui:VisualElement>

diff --git a/...nity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow/CharacterInfoWindow.uxml b/...nity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow/CharacterInfoWindow.uxml
@@ -61,7 +61,7 @@
                             <ui:VisualElement name="BagIcon" class="l2-bar-name">
                                 <ui:VisualElement name="BagIconBg" class="char-icon-bag" />
                             </ui:VisualElement>
-                            <ui:Instance template="L2Bar" name="WeightBar" class="l2-bar l2-color-3 weight-4">
+                            <ui:Instance template="L2Bar" name="WeightBar" class="l2-bar l2-color-3">
                                 <AttributeOverrides element-name="Label" text="HP" />
                                 <AttributeOverrides element-name="Text" text="100.00%" />
                             </ui:Instance>

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ChatWindow/ChatWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ChatWindow/ChatWindow.uss
@@ -435,6 +435,8 @@
     flex-grow: 1;
     flex-shrink: 0;
     flex-direction: column-reverse;
+    padding-left: 4px;
+    padding-top: 4px;
 }
 
 .chat-bg-container {

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ExitWindow/ExitWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ExitWindow/ExitWindow.uss
@@ -1,6 +1,6 @@
 .exit-window {
     width: 240px;
-    height: 336px;
+    height: 340px;
     position: absolute;
 }
 
@@ -181,7 +181,7 @@
 }
 
 .exit-window-buttons {
-    margin-top: 6px;
+    margin-top: 4px;
     margin-right: 0;
     margin-bottom: 0;
     margin-left: 0;
@@ -194,7 +194,7 @@
 }
 
 .exit-window #CancelButton {
-    margin-top: 6px;
+    margin-top: 0px;
 }
 
 .exit-window #RestartButton #Icon {

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/MenuWindow/MenuWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/MenuWindow/MenuWindow.uss
@@ -71,15 +71,15 @@
     border-top-color: rgb(72, 65, 47);
     border-bottom-color: rgb(72, 65, 47);
     overflow: hidden;
-    width: 166px;
+    width: 167px;
     background-color: rgba(19, 19, 19, 0);
     background-image: none;
     -unity-slice-left: 11;
     -unity-slice-top: 11;
     -unity-slice-right: 11;
     -unity-slice-bottom: 11;
     -unity-slice-scale: 0.3px;
-    height: 86px;
+    height: 87px;
 }
 
 .menu-window-bg {
@@ -228,7 +228,7 @@
     margin-top: 5px;
     margin-right: 0;
     margin-bottom: 0;
-    margin-left: 5px;
+    margin-left: 6px;
     padding-top: 0;
     padding-right: 0;
     padding-bottom: 0;

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/StatusWindow/StatusWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/StatusWindow/StatusWindow.uxml
@@ -15,16 +15,20 @@
                 <ui:Label text="Shnok" name="PlayerNameText" class="l2-color-4" style="align-items: auto; margin-top: 2px; margin-right: 0; margin-bottom: 0; margin-left: 5px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; -unity-text-align: upper-center; -unity-font-definition: url(&quot;project://database/Assets/Resources/Data/UI/Assets/Font/tahoma.ttf?fileID=12800000&amp;guid=96fb7a735e76e0742bf125e2d4734bf3&amp;type=3#tahoma&quot;); -unity-text-outline-width: 0.3px; text-shadow: 0.5px 0.5px 0 rgb(0, 0, 0); letter-spacing: 3px; font-size: 11px; width: auto; scale: 1 1;" />
             </ui:VisualElement>
             <ui:GroupBox name="BarGroup" class="status-window-row-2">
-                <ui:Instance template="L2Bar" name="CPBar" class="l2-bar cp" />
-                <ui:Instance template="L2Bar" name="HPBar" class="l2-bar" />
-                <ui:Instance template="L2Bar" name="MPBar" class="l2-bar mp" />
+                <ui:Instance template="L2Bar" name="CPBar" class="l2-bar cp status">
+                    <AttributeOverrides element-name="StatusLabel" text="CP" />
+                </ui:Instance>
+                <ui:Instance template="L2Bar" name="HPBar" class="l2-bar status" />
+                <ui:Instance template="L2Bar" name="MPBar" class="l2-bar mp status">
+                    <AttributeOverrides element-name="StatusLabel" text="MP" />
+                </ui:Instance>
                 <ui:Instance template="L2Bar" name="EXPBar" class="l2-bar exp">
                     <AttributeOverrides element-name="Text" text="00.00%" />
                 </ui:Instance>
             </ui:GroupBox>
         </ui:GroupBox>
         <ui:VisualElement name="SizeControl" class="status-window-size-control">
-            <ui:VisualElement name="SizeControl" class="status-window-resize-handle" />
+            <ui:VisualElement name="SizeControl" class="status-window-resize-handle resize-hor" />
         </ui:VisualElement>
     </ui:GroupBox>
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uss
@@ -106,10 +106,9 @@
 
 .target-window-target-name {
     flex-grow: 0;
-    margin-top: 2px;
-    font-size: 11px;
+    font-size: 10px;
     letter-spacing: 3px;
-    height: 20px;
+    height: 12px;
     margin: 0;
     padding: 0;
     -unity-text-align: middle-center;

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uxml
@@ -14,7 +14,7 @@
             </ui:VisualElement>
         </ui:GroupBox>
         <ui:VisualElement name="SizeControl" class="target-window-size-control">
-            <ui:VisualElement name="SizeControl" class="target-window-resize-handle" />
+            <ui:VisualElement name="SizeControl" class="target-window-resize-handle resize-hor" />
         </ui:VisualElement>
         <ui:Button text="&#10;" name="CloseBtn" class="close-btn target-window-close-btn" />
     </ui:GroupBox>

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
@@ -71,10 +71,6 @@
     rotate: 180deg;
 }
 
-.character-info-window .unity-label {
-    -unity-text-outline-width: 0.1px;
-}
-
 .close-btn {
     background-color: transparent;
     -unity-background-image-tint-color: rgb(255, 255, 255);
@@ -397,6 +393,8 @@
     padding-left: 0;
     flex-shrink: 1;
     height: 38px;
+    min-height: 38px;
+    max-height: 38px;
     flex-direction: row;
 }
 
@@ -415,13 +413,19 @@
     flex-grow: 0;
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Left');
     width: 32px;
+    min-width: 32px;
+    max-width: 32px;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     flex-shrink: 0;
 }
 
 .frame_df_hor_large_tile {
     flex-grow: 1;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Tile');
 }
 
@@ -430,14 +434,20 @@
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Center');
     width: 128px;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     flex-shrink: 1;
 }
 
 .frame_df_hor_large_right {
     flex-grow: 0;
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Right');
     width: 32px;
+    min-width: 32px;
+    max-width: 32px;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     flex-shrink: 0;
 }
 
@@ -539,4 +549,6 @@
 
 .l2-color-4 {
     color: rgb(220, 220, 220);
-}
+}
+
+
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow/CharSelectWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow/CharSelectWindow.uss
@@ -142,9 +142,9 @@
     -unity-slice-right: 20;
     margin-right: auto;
     margin-left: auto;
-    padding-top: 10px;
+    padding-top: 6px;
     padding-right: 5px;
-    padding-bottom: 12px;
+    padding-bottom: 8px;
     padding-left: 5px;
     margin-bottom: 40px;
     flex-wrap: nowrap;

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss
@@ -33,7 +33,7 @@
 }
 
 .license-window-button-container {
-    height: 30px;
+    height: 38px;
     margin-top: 4px;
     flex-shrink: 0;
     align-items: center;
@@ -45,6 +45,11 @@
     width: 80px;
 }
 
+.license-window .l2-flex-button .l2-flex-button-label{
+    padding-top: 6px;
+    padding-bottom: 6px;
+}
+
 .license-window .unity-base-slider__tracker:hover:enabled {
     background-color: transparent;
 }