mapaler
/
PADDashFormation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:mapaler/PADDashFormation into master

This commit is contained in:
枫谷剑仙 2020-10-21 19:04:28 +08:00
parent 7548638168 d2f5b2c814
commit fb12f405d5
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
languages/zh-CN.js
View File

@ -63,7 +63,7 @@ function parseSkillDescription(skill)
//觉醒名数组
const awokenName = ["HP+","攻击+","回复+","火盾","水盾","木盾","光盾","暗盾","自回","防封","防暗","防废","防毒","火+","水+","木+","光+","暗+","手指","心解","SB","火横","水横","木横","光横","暗横","U","SX","心+","协力","龙杀","神杀","恶魔杀","机杀","平衡杀","攻击杀","体力杀","回复杀","进化杀","觉醒杀","强化杀","卖钱杀","7c","5色破防","心追","全体 HP ","全体回复","破无效","武器觉醒","方块心追","5色溜","大防封","大手指","防云","防封条","大SB","满血强化","下半血强化","L盾","L解锁","10c","c珠","语音","奖励增加"," HP -","攻击-","回复-","大防暗","大防废","大防毒","掉废","掉毒"];
const ClumsN = ["左边第1竖列","左边第2竖列","左边第3竖列","右边第3竖列","右边第2竖列","右边第1竖列"];
const RowsN = ["最上1横行","上方第2横行","中间横行","下方第2横行","最下1横行"];
const RowsN = ["最上1横行","上方第2横行","下方第3横行","下方第2横行","最下1横行"];
//返回属性名
function attrN(i){return attrsName[i || 0] || ("未知属性" + i);}
//返回类型名
@ -1188,7 +1188,7 @@ function parseSkillDescription(skill)
case 183:
str = getAttrTypeString(flags(sk[0]),flags(sk[1])) + "宠物的";
if (sk[3] || sk[4]) str+= ` HP ${sk[2]==100?"全满":`${sk[2]}%以上`}时`;
if (sk[3]) str+= `${getFixedHpAtkRcvString({atk:sk[3]})}`;
if (sk[3] && sk[3] !== 100) str+= `${getFixedHpAtkRcvString({atk:sk[3]})}`;
if (sk[4]) str += `，受到的伤害减少${sk[4]}%`;
if (sk[6] || sk[7]) str+= ` HP ${sk[5]||sk[2]}%以下时`;
if (sk[6] || sk[7]) str+= `${getFixedHpAtkRcvString({atk:sk[6],rcv:sk[7]})}`;
@ -1223,7 +1223,7 @@ function parseSkillDescription(skill)
fullColor = nb(sk[0], attrsName);
str = fullColor.length>1?"同时":"相连";
str += `消除${sk[1]}个或以上的${getOrbsAttrString(sk[0])}宝珠时`;
if (sk[2] && sk[2] != 100) str += `，攻击力×${sk[2]/100}倍`;
if (sk[2] && sk[2] != 100) str += `，所有宠物的攻击力×${sk[2]/100}倍`;
if (sk[3]) str += `，结算时连击数+${sk[3]}`;
break;
case 193:

2
monsters-info/ckey.json
View File

@ -1 +1 @@
[{"code":"ja","ckey":{"card":"d367247acf7d8f749ce903f68a7bceb6","skill":"f460faeadb6afac84422cf6a69588639"},"updateTime":1602846168764},{"code":"en","ckey":{"card":"7eb1426179c4839177800bc33c4d4544","skill":"7cf237a2d0d074d3d47423f63efe9197"},"updateTime":1602660919447},{"code":"ko","ckey":{"card":"9a0d01c1bf8b6d1b70eacdc264ea499d","skill":"4d4d75ebe0016bc9e1198d35890d96ca"},"updateTime":1602660919447}]
[{"code":"ja","ckey":{"card":"84354373491da350f11fde36557b5fd3","skill":"f460faeadb6afac84422cf6a69588639"},"updateTime":1603034027392},{"code":"en","ckey":{"card":"7eb1426179c4839177800bc33c4d4544","skill":"7cf237a2d0d074d3d47423f63efe9197"},"updateTime":1602660919447},{"code":"ko","ckey":{"card":"9a0d01c1bf8b6d1b70eacdc264ea499d","skill":"4d4d75ebe0016bc9e1198d35890d96ca"},"updateTime":1602660919447}]

2
monsters-info/custom/chs.json
View File

File diff suppressed because one or more lines are too long

2
monsters-info/custom/cht.json
View File

File diff suppressed because one or more lines are too long

2
monsters-info/mon_ja.json
View File

File diff suppressed because one or more lines are too long

24
script.js
View File

@ -1213,17 +1213,24 @@ function initialize() {
const s_add_show_abilities = searchBox.querySelector("#add-show-abilities"); //是否显示三维
const s_add_show_abilities_with_awoken = searchBox.querySelector("#add-show-abilities-with-awoken"); //是否显示计算觉醒的三维
showSearch = function(searchArr) {
showSearch = function(searchArr)
{
editBox.show();
searchBox.classList.remove(className_displayNone);
const createCardHead = editBox.createCardHead;
searchMonList.classList.add(className_displayNone);
searchMonList.innerHTML = ""; //清空旧的
if (Array.isArray(searchMonList.originalHeads))
{
searchMonList.originalHeads.forEach(item=>item = null);
searchMonList.originalHeads = null;
}
if (searchArr.length > 0) {
let fragment = document.createDocumentFragment(); //创建节点用的临时空间
const fragment = document.createDocumentFragment(); //创建节点用的临时空间
//获取原始排序的头像列表
additionalOption = { //搜索列表的额外选项
const additionalOption = { //搜索列表的额外选项
showAwoken: s_add_show_awoken.checked,
showCD: s_add_show_CD.checked,
showAbilities: s_add_show_abilities.checked,
@ -1234,6 +1241,11 @@ function initialize() {
const headsArray = sortHeadsArray(searchMonList.originalHeads);
headsArray.forEach(head => fragment.appendChild(head));
searchMonList.appendChild(fragment);
//目前这里添加会导致无限循环，无法后退
//const idArr = searchMonList.originalHeads.map(head=>head.card.id);
//const state = {searchArr:idArr,mid:editBox.mid};
//history.pushState(state, null, location);
}
searchMonList.classList.remove(className_displayNone);
};
@ -1675,13 +1687,13 @@ function initialize() {
creatNewUrl();
editBox.hide();
};
window.onkeydown = function(e) {
window.addEventListener("keydown",function(event) {
if (!editBox.classList.contains(className_displayNone)) {
if (e.keyCode == 27) { //按下ESC时，自动关闭编辑窗
if (event.key === "Escape") { //按下ESC时，自动关闭编辑窗
btnCancel.onclick();
}
}
};
});
btnNull.onclick = function() { //空位置
const mon = new Member();
const teamBigBox = teamBigBoxs[editBox.memberIdx[0]];