Skip to content

Commit

Permalink
menuwindow design fix
Browse files Browse the repository at this point in the history
  • Loading branch information
shnok committed Aug 26, 2024
1 parent ce67fb7 commit ab41dff
Show file tree
Hide file tree
Showing 9 changed files with 364 additions and 29 deletions.
38 changes: 37 additions & 1 deletion l2-unity/Assets/Rendering/URP/URP_Renderer.asset
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ MonoBehaviour:
probeVolumeBlendStatesCS: {fileID: 0}
m_RendererFeatures:
- {fileID: 8738573333141241268}
m_RendererFeatureMap: b4bd95c525a64579
- {fileID: 7171716907500193747}
m_RendererFeatureMap: b4bd95c525a64579d34736ad870e8763
m_UseNativeRenderPass: 0
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
Expand All @@ -52,6 +53,41 @@ MonoBehaviour:
m_DepthTextureFormat: 0
m_AccurateGbufferNormals: 0
m_IntermediateTextureMode: 1
--- !u!114 &7171716907500193747
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
m_Name: ScreenSpaceAmbientOcclusion
m_EditorClassIdentifier:
m_Active: 1
m_Settings:
AOMethod: 0
Downsample: 0
AfterOpaque: 0
Source: 1
NormalSamples: 1
Intensity: 3
DirectLightingStrength: 1
Radius: 0.035
Samples: 1
BlurQuality: 0
Falloff: 100
SampleCount: -1
m_BlueNoise256Textures:
- {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
- {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
- {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
- {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
- {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
- {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
- {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
--- !u!114 &8738573333141241268
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
117 changes: 117 additions & 0 deletions l2-unity/Assets/Resources/Data/UI/Assets/Menu/Menu_I1.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
117 changes: 117 additions & 0 deletions l2-unity/Assets/Resources/Data/UI/Assets/Menu/mainMenu_I3.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 11 additions & 17 deletions l2-unity/Assets/Resources/Data/UI/_Elements/Game/MenuWindow.uxml
Original file line number Diff line number Diff line change
@@ -1,40 +1,34 @@
<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" />
<ui:GroupBox name="MenuWindow" class="drag-area menu-window" style="right: -6px;">
<ui:GroupBox name="Container" class="ui-bg" style="flex-grow: 0; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 4px; padding-right: 0; padding-bottom: 0; padding-left: 0; flex-shrink: 0; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px; border-left-color: rgb(72, 65, 47); border-right-color: rgb(72, 65, 47); border-top-color: rgb(72, 65, 47); border-bottom-color: rgb(72, 65, 47); overflow: visible; width: 168px;">
<ui:GroupBox name="ButtonGroup" class="bar-container" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 4px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; flex-grow: 0; height: auto; flex-direction: row; flex-shrink: 0; flex-wrap: wrap; width: 161px; background-color: rgba(0, 0, 0, 0); overflow: visible;">
<ui:GroupBox name="MenuWindow" class="drag-area menu-window">
<ui:GroupBox name="Container" class="ui-bg menu-window-container">
<ui:VisualElement name="Bg" class="menu-window-bg" />
<ui:GroupBox name="ButtonGroup" class="bar-container menu-btn-grp">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="CharacterButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="InventoryButton" class="menu-btn" style="flex-direction: column; margin-top: 3px; margin-right: 2px; margin-bottom: 3px; margin-left: 2px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; width: 36px; height: 36px; background-image: none; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; -unity-slice-scale: 1px; -unity-background-scale-mode: scale-to-fit; background-color: rgba(188, 188, 188, 0);">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="InventoryButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ActionButton" class="menu-btn" style="flex-direction: column; margin-top: 3px; margin-right: 2px; margin-bottom: 3px; margin-left: 2px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; width: 36px; height: 36px; background-image: none; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; -unity-slice-scale: 1px; -unity-background-scale-mode: scale-to-fit; background-color: rgba(188, 188, 188, 0);">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ActionButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="SkillButton" class="menu-btn" style="flex-direction: column; margin-top: 3px; margin-right: 2px; margin-bottom: 3px; margin-left: 2px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; width: 36px; height: 36px; background-image: none; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; -unity-slice-scale: 1px; -unity-background-scale-mode: scale-to-fit; background-color: rgba(188, 188, 188, 0);">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="SkillButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="QuestButton" class="menu-btn" style="flex-direction: column; margin-top: 3px; margin-right: 2px; margin-bottom: 3px; margin-left: 2px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; width: 36px; height: 36px; background-image: none; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; -unity-slice-scale: 1px; -unity-background-scale-mode: scale-to-fit; background-color: rgba(188, 188, 188, 0);">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="QuestButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ClanButton" class="menu-btn" style="flex-direction: column; margin-top: 3px; margin-right: 2px; margin-bottom: 3px; margin-left: 2px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; width: 36px; height: 36px; background-image: none; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; -unity-slice-scale: 1px; -unity-background-scale-mode: scale-to-fit; background-color: rgba(188, 188, 188, 0);">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ClanButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="MapButton" class="menu-btn" style="flex-direction: column; margin-top: 3px; margin-right: 2px; margin-bottom: 3px; margin-left: 2px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; width: 36px; height: 36px; background-image: none; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; -unity-slice-scale: 1px; -unity-background-scale-mode: scale-to-fit; background-color: rgba(188, 188, 188, 0);">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="MapButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="SystemMenuButton" class="menu-btn" style="flex-direction: column; margin-top: 3px; margin-right: 2px; margin-bottom: 3px; margin-left: 2px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; width: 36px; height: 36px; background-image: none; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; -unity-slice-bottom: 0; -unity-slice-scale: 1px; -unity-background-scale-mode: scale-to-fit; background-color: rgba(188, 188, 188, 0);">
<ui:Button text="&#10;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="SystemMenuButton" class="menu-btn">
<ui:VisualElement name="ButtonBG" class="menu-button-bg" style="flex-grow: 0; width: 64px; height: 64px; flex-shrink: 0;" />
</ui:Button>
</ui:GroupBox>
</ui:GroupBox>
<ui:VisualElement name="Border" style="flex-grow: 1; flex-shrink: 0; position: absolute; width: 170px; flex-direction: row; left: -1px; height: 6px; top: -2px;">
<ui:VisualElement name="VisualElement" style="flex-grow: 0; flex-shrink: 0; height: 7px; width: 8px; position: relative; background-image: resource(&apos;Data/UI/Assets/Frame/Frame_DF_Ver/Frame_DF_Ver_Small_Top&apos;); left: 0; -unity-slice-top: 0; -unity-slice-bottom: 0; -unity-background-scale-mode: stretch-to-fill; -unity-slice-scale: 0;" />
<ui:VisualElement name="VisualElement" style="flex-grow: 1; flex-shrink: 0; height: 7px; width: 8px; position: relative; background-image: none; right: 0; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-bottom: 0; -unity-slice-right: 0; overflow: hidden;">
<ui:VisualElement style="flex-grow: 1; background-image: resource(&apos;Data/UI/Assets/Frame/Frame_DF_Ver/Frame_DF_Ver_Small_Top&apos;); height: 4px; flex-shrink: 0; width: 329px; -unity-slice-left: -5; -unity-slice-right: 7; -unity-background-scale-mode: scale-and-crop; -unity-slice-scale: 159.6px; -unity-slice-bottom: 0;" />
</ui:VisualElement>
<ui:VisualElement style="flex-grow: 0; flex-shrink: 0; height: 7px; width: 8px; position: relative; background-image: resource(&apos;Data/UI/Assets/Frame/Frame_DF_Ver/Frame_DF_Ver_Small_Top&apos;); right: 0; scale: -1 1;" />
</ui:VisualElement>
</ui:GroupBox>
</ui:UXML>
Loading

0 comments on commit ab41dff

Please sign in to comment.