Skip to content

Commit

Permalink
chat fix, nameplate tweak, html tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
shnok committed Dec 2, 2024
1 parent 9dec795 commit 995ca92
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ui:GroupBox name="ChatBar" focusable="true" class="chatbar-container">
<ui:GroupBox name="InnerBar" focusable="true" class="chatbar-container-wrapper">
<ui:VisualElement name="InputIcon" tabindex="0" class="chatbar-input-icon" />
<ui:TextField name="ChatInputField" password="false" max-length="100" class="chat-input-field" style="display: none;" />
<ui:TextField name="ChatInputField" password="false" max-length="100" class="chat-input-field" />
</ui:GroupBox>
</ui:GroupBox>
<ui:GroupBox name="ChatOptions" class="chat-options-box" style="justify-content: center;">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
color: rgb(255, 255, 255);
-unity-font-style: bold;
font-size: 12px;
-unity-text-outline-width: 1px;
-unity-text-outline-width: 0.7px;
-unity-text-outline-color: rgb(0, 0, 0);
text-shadow: 0.5px 0 1px rgb(0, 0, 0);
text-shadow: 0.3px 0.3px 1px rgb(0, 0, 0);
}

.nameplate .target-title {
Expand All @@ -58,10 +58,10 @@
-unity-font-definition: resource('Data/UI/Assets/Font/tahoma');
color: rgb(156, 218, 144);
-unity-font-style: bold;
-unity-text-outline-width: 1px;
-unity-text-outline-color: rgb(0, 0, 0);
font-size: 12px;
text-shadow: 0.5px 0 1px rgb(0, 0, 0);
-unity-text-outline-width: 0.7px;
-unity-text-outline-color: rgb(0, 0, 0);
text-shadow: 0.3px 0.3px 1px rgb(0, 0, 0);
}

.nameplate-left {
Expand Down
4 changes: 2 additions & 2 deletions l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -357,11 +357,11 @@ public void RefreshWeight()

for (int i = 1; i <= 5; i++)
{
_weightBarContainer.parent.RemoveFromClassList("weight-" + i);
_weightBarContainer.RemoveFromClassList("weight-" + i);
}

int weightLevel = (int)Mathf.Floor(weightRatio / 0.25f) + 1;
_weightBarContainer.parent.AddToClassList("weight-" + weightLevel);
_weightBarContainer.AddToClassList("weight-" + weightLevel);

float barWidth = bgWidth * weightRatio;
_weightBar.style.width = barWidth;
Expand Down
8 changes: 4 additions & 4 deletions l2-unity/Assets/Scripts/UI/Game/NpcHtmlWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ protected override IEnumerator BuildWindow(VisualElement root)
// <a action=""bypass -h npc_%objectId%_Quest"">Quest</a><br>
// </body></html>
// ", 0);
RefreshContent(0,
@"<html><title>Server menu</title><body><center><table width=260><tr><td><button value=""Main"" action=""bypass -h admin_admin"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td><td><button value=""Game"" action=""bypass -h admin_admin 2"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td><td><button value=""Effects"" action=""bypass -h admin_admin 3"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td><td><button value=""Server"" action=""bypass -h admin_admin 4"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td></tr></table><img src=""l2ui.SquareWhite"" width=275 height=1><br><table width=240><tr><td>QuickBox</td><td><edit var=""menu_command"" width=120 height=15></td><td><button value=""Help"" action=""bypass -h admin_help"" width=45 height=15 back=""sek.cbui94"" fore=""sek.cbui92""></td></tr></table><br>Reload<table width=240><tr><td><combobox width=160 height=21 var=""cb"" list=admin;announcement;buylist;config;crest;cw;door;htm;item;multisell;npc;npcwalker;script;skill;teleport;zone;></td><td><button value=""Reload"" action=""bypass -h admin_reload $cb"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td></tr></table><br>Zones / Territories<table width=240><tr><td><button value=""Zone Check"" action=""bypass -h admin_zone"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Maker Check"" action=""bypass -h admin_maker"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td width=75></td></tr><tr><td><button value=""Territory Goto"" action=""bypass -h admin_terr goto $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Maker Info"" action=""bypass -h admin_maker $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td></td></tr></table><br>GeoEngine<table width=240><tr><td><button value=""Position Info"" action=""bypass -h admin_geo pos"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Beeline Test"" action=""bypass -h admin_geo move"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Path Find"" action=""bypass -h admin_path find"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td></tr><tr><td><button value=""Path Info"" action=""bypass -h admin_path info"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""LoS Test"" action=""bypass -h admin_geo see"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Report Geo Bug"" action=""bypass -h admin_geo bug $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td></tr></table><br>Maintenance / Development<table width=240><tr><td><button value=""Maintenance"" action=""bypass -h admin_server"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Announce"" action=""bypass -h admin_link announce.htm"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""SysMessage"" action=""bypass -h admin_msg $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td></tr></table>
</center></body></html>
", 0);
// RefreshContent(0,
// @"<html><title>Server menu</title><body><center><table width=260><tr><td><button value=""Main"" action=""bypass -h admin_admin"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td><td><button value=""Game"" action=""bypass -h admin_admin 2"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td><td><button value=""Effects"" action=""bypass -h admin_admin 3"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td><td><button value=""Server"" action=""bypass -h admin_admin 4"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td></tr></table><img src=""l2ui.SquareWhite"" width=275 height=1><br><table width=240><tr><td>QuickBox</td><td><edit var=""menu_command"" width=120 height=15></td><td><button value=""Help"" action=""bypass -h admin_help"" width=45 height=15 back=""sek.cbui94"" fore=""sek.cbui92""></td></tr></table><br>Reload<table width=240><tr><td><combobox width=160 height=21 var=""cb"" list=admin;announcement;buylist;config;crest;cw;door;htm;item;multisell;npc;npcwalker;script;skill;teleport;zone;></td><td><button value=""Reload"" action=""bypass -h admin_reload $cb"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td></tr></table><br>Zones / Territories<table width=240><tr><td><button value=""Zone Check"" action=""bypass -h admin_zone"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Maker Check"" action=""bypass -h admin_maker"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td width=75></td></tr><tr><td><button value=""Territory Goto"" action=""bypass -h admin_terr goto $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Maker Info"" action=""bypass -h admin_maker $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td></td></tr></table><br>GeoEngine<table width=240><tr><td><button value=""Position Info"" action=""bypass -h admin_geo pos"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Beeline Test"" action=""bypass -h admin_geo move"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Path Find"" action=""bypass -h admin_path find"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td></tr><tr><td><button value=""Path Info"" action=""bypass -h admin_path info"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""LoS Test"" action=""bypass -h admin_geo see"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Report Geo Bug"" action=""bypass -h admin_geo bug $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td></tr></table><br>Maintenance / Development<table width=240><tr><td><button value=""Maintenance"" action=""bypass -h admin_server"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""Announce"" action=""bypass -h admin_link announce.htm"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td><td><button value=""SysMessage"" action=""bypass -h admin_msg $menu_command"" width=75 height=21 back=""L2UI_ch3.Btn1_normalOn"" fore=""L2UI_ch3.Btn1_normal""></td></tr></table>
// </center></body></html>
// ", 0);
// RefreshContent(0,
// @"<table width=280 height=45><tr><td width=70 align=center>Search</td><td width=140><edit var=""search"" width=130 height=15></td><td width=70><button value=""Find"" action=""bypass admin_help 1 $search"" width=65 height=19 back=""L2UI_ch3.smallbutton2_over"" fore=""L2UI_ch3.smallbutton2""></td></tr><tr><td></td><td align=center>Found 93 results</td><td></td></tr></table><table width=280 height=41 bgcolor=000000><tr><td width=280 height=34><color=#FFC900>//admin</color> <color=#33cccc>[1-4]</color><br1>Go through the different admin panels.</td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1><table width=280 height=41><tr><td width=280 height=34><color=#FFC900>//buy</color> <color=#33cccc>[id]</color><br1>Open the GM Shop panel, or the associated BuyList.</td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1><table width=280 height=41 bgcolor=000000><tr><td width=280 height=34><color=#FFC900>//camera</color><br1>Toggle the CameraMode.</td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1><table width=280 height=41><tr><td width=280 height=34><color=#FFC900>//gmlist</color><br1>Toggle you from /gmlist results.</td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1><table width=280 height=41 bgcolor=000000><tr><td width=280 height=34><color=#FFC900>//gmoff</color> <color=#33cccc>[duration]</color><br1>Toggle off your GM status, 1min by default.</td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1><table width=280 height=41><tr><td width=280 height=34><color=#FFC900>//help</color> <color=#33cccc>[page]</color><br1>Open this panel.</td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1><table width=280 height=41 bgcolor=000000><tr><td width=280 height=34><color=#FFC900>//link</color> <color=#33cccc>file name</color><br1>Open the proper admin htm.</td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1><table width=280 bgcolor=000000><tr><td FIXWIDTH=22 align=center><img height=2><button action=""bypass admin_help 1 "" back=L2UI_CH3.prev1_down fore=L2UI_CH3.prev1 width=16 height=16></td><td FIXWIDTH=26 align=center></td><td FIXWIDTH=26 align=center></td><td FIXWIDTH=26 align=center></td><td FIXWIDTH=26 align=center></td><td FIXWIDTH=26 align=center><font color=LEVEL>01</font></td><td FIXWIDTH=26 align=center><a action=""bypass admin_help 2 "">02</a></td><td FIXWIDTH=26 align=center><a action=""bypass admin_help 3 "">03</a></td><td FIXWIDTH=26 align=center><a action=""bypass admin_help 4 "">04</a></td><td FIXWIDTH=26 align=center><a action=""bypass admin_help 5 "">05</a></td><td FIXWIDTH=22 align=center><img height=2><button action=""bypass admin_help 14 "" back=L2UI_CH3.next1_down fore=L2UI_CH3.next1 width=16 height=16></td></tr></table><img src=""L2UI.SquareGray"" width=280 height=1>", 0);
// RefreshContent(0,
Expand Down

0 comments on commit 995ca92

Please sign in to comment.