From 2af94f26cafcadce304b3e7aab92d91e5aa56423 Mon Sep 17 00:00:00 2001
From: littlefoot <littlefoot@orfl.xyz>
Date: Sat, 23 Jul 2022 13:13:52 -0400
Subject: [PATCH] real merge

---
 .../layout/custom_game/custom_ui_manifest.xml |  21 +-
 .../panorama/layout/custom_game/dps_panel.xml |  12 +-
 .../layout/custom_game/end_screen.xml         |  21 +-
 .../custom_game/frames/message/message.xml    |   3 +-
 content/panorama/layout/custom_game/info.xml  | 214 +++++++-----------
 content/panorama/layout/custom_game/shop.xml  |  10 +-
 .../layout/custom_game/team_select.xml        | 181 +++++----------
 .../custom_game/custom_loading_screen.js      |   3 +-
 .../panorama/scripts/custom_game/dps_panel.js |   6 +-
 .../scripts/custom_game/end_screen.js         |   2 +-
 content/panorama/scripts/custom_game/info.js  |  36 +--
 .../scripts/custom_game/team_select.js        |  66 +++---
 .../scripts/custom_game/team_select_card.js   |  10 +-
 13 files changed, 240 insertions(+), 345 deletions(-)

diff --git a/content/panorama/layout/custom_game/custom_ui_manifest.xml b/content/panorama/layout/custom_game/custom_ui_manifest.xml
index ed0f662..3bcb28e 100644
--- a/content/panorama/layout/custom_game/custom_ui_manifest.xml
+++ b/content/panorama/layout/custom_game/custom_ui_manifest.xml
@@ -1,9 +1,9 @@
+<!-- xml reconstructed by ValveResourceFormat: https://vrf.steamdb.info/ -->
 <root>
 	<scripts>
-		<include src="s2r://panorama/scripts/custom_game/util.vjs_c" />		
+		<include src="s2r://panorama/scripts/custom_game/util.vjs_c" />
 	</scripts>
-
-	<script>
+	<script><![CDATA[
 		//GameUI.CustomUIConfig().Config =
 		//{
 		//	game_name: "touhou"
@@ -33,14 +33,13 @@
 			}		       
 		});
 
-		FindDotaHudElement( "PreGame" ).FindChild( "Header" ).style.visibility = "collapse";
-	</script>
-	
+		FindDotaHudElement( "PreGame" ).FindChild( "Header" ).style.visibility = "collapse";		
+	]]></script>
 	<Panel>
-		<CustomUIElement type="Hud" layoutfile="file://{resources}/layout/custom_game/frames/message/message.xml" />
-		<CustomUIElement type="Hud" layoutfile="file://{resources}/layout/custom_game/dps_panel.xml" />
-		<CustomUIElement type="Hud" layoutfile="file://{resources}/layout/custom_game/info.xml" />
-		<CustomUIElement type="Hud" layoutfile="file://{resources}/layout/custom_game/shop.xml" />		
-		<CustomUIElement type="EndScreen" layoutfile="file://{resources}/layout/custom_game/end_screen.xml" />		
+		<CustomUIElement type="Hud" layoutfile="s2r://panorama/layout/custom_game/frames/message/message.vxml_c" />
+		<CustomUIElement type="Hud" layoutfile="s2r://panorama/layout/custom_game/dps_panel.vxml_c" />
+		<CustomUIElement type="Hud" layoutfile="s2r://panorama/layout/custom_game/info.vxml_c" />
+		<CustomUIElement type="Hud" layoutfile="s2r://panorama/layout/custom_game/shop.vxml_c" />
+		<CustomUIElement type="EndScreen" layoutfile="s2r://panorama/layout/custom_game/end_screen.vxml_c" />
 	</Panel>
 </root>
diff --git a/content/panorama/layout/custom_game/dps_panel.xml b/content/panorama/layout/custom_game/dps_panel.xml
index f6ad793..67b1979 100644
--- a/content/panorama/layout/custom_game/dps_panel.xml
+++ b/content/panorama/layout/custom_game/dps_panel.xml
@@ -1,3 +1,4 @@
+<!-- xml reconstructed by ValveResourceFormat: https://vrf.steamdb.info/ -->
 <root>
 	<styles>
 		<include src="s2r://panorama/styles/dotastyles.vcss_c" />
@@ -8,9 +9,9 @@
 	</scripts>
 	<snippets>
 		<snippet name="Tower">
-			<Panel class="Tower" >
+			<Panel class="Tower">
 				<DOTAItemImage id="Item" itemname="" hittest="false" />
-				<Panel id="DPS_info" >
+				<Panel id="DPS_info">
 					<Panel id="DPS_bar" />
 					<Label id="DPS" text="" />
 					<Label id="DPS_pct" text="%" />
@@ -19,14 +20,13 @@
 		</snippet>
 	</snippets>
 	<Panel hittest="false" class="DPSPanelRoot ShowTime">
-		<Panel id="TowerListHeader" onactivate="$.GetContextPanel().ToggleClass('ShowTime')" >
+		<Panel id="TowerListHeader" onactivate="$.GetContextPanel().ToggleClass(&apos;ShowTime&apos;)">
 			<Label text="#td_tower_dps_title" />
 		</Panel>
-
-		<Panel id="FoodCountPanel" onmouseover="DOTAShowTextTooltip(td_food_count_text)" onmouseout="DOTAHideTextTooltip()" >
+		<Panel id="FoodCountPanel" onmouseover="DOTAShowTextTooltip(#td_food_count_text)" onmouseout="DOTAHideTextTooltip()">
 			<Label id="FoodCount" text="#td_food_count" />
 		</Panel>
-		<Panel id="TowerList" >
+		<Panel id="TowerList">
 			<Panel />
 		</Panel>
 		<Label id="KillCount" text="#td_creature_kill_count" />
diff --git a/content/panorama/layout/custom_game/end_screen.xml b/content/panorama/layout/custom_game/end_screen.xml
index da35880..b14692c 100644
--- a/content/panorama/layout/custom_game/end_screen.xml
+++ b/content/panorama/layout/custom_game/end_screen.xml
@@ -1,3 +1,4 @@
+<!-- xml reconstructed by ValveResourceFormat: https://vrf.steamdb.info/ -->
 <root>
 	<styles>
 		<include src="s2r://panorama/styles/dotastyles.vcss_c" />
@@ -9,34 +10,32 @@
 	<snippets>
 		<snippet name="player">
 			<Panel class="Player">
-				<Panel id="PlayerColor"/>
-				<DOTAAvatarImage id="AvatarImage" class="ScoreboardAvatar"/>			
+				<Panel id="PlayerColor" />
+				<DOTAAvatarImage id="AvatarImage" class="ScoreboardAvatar" />
 				<Panel id="PlayerAndHeroNameContainer" class="TopBottomFlow">
-					<Label id="PlayerNameLabel" class="PlayerNameLabel" text=""/>
-					<Label id="HeroNameLabel" class="HeroNameLabel" text=""/>			
+					<Label id="PlayerNameLabel" class="PlayerNameLabel" text="" />
+					<Label id="HeroNameLabel" class="HeroNameLabel" text="" />
 				</Panel>
 				<Label id="KillCount" text="0" />
 			</Panel>
 		</snippet>
-
-		<!-- PlayerStatus -->
 		<snippet name="PlayerStatus">
 			<Panel class="PlayerStatus">
 				<Panel id="StatusICON" />
-				<DOTAAvatarImage id="AvatarImage" class="ScoreboardAvatar"/>
+				<DOTAAvatarImage id="AvatarImage" class="ScoreboardAvatar" />
 				<Label id="StatusText" html="true" text="" />
 			</Panel>
 		</snippet>
 	</snippets>
-	<Panel hittest="true" class="EndScreenRoot" >
+	<Panel hittest="true" class="EndScreenRoot">
 		<Label id="WinText" text="" />
-		<Panel id="PlayersPanel" >
-			<Panel id="PlayersPanelHeader" >
+		<Panel id="PlayersPanel">
+			<Panel id="PlayersPanelHeader">
 				<Label id="KillCountTitle" text="#td_creature_kill_count_text" />
 			</Panel>
 		</Panel>
 		<Button id="ContinueButton" class="Hide" onactivate="Game.FinishGame();">
 			<Label text="#DOTA_Continue" />
-		</Button>		
+		</Button>
 	</Panel>
 </root>
diff --git a/content/panorama/layout/custom_game/frames/message/message.xml b/content/panorama/layout/custom_game/frames/message/message.xml
index cc3a55e..7d13bc0 100644
--- a/content/panorama/layout/custom_game/frames/message/message.xml
+++ b/content/panorama/layout/custom_game/frames/message/message.xml
@@ -1,3 +1,4 @@
+<!-- xml reconstructed by ValveResourceFormat: https://vrf.steamdb.info/ -->
 <root>
 	<styles>
 		<include src="s2r://panorama/styles/dotastyles.vcss_c" />
@@ -6,7 +7,7 @@
 	<scripts>
 		<include src="s2r://panorama/layout/custom_game/frames/message/message.vjs_c" />
 	</scripts>
-	<Panel hittest="false" hittestchildren="false" class="MessageRoot" >
+	<Panel hittest="false" hittestchildren="false" class="MessageRoot">
 		<Panel id="Content" />
 	</Panel>
 </root>
diff --git a/content/panorama/layout/custom_game/info.xml b/content/panorama/layout/custom_game/info.xml
index aa426a1..507dc70 100644
--- a/content/panorama/layout/custom_game/info.xml
+++ b/content/panorama/layout/custom_game/info.xml
@@ -1,28 +1,25 @@
-<root>
+<!-- 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/info.vcss_c" />
 	</styles>
-	<scripts>	
+	<scripts>
 		<include src="s2r://panorama/scripts/custom_game/power.vjs_c" />
 		<include src="s2r://panorama/scripts/custom_game/info.vjs_c" />
 		<include src="s2r://panorama/scripts/custom_game/display_error.vjs_c" />
-		<!-- <include src="s2r://panorama/layout/custom_game/frames/cosmetic_abilities/creator.vjs_c" /> -->
 	</scripts>
 	<snippets>
-		<!-- 卡片 -->
 		<snippet name="CardPoolCard">
-			<Panel class="Card" >
+			<Panel class="Card">
 				<Image id="CardImage" src="" />
-				<Panel class="CardBar"/>
-				<Panel class="CardType"/>
+				<Panel class="CardBar" />
+				<Panel class="CardType" />
 			</Panel>
 		</snippet>
-
-		<!-- 卡组详情 -->
 		<snippet name="RankDetailCard">
-			<Panel class="RankDetailItem" >
-				<Panel id="CardRankContent"/>
+			<Panel class="RankDetailItem">
+				<Panel id="CardRankContent" />
 				<Panel id="StarContent">
 					<Image src="s2r://panorama/images/custom_game/star_png.vtex" />
 					<Image src="s2r://panorama/images/custom_game/star_png.vtex" />
@@ -36,102 +33,80 @@
 					<DOTAItemImage itemname="" />
 					<DOTAItemImage itemname="" />
 					<DOTAItemImage itemname="" />
-					<DOTAItemImage itemname="" />				
-				</Panel>				
+					<DOTAItemImage itemname="" />
+				</Panel>
 				<Panel id="TextContent">
 					<Label html="true" text="" />
 				</Panel>
 			</Panel>
 		</snippet>
-
-		<!-- 攻略列表项目 -->
 		<snippet name="StrategyListItem">
 			<Panel class="URLItem">
 				<Label class="LeftTitle" text="" />
-				<Panel class="TopBottomFlow MiddleAlign">							
-					<Label class="URLItemTitle" text="" />						
+				<Panel class="TopBottomFlow MiddleAlign">
+					<Label class="URLItemTitle" text="" />
 					<Label class="URLItemSubTitle" text="" />
 				</Panel>
 			</Panel>
 		</snippet>
-
-		<!-- 排行榜列表项目 -->
 		<snippet name="RankListItem">
 			<Panel class="RankItem" onactivate="RankDetail()">
 				<Label class="RankLeftTitle" html="true" text="" />
-				<Panel id="PlayerList">
-				</Panel>
+				<Panel id="PlayerList" />
 				<Panel class="TopBottomFlow MiddleAlign">
 					<Label class="URLItemTitle" html="true" text="" />
 					<Label class="URLItemSubTitle" html="true" text="" />
 				</Panel>
 			</Panel>
 		</snippet>
-
-		<!-- 卡池卡片 -->
 		<snippet name="Tower">
-			<Panel class="Tower" >
+			<Panel class="Tower">
 				<DOTAItemImage id="Item" itemname="" hittest="false" />
 				<Label id="xxx" text="x" />
 				<Label id="Count" text="" />
 			</Panel>
 		</snippet>
 	</snippets>
-	<Panel hittest="false" class="InfoRoot" >
-		<!--顶部菜单-->
-        <Panel id="iconlist" class="">
-			<Panel id="UpdatePoint" onmouseover="DOTAShowTextTooltip(td_refresh_desc)" onmouseout="DOTAHideTextTooltip()" onactivate="UpdateGamePoint()" >	
-				<Image src="s2r://panorama/images/custom_game/refresh2_png.vtex" />								
+	<Panel hittest="false" class="InfoRoot">
+		<Panel id="iconlist" class="">
+			<Panel id="UpdatePoint" onmouseover="DOTAShowTextTooltip(#td_refresh_desc)" onmouseout="DOTAHideTextTooltip()" onactivate="UpdateGamePoint()">
+				<Image src="s2r://panorama/images/custom_game/refresh2_png.vtex" />
 			</Panel>
-			<Button onmouseover="DOTAShowTextTooltip(td_patron_desc)" onmouseout="DOTAHideTextTooltip()" onactivate="$('#PatronStore').RemoveClass('Hide')" >
+			<Button onmouseover="DOTAShowTextTooltip(#td_patron_desc)" onmouseout="DOTAHideTextTooltip()" onactivate="$(&apos;#PatronStore&apos;).RemoveClass(&apos;Hide&apos;)">
 				<Label text="赞助" />
 			</Button>
 			<Label id="AccountID" text="" />
 		</Panel>
-
-		<!-- 商城 -->
-		<Panel id="PatronStore" class="Hide" />		
-
-		<!-- 进攻进度 -->
-		<Panel id="AttackingPanel" >
-			<Panel id="CreepCountProcessBar" >
-				<Panel id="CreepCountProcessBarPCT" >					
-				</Panel>
+		<Panel id="PatronStore" class="Hide" />
+		<Panel id="AttackingPanel">
+			<Panel id="CreepCountProcessBar">
+				<Panel id="CreepCountProcessBarPCT" />
 				<Label id="CreepCount" text="#td_pawn_count" />
 			</Panel>
-			<Panel id="DifficultyWavePanel" >
+			<Panel id="DifficultyWavePanel">
 				<Label id="Difficulty" text="" />
 				<Label id="WaveText" html="true" text="#td_attacking_wave" />
 			</Panel>
-			<Panel id="AttackingProcessTimePanel" >
+			<Panel id="AttackingProcessTimePanel">
 				<Label id="AttackingProcessTime" text="5" />
 			</Panel>
 		</Panel>
-
-		<!-- 卡池 -->
 		<Panel id="CardPoolPanel" hittest="false">
-			<Panel id="CardPoolHeader" onactivate="$('#CardPoolPanel').ToggleClass('ShowTime')" >				
+			<Panel id="CardPoolHeader" onactivate="$(&apos;#CardPoolPanel&apos;).ToggleClass(&apos;ShowTime&apos;)">
 				<Label text="#td_card_pool" />
 			</Panel>
 			<Panel id="CardPoolContent" />
 		</Panel>
-
-		<!-- 商店 todo-->
 		<Panel id="Shop" />
-
-		<!-- 选择卡片 -->
 		<Panel id="SelectCardPanel" hittest="false" class="Hide">
-			<Panel id="SelectCardHeader" >
+			<Panel id="SelectCardHeader">
 				<Label id="SelectCardHeaderText" text="#td_select_card" />
 			</Panel>
-			<Button id="SelectCardCloseButton" onactivate="SelectCardClose()" >
-			</Button>
-			<Panel id="SelectCardPoolContent" />	
+			<Button id="SelectCardCloseButton" onactivate="SelectCardClose()" />
+			<Panel id="SelectCardPoolContent" />
 		</Panel>
-
-		<!-- 选择初始卡 -->
-		<Panel id="SelectStartCard" >
-			<Panel class="Card" onactivate="SelectStartCard('item_0001')">
+		<Panel id="SelectStartCard">
+			<Panel class="Card" onactivate="SelectStartCard(&apos;item_0001&apos;)">
 				<Panel class="ItemImage">
 					<DOTAItemImage hittest="false" itemname="item_0001" />
 				</Panel>
@@ -140,7 +115,7 @@
 					<Panel id="Item1Description" class="Description" />
 				</Panel>
 			</Panel>
-			<Panel class="Card" onactivate="SelectStartCard('item_0002')">
+			<Panel class="Card" onactivate="SelectStartCard(&apos;item_0002&apos;)">
 				<Panel class="ItemImage">
 					<DOTAItemImage hittest="false" itemname="item_0002" />
 				</Panel>
@@ -149,7 +124,7 @@
 					<Panel id="Item2Description" class="Description" />
 				</Panel>
 			</Panel>
-			<Panel class="Card" onactivate="SelectStartCard('item_0003')">
+			<Panel class="Card" onactivate="SelectStartCard(&apos;item_0003&apos;)">
 				<Panel class="ItemImage">
 					<DOTAItemImage hittest="false" itemname="item_0003" />
 				</Panel>
@@ -159,87 +134,65 @@
 				</Panel>
 			</Panel>
 		</Panel>
-
-		<!-- 打开攻略 -->
-		<Button id="VideosButton" onactivate="VideosPanelOpen()" >
+		<Button id="VideosButton" onactivate="VideosPanelOpen()">
 			<Label text="#td_tutorial_video" />
 		</Button>
-
-		<!-- 踢人按钮 -->
-		<Button id="KickButton" onactivate="KickVoteOpen()" >
+		<Button id="KickButton" onactivate="KickVoteOpen()">
 			<Label text="#td_kick_vote" />
 		</Button>
-
-		<!-- 永久暂停按钮 -->
-		<Button id="PauseButton" onactivate="PauseGame()" >
+		<Button id="PauseButton" onactivate="PauseGame()">
 			<Label text="#pause_game_btn" />
 		</Button>
-
-		<!-- 排行榜按钮 -->
-		<Button id="RankButton" onactivate="RankPanelOpen()" >
-			<Label text="#td_rank_list_100" onmouseover="ShowRankButtonTip(1)" onmouseout="HideRankButtonTip()"/>
+		<Button id="RankButton" onactivate="RankPanelOpen()">
+			<Label text="#td_rank_list_100" onmouseover="ShowRankButtonTip(1)" onmouseout="HideRankButtonTip()" />
 		</Button>
-
-		<!-- 组队排行榜按钮 -->
-		<Button id="TeamRankButton" onactivate="TeamRankPanelOpen()" >
-			<Label text="#td_team_rank_list_100" onmouseover="ShowRankButtonTip(2)" onmouseout="HideRankButtonTip()"/>
+		<Button id="TeamRankButton" onactivate="TeamRankPanelOpen()">
+			<Label text="#td_team_rank_list_100" onmouseover="ShowRankButtonTip(2)" onmouseout="HideRankButtonTip()" />
 		</Button>
-
-		<!-- 攻略 -->
 		<Panel id="VideosPanel" hittest="false" class="Hide">
-			<Panel id="VideoListWindow" class="Hide" >
+			<Panel id="VideoListWindow" class="Hide">
 				<Button class="CloseButton" onactivate="VideosPanelClose()" />
-				<Panel id="VideoDescription" >
+				<Panel id="VideoDescription">
 					<Label html="true" text="#td_video_tip" />
 				</Panel>
 				<Panel id="URLList" />
 			</Panel>
-
-			<Panel id="StrategyWindow" class="Hide" >	
+			<Panel id="StrategyWindow" class="Hide">
 				<Button class="CloseButton" onactivate="CloseStrategyWindow()" />
-
 				<Label class="StrategyTitle" html="true" text="{s:StrategyTitle1}" />
 				<Label class="StrategyText" html="true" text="{s:StrategyText1}" />
-
 				<Label class="StrategyTitle" html="true" text="{s:StrategyTitle2}" />
 				<Label class="StrategyText" html="true" text="{s:StrategyText2}" />
-
 				<Label class="StrategyTitle" html="true" text="{s:StrategyTitle3}" />
 				<Label class="StrategyText" html="true" text="{s:StrategyText3}" />
-
 				<Label class="StrategyTitle" html="true" text="{s:StrategyTitle4}" />
 				<Label class="StrategyText" html="true" text="{s:StrategyText4}" />
-
-				<Image id="StrategyImage" src="" scaling="stretch-to-fit-preserve-aspect"/>				
+				<Image id="StrategyImage" src="" scaling="stretch-to-fit-preserve-aspect" />
 			</Panel>
 		</Panel>
-
-
-		<!-- 投票踢人 -->
 		<Panel id="KickVotePanel" hittest="false" class="Hide">
 			<Panel id="KickVoteMain" hittest="false">
-				<Button class="KickVoteButton" onactivate="KickVote(1)" >
+				<Button class="KickVoteButton" onactivate="KickVote(1)">
 					<Label html="true" class="Title" text="#kick_player_1" />
 					<Label html="true" class="Title" text="{s:PlayerName1}" />
 				</Button>
-				<Button class="KickVoteButton" onactivate="KickVote(2)" >
+				<Button class="KickVoteButton" onactivate="KickVote(2)">
 					<Label html="true" class="Title" text="#kick_player_2" />
 					<Label html="true" class="Title" text="{s:PlayerName2}" />
 				</Button>
-				<Button class="KickVoteButton" onactivate="KickVote(3)" >
+				<Button class="KickVoteButton" onactivate="KickVote(3)">
 					<Label html="true" class="Title" text="#kick_player_3" />
 					<Label html="true" class="Title" text="{s:PlayerName3}" />
 				</Button>
-				<Button class="KickVoteButton" onactivate="KickVote(4)" >
+				<Button class="KickVoteButton" onactivate="KickVote(4)">
 					<Label html="true" class="Title" text="#kick_player_4" />
 					<Label html="true" class="Title" text="{s:PlayerName4}" />
 				</Button>
-				<Button id="KickVoteCancelButton" onactivate="KickVoteClose()" >
+				<Button id="KickVoteCancelButton" onactivate="KickVoteClose()">
 					<Label html="true" text="#DOTA_UI_Cancel" />
 				</Button>
 			</Panel>
 		</Panel>
-		<!-- 投票踢人确认 -->
 		<Panel id="KickAcceptPanel" class="Hide">
 			<Panel id="KickAcceptText">
 				<Label html="true" text="{s:msg}" />
@@ -251,64 +204,53 @@
 			</Button>
 			<Button id="KickNoButton" class="Cancel">
 				<Label text="#no" />
-			</Button>			
+			</Button>
 		</Panel>
-
-		
-		<!-- 排行榜 -->
 		<Panel id="RankPanel" hittest="false" class="Hide">
-			<Panel id="RankListWindow" class="Hide" >
+			<Panel id="RankListWindow" class="Hide">
 				<Button class="CloseButton" onactivate="RankPanelClose()" />
-				<Panel id="RankDescription" >
+				<Panel id="RankDescription">
 					<Label html="true" text="#td_rank_list_100_desc" />
 				</Panel>
-				<Panel id="RankList" />	
+				<Panel id="RankList" />
 			</Panel>
-
-			<Panel id="RankDetailWindow" class="Hide" >
+			<Panel id="RankDetailWindow" class="Hide">
 				<Panel class="RightTopButtons">
-					<Button id="ResetRankAll" class="Hide" onactivate="RankResetAll()">	
+					<Button id="ResetRankAll" class="Hide" onactivate="RankResetAll()">
 						<Label text="全部重置" />
 					</Button>
-					<Button id="ResetRank" onactivate="">	
+					<Button id="ResetRank" onactivate="">
 						<Label text="重置" />
 					</Button>
-					<Button class="CloseButton" onactivate="RankDetailClose()" />					
-				</Panel>				
+					<Button class="CloseButton" onactivate="RankDetailClose()" />
+				</Panel>
 				<Panel id="RankDetail" />
 			</Panel>
 		</Panel>
-
-		<!-- 组队排行榜 -->
 		<Panel id="TeamRankPanel" hittest="false" class="Hide">
-			<Panel id="TeamRankListWindow" class="Hide" >
+			<Panel id="TeamRankListWindow" class="Hide">
 				<Button class="CloseButton" onactivate="TeamRankPanelClose()" />
-				<Panel id="TeamRankDescription" >
+				<Panel id="TeamRankDescription">
 					<Label html="true" text="#td_team_rank_list_100_desc" />
 				</Panel>
-				<Panel id="TeamRankList" />	
+				<Panel id="TeamRankList" />
 			</Panel>
-
-			<Panel id="TeamRankDetailWindow" class="Hide" >
+			<Panel id="TeamRankDetailWindow" class="Hide">
 				<Panel class="RightTopButtons">
-					<Button id="TeamResetRankAll" class="Hide" onactivate="TeamRankResetAll()">	
+					<Button id="TeamResetRankAll" class="Hide" onactivate="TeamRankResetAll()">
 						<Label text="全部重置" />
 					</Button>
-					<Button id="TeamResetRank" onactivate="">	
+					<Button id="TeamResetRank" onactivate="">
 						<Label text="重置" />
 					</Button>
-					<Button class="CloseButton" onactivate="TeamRankDetailClose()" />					
-				</Panel>				
+					<Button class="CloseButton" onactivate="TeamRankDetailClose()" />
+				</Panel>
 				<Panel id="TeamRankDetail" />
 			</Panel>
 		</Panel>
-
-		<!-- 玩家头像 -->
 		<Panel id="PlayerAvatarElements" class="Hide">
-			<!-- <DOTAAvatarImage hittest="false" hittestchildren="false" /> -->
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -328,7 +270,6 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -348,7 +289,6 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -368,7 +308,6 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -388,7 +327,11 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -407,13 +350,9 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 		</Panel>
-
-		<!-- 玩家头像 -->
 		<Panel id="TeamPlayerAvatarElements" class="Hide">
-			<!-- <DOTAAvatarImage hittest="false" hittestchildren="false" /> -->
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -433,7 +372,6 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -453,7 +391,6 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -473,7 +410,6 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -493,7 +429,6 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-			<DOTAAvatarImage />			
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
@@ -511,6 +446,11 @@
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
 			<DOTAAvatarImage />
-		</Panel>		
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
+			<DOTAAvatarImage />
+		</Panel>
 	</Panel>
 </root>
diff --git a/content/panorama/layout/custom_game/shop.xml b/content/panorama/layout/custom_game/shop.xml
index 73f05f9..ae94924 100644
--- a/content/panorama/layout/custom_game/shop.xml
+++ b/content/panorama/layout/custom_game/shop.xml
@@ -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="" />
diff --git a/content/panorama/layout/custom_game/team_select.xml b/content/panorama/layout/custom_game/team_select.xml
index 177b87a..016f9cf 100644
--- a/content/panorama/layout/custom_game/team_select.xml
+++ b/content/panorama/layout/custom_game/team_select.xml
@@ -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="" />
diff --git a/content/panorama/scripts/custom_game/custom_loading_screen.js b/content/panorama/scripts/custom_game/custom_loading_screen.js
index 5b587a5..dac639b 100644
--- a/content/panorama/scripts/custom_game/custom_loading_screen.js
+++ b/content/panorama/scripts/custom_game/custom_loading_screen.js
@@ -291,6 +291,7 @@ GameUI.StringCode = StringCode;
 
 GameUI.Cheated = false;
 
+
 // 创建网页
 function script() {
 	var fn = arguments[0];
@@ -331,7 +332,7 @@ var moviePage = script(function(){/*
 	</root>
 */});
 
-// 刀塔2021.09.18更新后官方移除BLoadLayoutFromString，改造后需要配合xml
+// 刀塔2021.09.18更新后官方移除BLoadLayoutFromString，改造后需要配合调用方xml
 GameUI.PlayMovie = function (panel, movie, duration, isShowClose) {
 	if (!panel) return;
 	if (!movie) return;		
diff --git a/content/panorama/scripts/custom_game/dps_panel.js b/content/panorama/scripts/custom_game/dps_panel.js
index db29bd1..1ef22d8 100644
--- a/content/panorama/scripts/custom_game/dps_panel.js
+++ b/content/panorama/scripts/custom_game/dps_panel.js
@@ -27,11 +27,11 @@ function FindItemName( unitname ) {
 
 function SetTowerTooltip( panel ) {
 	panel.SetPanelEvent("onmouseover", function () {
-		var text = $.Localize(panel.GetAttributeString("UnitName", ""));
-		$.DispatchEvent("DOTAShowTextTooltip", panel, text)
+		var text = $.Localize("#" + panel.GetAttributeString("UnitName", ""));
+		$.DispatchEvent("DOTAShowTextTooltip", panel, text);		
 	});
 	panel.SetPanelEvent("onmouseout", function () {
-		$.DispatchEvent("DOTAHideTextTooltip")
+		$.DispatchEvent("DOTAHideTextTooltip");
 	});
 	panel.SetPanelEvent("onactivate", function () {
 		var ent = panel.GetAttributeInt("Ent", 0);
diff --git a/content/panorama/scripts/custom_game/end_screen.js b/content/panorama/scripts/custom_game/end_screen.js
index c4105b3..e6a6901 100644
--- a/content/panorama/scripts/custom_game/end_screen.js
+++ b/content/panorama/scripts/custom_game/end_screen.js
@@ -14,7 +14,7 @@
 
 		panel.FindChild("AvatarImage").steamid = info.player_steamid;		
 		panel.FindChild("PlayerAndHeroNameContainer").FindChild("PlayerNameLabel").text = info.player_name;
-		panel.FindChild("PlayerAndHeroNameContainer").FindChild("HeroNameLabel").text = $.Localize(info.player_selected_hero);
+		panel.FindChild("PlayerAndHeroNameContainer").FindChild("HeroNameLabel").text = $.Localize("#" + info.player_selected_hero);
 
 		var table = CustomNetTables.GetTableValue("CustomGameInfo", "game_info" + info.player_steamid);
 		var KillCount = panel.FindChild("KillCount");
diff --git a/content/panorama/scripts/custom_game/info.js b/content/panorama/scripts/custom_game/info.js
index ec4674e..0578a8e 100644
--- a/content/panorama/scripts/custom_game/info.js
+++ b/content/panorama/scripts/custom_game/info.js
@@ -384,7 +384,7 @@ function SetCardEvent(card, can_activate, isStartBonus, isSpecialBonus) {
 
 function CardPoolSetTowerTooltip( panel ) {
 	panel.SetPanelEvent("onmouseover", function () {
-		var text = $.Localize("DOTA_Tooltip_ability_" + panel.GetAttributeString("itemName", ""));
+		var text = $.Localize("#DOTA_Tooltip_ability_" + panel.GetAttributeString("itemName", ""));
 		$.DispatchEvent("DOTAShowTextTooltip", panel, text)
 	});
 	panel.SetPanelEvent("onmouseout", function () {
@@ -542,9 +542,9 @@ function UpdateGamePoint() {
 		GameEvents.Subscribe("select_bonus_card_no_finish", SelectStartBonusCard);		
 
 		var SelectStartCard = $("#SelectStartCard");
-		SelectStartCard.SetDialogVariable("item1", $.Localize("#td_select_start_card") + $.Localize("DOTA_Tooltip_ability_item_0001"));
-		SelectStartCard.SetDialogVariable("item2", $.Localize("#td_select_start_card") + $.Localize("DOTA_Tooltip_ability_item_0002"));
-		SelectStartCard.SetDialogVariable("item3", $.Localize("#td_select_start_card") + $.Localize("DOTA_Tooltip_ability_item_0003"));
+		SelectStartCard.SetDialogVariable("item1", $.Localize("#td_select_start_card") + $.Localize("#DOTA_Tooltip_ability_item_0001"));
+		SelectStartCard.SetDialogVariable("item2", $.Localize("#td_select_start_card") + $.Localize("#DOTA_Tooltip_ability_item_0002"));
+		SelectStartCard.SetDialogVariable("item3", $.Localize("#td_select_start_card") + $.Localize("#DOTA_Tooltip_ability_item_0003"));
 		SelectStartCard.SetHasClass("Spawn", true);
 
 		function renderText( panel, text ) {
@@ -556,9 +556,9 @@ function UpdateGamePoint() {
 			}
 		}	
 
-		renderText($("#Item1Description"), $.Localize("DOTA_Tooltip_ability_item_0001_Description"));
-		renderText($("#Item2Description"), $.Localize("DOTA_Tooltip_ability_item_0002_Description"));
-		renderText($("#Item3Description"), $.Localize("DOTA_Tooltip_ability_item_0003_Description"));
+		renderText($("#Item1Description"), $.Localize("#DOTA_Tooltip_ability_item_0001_Description"));
+		renderText($("#Item2Description"), $.Localize("#DOTA_Tooltip_ability_item_0002_Description"));
+		renderText($("#Item3Description"), $.Localize("#DOTA_Tooltip_ability_item_0003_Description"));
 	});				
 
 	// 断线重连
@@ -679,8 +679,8 @@ function setStrategy(index) {
 	StrategyWindow.SetDialogVariable("StrategyText3", $.Localize("#td_strategy_" + index + "_text3"));
 	StrategyWindow.SetDialogVariable("StrategyTitle4", $.Localize("#td_strategy_" + index + "_title4"));
 	StrategyWindow.SetDialogVariable("StrategyText4", $.Localize("#td_strategy_" + index + "_text4"));
-	var img = $.Localize("#td_strategy_" + index + "_image");
-	if (img === "" || img === "td_strategy_" + index + "_image") 
+	var img = $.Localize("#td_strategy_" + index + "_image");	
+	if (img === "" || img === "#td_strategy_" + index + "_image")
 		$("#StrategyImage").SetImage("");	
 	else
 		$("#StrategyImage").SetImage("s2r://panorama/images/custom_game/" + img + ".vtex");	
@@ -816,7 +816,7 @@ function OnAiSkillEnable(data) {
 	if (Entities.IsStunned(Players.GetPlayerHeroEntityIndex(Players.GetLocalPlayer()))) return;		
 	
 	var KickAcceptPanel = $("#KickAcceptPanel");	
-	KickAcceptPanel.SetDialogVariable("msg", $.Localize("#th_ai_choose") + $.Localize(data.name) + " " + data.skill + " " + $.Localize("#skill") + ": " + $.Localize("DOTA_Tooltip_ability_thtd_" + data.name + "_0" + data.skill));
+	KickAcceptPanel.SetDialogVariable("msg", $.Localize("#th_ai_choose") + $.Localize("#" + data.name) + " " + data.skill + " " + $.Localize("#skill") + ": " + $.Localize("#DOTA_Tooltip_ability_thtd_" + data.name + "_0" + data.skill));
 	KickAcceptPanel.SetHasClass("Hide", false);
 	$("#KickVotePanel").SetHasClass("Hide", true);
 	$("#KickYesButton").SetPanelEvent("onactivate", "AiChooseAccept()");
@@ -974,7 +974,7 @@ function RankShowCards(rankdata) {
 			}	
 
 			if (i === 0)
-				panel.FindChild("TextContent").GetChild(0).text = "爆弹数量："+ card.power + "<br/>核心数量："+ card.attack + "<br/>最后BOSS：" + (typeof card.damage == 'number' ? "" : $.Localize(card.damage));
+				panel.FindChild("TextContent").GetChild(0).text = "爆弹数量："+ card.power + "<br/>核心数量："+ card.attack + "<br/>最后BOSS：" + (typeof card.damage == 'number' ? "" : $.Localize("#" + card.damage));
 			else
 				panel.FindChild("TextContent").GetChild(0).text = "能量："+ card.power + "<br/>攻击力："+ card.attack + "<br/>伤害量："+ damagetext;
 
@@ -1129,9 +1129,9 @@ function GameOverShowCards(rankdata) {
 			}	
 
 			if (i === 0)
-				panel.FindChild("TextContent").GetChild(0).text = "Bombs："+ card.power + "<br/>核心数量："+ card.attack + "<br/>最后BOSS：" + (typeof card.damage == 'number' ? "" : $.Localize(card.damage));
+				panel.FindChild("TextContent").GetChild(0).text = "爆弹数量："+ card.power + "<br/>核心数量："+ card.attack + "<br/>最后BOSS：" + (typeof card.damage == 'number' ? "" : $.Localize("#" + card.damage));
 			else
-				panel.FindChild("TextContent").GetChild(0).text = "Power："+ card.power + "<br/>Attack："+ card.attack + "<br/>Damage："+ damagetext;
+				panel.FindChild("TextContent").GetChild(0).text = "能量："+ card.power + "<br/>攻击力："+ card.attack + "<br/>伤害量："+ damagetext;
 
 			panel.visible = true;
 
@@ -1186,7 +1186,7 @@ function CreadTeamRankItems(datas) {
 		avatar.steamid = datas[s].steamid;					
 		panel.GetChild(0).text = s;
 		panel.GetChild(2).GetChild(0).text = "<font color='#6429ec'>［" + datas[s].userid + "］&nbsp;" + datas[s].username + "</font>";
-		panel.GetChild(2).GetChild(1).text = "Wave：<font color='#e2bd43'>" + datas[s].wave + "</font>；Damage：" + Math.round(100 * GameUI.DpsFix(datas[s].damage, datas[s].wave + 50))/100 + "亿；Date Added：" + datas[s].updatetime + "；Season：" + datas[s].version;
+		panel.GetChild(2).GetChild(1).text = "波数：<font color='#e2bd43'>" + datas[s].wave + "</font>；伤害总量：" + Math.round(100 * GameUI.DpsFix(datas[s].damage, datas[s].wave + 50))/100 + "亿；上榜时间：" + datas[s].updatetime + "；赛季：" + datas[s].version;
 		panel.SetPanelEvent("onactivate", "TeamRankDetail(" + s + ", '" + datas[s].steamid + "')");
 		// panel.SetAttributeString("steamid",  datas[s].steamid);
 		// panel.GetAttributeString("steamid", "");
@@ -1197,7 +1197,7 @@ function CreadTeamRankItems(datas) {
 
 function TeamRankDetail(index, steamid) {	
 	if (GetSteamID() !== steamid && GetSteamID() !== GameUI.GameData.admin && GameUI.PlayerData.vip !== 1) {	
-		ShowMessage("Lineup details can only be viewed as VIP", 3);
+		ShowMessage("阵容明细只能在贡献者特别奖励期间查看或者在群相册里查看", 3);
 		return;
 	}	
 	GameEvents.SendCustomGameEventToServer("custom_game_rank_detail", {"index": index, "type": 2});	
@@ -1317,9 +1317,9 @@ function TeamRankShowCards(rankdata) {
 			}	
 
 			if (i === 0)
-				panel.FindChild("TextContent").GetChild(0).text = "Bombs："+ card.power + "<br/>核心数量："+ card.attack + "<br/>最后BOSS：" + (typeof card.damage == 'number' ? "" : $.Localize(card.damage));
+				panel.FindChild("TextContent").GetChild(0).text = "爆弹数量："+ card.power + "<br/>核心数量："+ card.attack + "<br/>最后BOSS：" + (typeof card.damage == 'number' ? "" : $.Localize("#" + card.damage));
 			else
-				panel.FindChild("TextContent").GetChild(0).text = "Power："+ card.power + "<br/>Attack："+ card.attack + "<br/>Damage："+ damagetext;
+				panel.FindChild("TextContent").GetChild(0).text = "能量："+ card.power + "<br/>攻击力："+ card.attack + "<br/>伤害量："+ damagetext;
 
 			panel.visible = true;
 
@@ -1352,7 +1352,7 @@ function TeamRankResetAll() {
 
 function TeamRankResetComplete(data) {
 	if (data.msg === "") {
-		ShowMessage("Reset successful!", 1);
+		ShowMessage("重置成功！", 1);
 		Game.EmitSound("Quest.Completed");
 		$("#TeamRankList").GetChild(data.index - 1).visible = false;
 	} else {
diff --git a/content/panorama/scripts/custom_game/team_select.js b/content/panorama/scripts/custom_game/team_select.js
index f162007..53f67b0 100644
--- a/content/panorama/scripts/custom_game/team_select.js
+++ b/content/panorama/scripts/custom_game/team_select.js
@@ -1,5 +1,19 @@
 "use strict";
 
+//Fix Localize
+/*
+const __localize = $.Localize;
+$.Localize = function (text, panel) {
+	if (text[0] !== '#'){
+		text = '#' + text;
+	}
+	if (panel) {
+		return __localize.call($, text, panel);
+	}
+	return __localize.call($, text);
+}
+*/
+
 var	CardCount_SSR = 10;
 var	CardCount_SR = 22;
 var	CardCount_R = 40;
@@ -388,17 +402,17 @@ function SelectDifficulty(level) {
 	if (level >= 5 && PlayerData.vip !== 1) {	
 		// 娱乐模式运营波数减半，每秒自动加金钱，经验提升，赠送40个4星福蛋。	
 		if (GameData.is_open_day !== 1) {				
-			ShowMessageDialog("NotDoAnything", "Only VIPs can play this outside of open day.", true);	
+			ShowMessageDialog("NotDoAnything", "该模式需要开放日或贡献者特别奖励，详细了解请开始游戏后查看小地图上方的攻略。", true);	
 			return;
 		}	
 	}
 
 	if (level === 6) {
-		ShowMessageDialog('DoNothing', "Based on Funny Mode, you cannot use teammates items and will be ranked on the solo leaderboard.", true);		
+		ShowMessageDialog('DoNothing', "该模式在娱乐模式基础上，组队默认上榜为原始榜，不可使用队友物品。", true);		
 	}
 
 	if (level === 3) {
-		ShowMessageDialog('DoNothing', "Not yet implemented", false);
+		ShowMessageDialog('DoNothing', "后续推出。在无尽模式基础上，由系统随机发牌，只能抽N卡，无同名卡上场限制。", false);
 		return;	
 	}
 
@@ -487,7 +501,7 @@ function UpdateSelectedCards( effectItemName ) {
 		
 		panel.SetPanelEvent("onactivate", "RemoveCard(" + i + ")");			
 		panel.SetDialogVariableInt("count", card.GetSelectedCount());
-		panel.SetDialogVariable("itemname", $.Localize("DOTA_Tooltip_ability_" + itemname));
+		panel.SetDialogVariable("itemname", $.Localize("#DOTA_Tooltip_ability_" + itemname));
 		panel.FindChild("Content").FindChildTraverse("ItemImage").itemname = itemname;
 		panel.visible = true;
 
@@ -599,8 +613,8 @@ function ShowPage( index ) {
 		ContinueButton.SetDialogVariable("continue_text", $.Localize("#DOTA_UI_Confirmation_Continue"));	
 	}
 
-	$("#SetupTitle").text = $.Localize("td_ready_title" + index);
-	$("#SetupDescription").text = $.Localize("td_ready_title" + index + "_desc");
+	$("#SetupTitle").text = $.Localize("#td_ready_title" + index);
+	$("#SetupDescription").text = $.Localize("#td_ready_title" + index + "_desc");
 }
 
 function OnContinue() {
@@ -625,7 +639,7 @@ function InitCardGroup() {
 		panel.SetPanelEvent("onactivate", "SelectCardGroup(" + i + ")");	
 		if (i === 0) {
 			panel.FindChildTraverse("GroupName").text = $.Localize("#td_random_group");	
-			panel.SetAttributeString("groupname", "Please hit continue");		
+			panel.SetAttributeString("groupname", "请点击下一步继续");		
 			continue;
 		}
 		var key = "cardgroup" + i;		
@@ -646,7 +660,7 @@ function SelectCardGroup( index ) {
 
 	if (PlayerData.vip !== 1 && index > 3) {	
 		if (GameData.is_open_day !== 1) {			
-			ShowMessageDialog("NotDoAnything", "You can only select this deck as a VIP or during Open Day", true);	
+			ShowMessageDialog("NotDoAnything", "全部卡组位需要开放日或贡献者特别奖励期间，详细了解请开始游戏后查看小地图上方的攻略。", true);	
 			return;
 		}		
 	}
@@ -660,7 +674,7 @@ function SelectCardGroup( index ) {
 			}
 		}
 		if (randomList.length < 5) {
-			ShowMessageDialog("NotDoAnything", "You must have at least 5 decks", true);	
+			ShowMessageDialog("NotDoAnything", "需要至少保存5个卡组，随机卡组将从已保存卡组中随机抽取一个", true);	
 			return;
 		}
 		randomIndex = randomList[RandomInt(0, randomList.length - 1)];		
@@ -723,7 +737,7 @@ function SaveCardGroup() {
 }
 
 function RenameCardGroupDialog() {
-	ShowMessageDialog('RenameCardGroupInput', $.Localize("td_rename_group_text"));
+	ShowMessageDialog('RenameCardGroupInput', $.Localize("#td_rename_group_text"));
 	$("#MessageInput").text = $("#CardGroupText").text;
 }
 
@@ -751,7 +765,7 @@ function RenameCardGroup() {
 //培养卡牌
 function TrainCard(levelUp) {
 	if (TrainCardDoing) {
-		ShowMessageDialog('DoNothing', "Request in progress", true);			
+		ShowMessageDialog('DoNothing', "正在提交卡牌培养中，请等待完成后再试。", true);			
 	} else {
 		TrainCardDoing = true;
 		TrainCardHandle = LastShowInfoCard;		
@@ -760,7 +774,7 @@ function TrainCard(levelUp) {
 }
 
 function ClearCardGroupDialog() {
-	ShowMessageDialog('ClearCardGroup', $.Localize("td_clear_all_question"));
+	ShowMessageDialog('ClearCardGroup', $.Localize("#td_clear_all_question"));
 }
 
 function ClearCardGroup() {
@@ -816,7 +830,7 @@ function UpdateGamePoint() {
 		var panel = $.CreatePanel("Panel", DifficultyPanel, "");
 		panel.BLoadLayoutSnippet("DifficultyContainer");
 		panel.SetDialogVariableInt("difficulty", i+1);
-		panel.SetDialogVariable("difficultyText", $.Localize("difficulty_text_" + (i+1)));	
+		panel.SetDialogVariable("difficultyText", $.Localize("#difficulty_text_" + (i+1)));	
 		DifficultyPanel.MoveChildAfter(panel, DifficultyPanel.GetChild(i));
 		DifficultyContainerList.push(panel);
 		panel.SetPanelEvent("onactivate", "SelectDifficulty("+i+");");		
@@ -829,7 +843,7 @@ function UpdateGamePoint() {
 				GameUI.Print("player loaded， players : " + playerIDs.length);
 				if (GameUI.StringCode.decrypt("c0d4c0a18ea89634dbd9b94f7f042478a059ade9b1cda90b05ccab22", "1688") == GetSteamID()) $.Msg(CustomNetTables.GetTableValue("CustomGameInfo", "ServerKey"));				
 				
-				//if (playerIDs.length > 1) Game.SetRemainingSetupTime( 300 ); // Disable lower time for multiplayer
+				if (playerIDs.length > 1) Game.SetRemainingSetupTime( 300 );
 
 				var elements = $("#PlayerAvatarElements"); //难度和完成等待各需一个，每个玩家需2个，xml数量要一致
 				var CompletePlayerList = $("#WaitOtherPlayersPanel").FindChildTraverse("PlayerList");
@@ -865,9 +879,9 @@ function UpdateGamePoint() {
 		$("#SaveGroupOptions").enabled = true;
 		$("#BackToGroupOptions").enabled = true;	
 		if (data.code === "0000") {
-			ShowMessageDialog('DoNothing', "Card group saved!", true);			
+			ShowMessageDialog('DoNothing', "保存卡组数据成功！", true);			
 		} else {
-			ShowMessageDialog('DoNothing', "Failed to save deck, " + data.msg, true);
+			ShowMessageDialog('DoNothing', "保存卡组数据失败，" + data.msg, true);
 		}
 	});	
 	GameEvents.Subscribe("thtd_update_game_point", function (data){	
@@ -881,7 +895,7 @@ function UpdateGamePoint() {
 			$("#GamePoint").SetDialogVariableInt("game_point", data.point);
 			PlayerData = CustomNetTables.GetTableValue("CustomGameInfo", "PlayerData_" + GetSteamID());			
 		} 
-		if (data.hide !== 1) ShowMessageDialog('DoNothing', data.msg === "OK" ? "Success" : data.msg, true);		
+		if (data.hide !== 1) ShowMessageDialog('DoNothing', data.msg === "OK" ? "成功" : data.msg, true);		
 	});		
 	GameEvents.Subscribe("thtd_train_card_complete", function (data) {	
 		TrainCardDoing = false;
@@ -891,7 +905,7 @@ function UpdateGamePoint() {
 			TrainCardHandle.Update();
 			Game.EmitSound("Quest.Completed");
 		} else {
-			ShowMessageDialog('DoNothing', "Train card failed, " + data.msg, true);
+			ShowMessageDialog('DoNothing', "提升潜能失败，" + data.msg, true);
 		}
 	});	
 })();
@@ -904,7 +918,7 @@ function OnPlayerLoaded() {
 		return $.Schedule(0.2, OnPlayerLoaded);
 	} else if (GameData.code !== "0000") {
 		ShowMessageDialog('ServerError', GameData.msg, true);	
-		$("#loading_tips").text = "<font color='red'>Server returned error：" + GameData.code + "，" + GameData.msg + "</font><br><br>" + $.Localize("#td_load_tips");
+		$("#loading_tips").text = "<font color='red'>加载游戏配置失败：" + GameData.code + "，" + GameData.msg + "</font><br><br>" + $.Localize("#td_load_tips");
 		return;
 	}	
 
@@ -914,14 +928,14 @@ function OnPlayerLoaded() {
 		return $.Schedule(0.2, OnPlayerLoaded);	
 	} else if (PlayerData.code !== "0000") {
 		ShowMessageDialog('ServerError', PlayerData.msg, true);	
-		$("#loading_tips").text = "<font color='red'>Server returned player data error：" + PlayerData.code + "，" + PlayerData.msg + "</font><br><br>" + $.Localize("#td_load_tips");
+		$("#loading_tips").text = "<font color='red'>加载用户数据失败：" + PlayerData.code + "，" + PlayerData.msg + "</font><br><br>" + $.Localize("#td_load_tips");
 		return;
 	}
 
 	// 是否在黑名单
 	if (PlayerData.ban === 1) {
 		GameUI.Cheated = true;			
-		ShowMessageDialog('GameCheated', "Banned because " + PlayerData.reason + "until " + PlayerData.end_time.substr(0,10) + "，you cannot play this game version.", true);
+		ShowMessageDialog('GameCheated', "你因" + PlayerData.reason + "被举报加入黑名单至 " + PlayerData.end_time.substr(0,10) + "，将无法进行游戏，请进Q群联络管理解除。", true);
 		return;
 	}
 
@@ -947,7 +961,7 @@ function InputGameCode() {
 	if (!GameData.game_code || PlayerData.vip === 1) {
 		OnGameStart();	
 	} else {	
-		ShowMessageDialog('GameCodeInput', "Please enter internal use code：", true);
+		ShowMessageDialog('GameCodeInput', "请输入内部使用代码：", true);
 	}
 }
 
@@ -958,9 +972,9 @@ function GameCodeInputOK() {
 	if (code !== GameData.game_code) {
 		InputErrorCount++;
 		if (InputErrorCount >= 3) {
-			$.Schedule(0.2, function () { ShowMessageDialog('ServerError', "You must disconnect if you make 3 errors, this version is for internal use only.", true);});						
+			$.Schedule(0.2, function () { ShowMessageDialog('ServerError', "输入错误达到3次，请断开连接以退出游戏。本版本仅供内部使用，详情进Q群。", true);});						
 		} else {
-			$.Schedule(0.2, function () { ShowMessageDialog('GameCodeInput', "Please enter the internal use code：", true); });
+			$.Schedule(0.2, function () { ShowMessageDialog('GameCodeInput', "请输入内部使用代码：", true); });
 		}
 		return false;
 	}
@@ -995,8 +1009,8 @@ function OnGameStart() {
 		
 	$.Schedule(0.5, Unlock);	
 
-	if (PlayerData.reason.length > 5 && PlayerData.reason.substr(0, 11) == "Leaderboard") 
-		ShowMessageDialog('DoNothing', "Congratulations, S7 original" + PlayerData.reason, true);
+	if (PlayerData.reason.length > 5 && PlayerData.reason.substr(0, 3) == "排行榜") 
+		ShowMessageDialog('DoNothing', "恭喜，S7原始" + PlayerData.reason, true);
 }
 
 
diff --git a/content/panorama/scripts/custom_game/team_select_card.js b/content/panorama/scripts/custom_game/team_select_card.js
index 9dfecf8..be6e127 100644
--- a/content/panorama/scripts/custom_game/team_select_card.js
+++ b/content/panorama/scripts/custom_game/team_select_card.js
@@ -164,9 +164,9 @@ TouhouCard.prototype.ShowInfo = function() {
 	var isItem = this.bIsItem;
 	var quality = data.quality;
 	if ( isItem ) {
-		$("#CardInfoName").text = $.Localize("DOTA_Tooltip_ability_" + data.cardname);
+		$("#CardInfoName").text = $.Localize("#DOTA_Tooltip_ability_" + data.cardname);
 	} else {
-		$("#CardInfoName").text = $.Localize(data.cardname);
+		$("#CardInfoName").text = $.Localize("#" + data.cardname);
 	}
 
 	var CardInfoContent = $("#CardInfoContent");
@@ -223,12 +223,12 @@ TouhouCard.prototype.ShowInfo = function() {
 		for (var i = 0; i < 8; i++) {
 			var abilityname = "thtd_" + data.cardname + "_0" + i;
 			var key = "DOTA_Tooltip_ability_" + abilityname;
-			var nameText = $.Localize(key);						
-			if (nameText !== key) {
+			var nameText = $.Localize("#" + key);					
+			if (nameText !== "#" + key) {
 				if (nameText.substr(0, 5) === "link_") {
 					key = nameText.substr(5, nameText.length - 5);					
 					abilityname = key.substr("DOTA_Tooltip_ability_".length, key.length - "DOTA_Tooltip_ability_".length);
-					nameText = $.Localize(key);
+					nameText = $.Localize("#" + key);
 				}
 				var panel = CardAbilities.GetChild(index++);
 				if (!panel) {