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,18 +1,18 @@
<!-- xml reconstructed by ValveResourceFormat: https://vrf.steamdb.info/ -->
<root>
<styles>
<include src="s2r://panorama/styles/dotastyles.vcss_c" />
<include src="s2r://panorama/styles/custom_game/team_select.vcss_c" />
</styles>
<scripts>
<scripts>
<include src="s2r://panorama/scripts/custom_game/team_select.vjs_c" />
<include src="s2r://panorama/scripts/custom_game/team_select_card.vjs_c" />
</scripts>
<snippets>
<!-- 已选卡片 -->
<snippets>
<snippet name="SelectedCard">
<Panel class="Card">
<Panel id="Content" >
<Panel id="ItemInfo" >
<Panel id="Content">
<Panel id="ItemInfo">
<DOTAItemImage id="ItemImage" hittest="false" itemname="" />
<Label id="ItemName" text="{s:itemname}" />
</Panel>
@@ -24,14 +24,12 @@
<DOTAScenePanel id="Effect" hittest="false" map="td/selected_card" camera="default" />
</Panel>
</snippet>
<!-- 卡片 -->
<snippet name="CardPoolCard">
<Panel class="Card" >
<Image id="CardBackGround" src="s2r://panorama/images/custom_game/cards/item_n_png.vtex"/>
<Panel class="Card">
<Image id="CardBackGround" src="s2r://panorama/images/custom_game/cards/item_n_png.vtex" />
<Image id="CardImage" src="s2r://panorama/images/custom_game/cards/remilia_png.vtex" />
<Panel class="CardBar"/>
<Panel class="CardType"/>
<Panel class="CardBar" />
<Panel class="CardType" />
<Panel class="CardRemainingCount">
<Label text="x{s:remaining_count}" />
</Panel>
@@ -40,21 +38,17 @@
</Panel>
</Panel>
</snippet>
<!-- 卡片技能 -->
<snippet name="CardAbility">
<Panel class="Ability">
<Panel class="AbilityHeader">
<DOTAAbilityImage id="AbilityImage" abilityname="" />
<Label id="AbilityName" html="true" text="" />
</Panel>
<Panel class="AbilityBody" >
<Panel class="AbilityBody">
<Label id="AbilityDescription" html="true" text="" />
</Panel>
</Panel>
</snippet>
<!-- 难度槽 -->
<snippet name="DifficultyContainer">
<Panel class="DifficultyContainer">
<Panel class="OptionButtonBackground">
@@ -67,13 +61,10 @@
<Label class="T1" text="{d:difficulty}" />
<Label class="T2" text="{s:difficultyText}" />
</Panel>
<Panel id="PlayerList" >
</Panel>
<Panel id="PlayerList" />
</Panel>
</Panel>
</snippet>
<!-- 卡组 -->
<snippet name="CardGroupItem">
<Panel class="CardGroupItem">
<Button>
@@ -83,66 +74,50 @@
</snippet>
</snippets>
<Panel hittest="false" class="TeamSelectRoot">
<!-- 界面标题 -->
<Panel id="SetupTitlePanel" >
<Panel id="SetupTitlePanel">
<Panel id="SetupTitleBG">
<Panel class="Left" />
<Panel class="Right" />
</Panel>
<Label id="SetupTitle" text="#addon_game_name" />
</Panel>
<!-- 副标题 -->
<Panel id="SetupTitleHR" />
<Label id="SetupDescription" html="true" text="#addon_game_name" />
<!-- 显示时间 -->
<Panel id="ReadyTimePanel" >
<Panel id="ReadyTimePanel">
<Label id="ReadyTime" text="" />
</Panel>
<!-- 操作提示 -->
<Panel id="CardsPanelTips" >
<Panel class="CardPoolNote" >
<Panel class="Tip" onmouseover="DOTAShowTextTooltip(td_card_pool_note_desc)" onmouseout="DOTAHideTextTooltip()" >
</Panel>
<Panel id="CardsPanelTips">
<Panel class="CardPoolNote">
<Panel class="Tip" onmouseover="DOTAShowTextTooltip(#td_card_pool_note_desc)" onmouseout="DOTAHideTextTooltip()">
<Image src="s2r://panorama/images/custom_game/note_png.vtex" />
<Label text="#td_card_pool_note" />
</Panel>
</Panel>
</Panel>
<!-- 卡片 -->
<Panel id="CardsPanel" hittest="false" >
<!-- 左边 - 已选卡组 -->
<Panel id="SelectedCard" >
<Panel id="CardsPanel" hittest="false">
<Panel id="SelectedCard">
<Label id="CardGroupText" html="true" class="Hide" text="" />
<!-- 显示每种卡片类型数量 -->
<Panel id="CardTypeCount">
<Panel class="Center LeftRightFlow">
<!-- 显示SSR数量 -->
<Panel class="CardType SSR" >
<Panel class="CardType SSR">
<Panel class="Block">
<Label class="Count" text="{d:ssr_count}" />
<Label class="MaxCount" text="/{d:ssr_maxcount}" />
</Panel>
</Panel>
<!-- 显示SR数量 -->
<Panel class="CardType SR" >
<Panel class="CardType SR">
<Panel class="Block">
<Label class="Count" text="{d:sr_count}" />
<Label class="MaxCount" text="/{d:sr_maxcount}" />
</Panel>
</Panel>
<!-- 显示R数量 -->
<Panel class="CardType R" >
<Panel class="CardType R">
<Panel class="Block">
<Label class="Count" text="{d:r_count}" />
<Label class="MaxCount" text="/{d:r_maxcount}" />
</Panel>
</Panel>
<!-- 显示N数量 -->
<Panel class="CardType N" >
<Panel class="CardType N">
<Panel class="Block">
<Label class="Count" text="{d:n_count}" />
<Label class="MaxCount" text="/{d:n_maxcount}+" />
@@ -150,38 +125,29 @@
</Panel>
</Panel>
</Panel>
<!-- 显示已选卡片 -->
<Panel id="SelectedCardList" >
</Panel>
<!-- 卡组清单 -->
<Panel id="CardGroupOptions" class="Hide" />
<!-- 按钮 -->
<Panel id="SelectedCardList" />
<Panel id="CardGroupOptions" class="Hide" />
<Panel id="CardGroupOptionsButton" class="LeftRightFlow Hide">
<Button id="BackToGroupOptions" onactivate="ShowCardGroupList(true)" >
<Button id="BackToGroupOptions" onactivate="ShowCardGroupList(true)">
<Label text="#page_back" />
</Button>
<Button id="SaveGroupOptions" onactivate="SaveCardGroup()" >
<Button id="SaveGroupOptions" onactivate="SaveCardGroup()">
<Label text="#DOTA_Filter_SaveRule" />
</Button>
</Button>
</Panel>
<Panel id="CardGroupOptionsButton2" class="LeftRightFlow Hide">
<Button id="RenameGroupOptions" onactivate="RenameCardGroupDialog()" >
<Button id="RenameGroupOptions" onactivate="RenameCardGroupDialog()">
<Label text="#td_rename_group" />
</Button>
<Button id="ClearGroupOptions" onactivate="ClearCardGroupDialog()" >
<Button id="ClearGroupOptions" onactivate="ClearCardGroupDialog()">
<Label text="#td_clear_all" />
</Button>
</Button>
</Panel>
</Panel>
<!-- 中间 - 卡池 -->
<Panel id="CardPool" >
<Panel id="CardPool">
<Panel id="CardPoolBackground" />
<Panel class="TopBottomFlow FullWidth FullHeight">
<Panel id="CardPoolHeader" >
<Panel id="CardPoolHeader">
<Panel id="CardPoolFilter">
<Label style="color:#fff;vertical-align: middle;" text="#td_type" />
<ToggleButton id="SSR" selected="true" text="SSR" onactivate="ShowCardFromFilter()" />
@@ -189,64 +155,53 @@
<ToggleButton id="R" selected="true" text="R" onactivate="ShowCardFromFilter()" />
<ToggleButton id="N" selected="true" text="N" onactivate="ShowCardFromFilter()" />
</Panel>
<Panel class="RightAlign LeftRightFlow">
<Panel id="UpdatePoint" onmouseover="DOTAShowTextTooltip(td_refresh_desc)" onmouseout="DOTAHideTextTooltip()" onactivate="UpdateGamePoint()" >
<Image src="s2r://panorama/images/custom_game/refresh_png.vtex" />
</Panel>
<Panel id="GamePoint" onmouseover="DOTAShowTextTooltip(td_gamepoint_desc)" onmouseout="DOTAHideTextTooltip()" >
<Panel class="RightAlign LeftRightFlow">
<Panel id="UpdatePoint" onmouseover="DOTAShowTextTooltip(#td_refresh_desc)" onmouseout="DOTAHideTextTooltip()" onactivate="UpdateGamePoint()">
<Image src="s2r://panorama/images/custom_game/refresh_png.vtex" />
</Panel>
<Panel id="GamePoint" onmouseover="DOTAShowTextTooltip(#td_gamepoint_desc)" onmouseout="DOTAHideTextTooltip()">
<Image src="s2r://panorama/images/custom_game/fairy_png.vtex" />
<Label text="{d:game_point}" />
</Panel>
</Panel>
</Panel>
<Panel id="CardPoolContent" >
</Panel>
<Panel id="CardPoolContent" />
</Panel>
</Panel>
<!-- 右边 - 卡片信息 -->
<Panel id="CardInfo" >
<Panel id="CardInfoContent" >
<Panel class="Card" >
<Panel id="CardInfo">
<Panel id="CardInfoContent">
<Panel class="Card">
<DOTAScenePanel id="CardEffect" map="td/card" camera="default" />
<Image id="CardBackGround" src="s2r://panorama/images/custom_game/cards/item_n_png.vtex"/>
<Image id="CardBackGround" src="s2r://panorama/images/custom_game/cards/item_n_png.vtex" />
<Image id="CardImage" src="s2r://panorama/images/custom_game/cards/remilia_png.vtex" />
<Image id="CardName" src="s2r://panorama/images/custom_game/cards/remilia_name_png.vtex"/>
<Panel class="CardBar"/>
<Panel class="CardType"/>
</Panel>
<Button id="DecomposeCardButton" onmouseover="DOTAShowTextTooltip(td_train_card_question)" onmouseout="DOTAHideTextTooltip()" onactivate="TrainCard(1)" oncontextmenu="TrainCard(50)">
<Image id="CardName" src="s2r://panorama/images/custom_game/cards/remilia_name_png.vtex" />
<Panel class="CardBar" />
<Panel class="CardType" />
</Panel>
<Button id="DecomposeCardButton" onmouseover="DOTAShowTextTooltip(#td_train_card_question)" onmouseout="DOTAHideTextTooltip()" onactivate="TrainCard(1)" oncontextmenu="TrainCard(50)">
<Panel class="Center LeftRightFlow MiddleAlign">
<Label html="true" text="#td_train_card_title" />
<Image src="s2r://panorama/images/custom_game/fairy_png.vtex" />
<Label html="true" text="#td_train_card_cost" />
</Panel>
</Button>
</Button>
<Label id="CardInfoName" html="true" text="" />
<Panel id="CardAbilities" >
</Panel>
<Panel id="CardAbilities" />
<DOTAItemImage id="CardInfoItem" itemname="item_0001" />
</Panel>
</Panel>
</Panel>
<!-- 难度选择 -->
<Panel id="DifficultyPanel" >
</Panel>
<!-- 底部 -->
<Panel id="BottomContent" >
<Panel id="DifficultyPanel" />
<Panel id="BottomContent">
<Panel class="LeftRightFlow">
<Button id="BackButton" onactivate="OnBack()">
<Label text="#page_back" />
</Button>
<Button id="ContinueButton" onactivate="OnContinue()">
<Label text="{s:continue_text}" />
</Button>
</Button>
</Panel>
</Panel>
<!-- 玩家头像必须事先在Xml中创建snippets和js创建无效 -->
<Panel id="PlayerAvatarElements" class="Hide">
<DOTAAvatarImage hittest="false" hittestchildren="false" />
<DOTAAvatarImage hittest="false" hittestchildren="false" />
@@ -265,35 +220,21 @@
<DOTAAvatarImage hittest="false" hittestchildren="false" />
<DOTAAvatarImage hittest="false" hittestchildren="false" />
</Panel>
<!-- 准备就绪 -->
<Panel id="WaitOtherPlayersPanel" >
<Panel id="PlayerList" >
</Panel>
<Panel id="WaitOtherPlayersPanel">
<Panel id="PlayerList" />
</Panel>
<!-- 右上角按钮 -->
<Panel id="RightTopButtons">
<!-- removing donate button -->
<!--
<Button onactivate="$('#DonatePanel').RemoveClass('Hide')" >
<Panel id="RightTopButtons">
<Button onactivate="$(&apos;#DonatePanel&apos;).RemoveClass(&apos;Hide&apos;)">
<Label text="#donate" />
</Button>
-->
</Panel>
<!-- 赞助 -->
<Panel id="DonatePanel" class="Hide" />
<Panel id="DonatePanel" class="Hide" />
<DOTAScenePanel id="ClickedEffect" hittest="false" map="td/clicked_test" camera="default" />
<Panel id="LockFrame">
<Panel class="loading_ico"/>
<Label class="loading" text="Loading..." />
<Label id="loading_tips" html="true" text="#td_load_tips" />
<Panel class="loading_ico" />
<Label class="loading" text="Loading..." />
<Label id="loading_tips" html="true" text="#td_load_tips" />
</Panel>
<!-- 对话框-->
<Panel id="MessageDialog">
<Label html="true" text="{s:msg}" />
<TextEntry id="MessageInput" maxchars="20" placeholder="" oninputsubmit="" />