real merge

This commit is contained in:
2022-07-23 13:13:52 -04:00
parent 7a3bbc10c8
commit 2af94f26ca
13 changed files with 240 additions and 345 deletions

View File

@@ -1,3 +1,4 @@
<!-- xml reconstructed by ValveResourceFormat: https://vrf.steamdb.info/ -->
<root>
<styles>
<include src="s2r://panorama/styles/dotastyles.vcss_c" />
@@ -6,13 +7,12 @@
<scripts>
<include src="s2r://panorama/scripts/custom_game/shop.vjs_c" />
</scripts>
<Panel hittest="false" class="ShopRoot" >
<Panel id="ShopContent" class="Hidden" onactivate="" >
<Panel hittest="false" class="ShopRoot">
<Panel id="ShopContent" class="Hidden" onactivate="">
<Panel id="AbilityList" />
<Button id="CloseShopButton" onactivate="ToggleStyle(ShopContent, Hidden)" >
</Button>
<Button id="CloseShopButton" onactivate="ToggleStyle(ShopContent, Hidden)" />
</Panel>
<Panel id="BottomBar" >
<Panel id="BottomBar">
<Panel id="BottomBarBG" />
<Button id="ShopButton" onactivate="ToggleStyle(ShopContent, Hidden)">
<Label id="GoldText" text="" />