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

@@ -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 {