From 4ccf738aaaca203c57ee25756535d6a87ab61651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Mon, 3 Feb 2020 19:40:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=8D=E5=88=B6=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script.js b/script.js index a20f3c0b..1b0927d1 100644 --- a/script.js +++ b/script.js @@ -115,7 +115,7 @@ MemberAssist.prototype.loadFromMember = function(m){ this.id = m.id; if (m.level != undefined) this.level = m.level; if (m.awoken != undefined) this.awoken = m.awoken; - if (m.plus != undefined && m.plus instanceof Array && m.plus.length>=3 && (m.plus[0]+m.plus[1]+m.plus[2])>0) this.plus = m.plus; + if (m.plus != undefined && m.plus instanceof Array && m.plus.length>=3 && (m.plus[0]+m.plus[1]+m.plus[2])>0) this.plus = JSON.parse(JSON.stringify(m.plus)); if (m.skilllevel != undefined) this.skilllevel = m.skilllevel; }; //正式队伍 @@ -135,10 +135,10 @@ MemberTeam.prototype.loadFromMember = function(m){ this.id = m.id; if (m.level != undefined) this.level = m.level; if (m.awoken != undefined) this.awoken = m.awoken; - if (m.plus != undefined && m.plus instanceof Array && m.plus.length>=3 && (m.plus[0]+m.plus[1]+m.plus[2])>0) this.plus = m.plus; - if (m.latent != undefined && m.latent instanceof Array && m.latent.length>=1) this.latent = m.latent; + if (m.plus != undefined && m.plus instanceof Array && m.plus.length>=3 && (m.plus[0]+m.plus[1]+m.plus[2])>0) this.plus = JSON.parse(JSON.stringify(m.plus)); + if (m.latent != undefined && m.latent instanceof Array && m.latent.length>=1) this.latent = JSON.parse(JSON.stringify(m.latent)); if (m.sawoken != undefined) this.sawoken = m.sawoken; - if (m.ability != undefined && m.ability instanceof Array && m.plus.length>=3) this.ability = m.ability; + if (m.ability != undefined && m.ability instanceof Array && m.plus.length>=3) this.ability = JSON.parse(JSON.stringify(m.ability)); if (m.skilllevel != undefined) this.skilllevel = m.skilllevel; }; @@ -1363,8 +1363,9 @@ function interchangeCard(formArr,toArr) formation.teams[toArr[0]][toArr[1]][toArr[2]] = from; if (!isCopy) formation.teams[formArr[0]][formArr[1]][formArr[2]] = to; - const formationData = creatNewUrl({returnObj:true}); //刷新URL - formation.loadObj(formationData); + //const formationData = creatNewUrl({returnObj:true}); + //formation.loadObj(formationData); + creatNewUrl(); //刷新URL refreshAll(formation); //刷新全部 } //改变一个怪物头像 @@ -2019,7 +2020,6 @@ function refreshFormationAwokenCount(awokenDom,teams){ function refreshAbility(abilityDom,team,idx){ const memberData = team[0][idx]; const assistData = team[1][idx]; - const bonusScale = [0.1,0.05,0.15]; //辅助宠物附加的属性倍率 //基底三维，如果辅助是武器，还要加上辅助的觉醒 const mainAbility = calculateAbility(memberData, assistData, solo); if (mainAbility && memberData.ability)