去除多余的证书

This commit is contained in:
枫谷剑仙 2020-09-04 21:39:06 +08:00
parent 98145005c7
commit b19acd0916
2 changed files with 13 additions and 27 deletions

View File

@ -1,22 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDsjCCApqgAwIBAgIQE2HEfqrywoJPyxEVjlLbQTANBgkqhkiG9w0BAQsFADBn
MSswKQYDVQQLDCJDcmVhdGVkIGJ5IGh0dHA6Ly93d3cuZmlkZGxlcjIuY29tMRUw
EwYDVQQKDAxET19OT1RfVFJVU1QxITAfBgNVBAMMGERPX05PVF9UUlVTVF9GaWRk
bGVyUm9vdDAeFw0xNzEwMjAxMjU1MDlaFw0yMzEwMjAxMjU1MDlaMGcxKzApBgNV
BAsMIkNyZWF0ZWQgYnkgaHR0cDovL3d3dy5maWRkbGVyMi5jb20xFTATBgNVBAoM
DERPX05PVF9UUlVTVDEhMB8GA1UEAwwYRE9fTk9UX1RSVVNUX0ZpZGRsZXJSb290
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6zsfhByuMRwEGWPEVyVX
cJzHfCvoE2bW6G4+gOjWXJdl+O14xwdNseD1nlz3oWVhJ+g1LMoEwo07lmUgO7l4
97mznPLqUTq/F3RAyqtUrLFFNH96dy8Je3x2RfgcbkHyaC5/CyduvpFU7MyrUJQ4
ls8glXQ6a7aShvT3Ddmfgx5vWPxJuCTdliPKepy235S6vbqImP/e/6t4pffRoiwD
nW2/UMK0WlGMSG6LYlQaQ2Zr5/d0l9QvKi5P5cPupw9vNUS0nUU1L3+gCoUGbs8h
5svhSmQjaO3QcNUPupLjoHFGIt6XUPiOxgk0ujfXydEwNUDq0NaCiwqHDYbcir2a
6QIDAQABo1owWDATBgNVHSUEDDAKBggrBgEFBQcDATASBgNVHRMBAf8ECDAGAQH/
AgEAMB0GA1UdDgQWBBQDjl0k6zbHiFKTBTjhbM3NLb3/+DAOBgNVHQ8BAf8EBAMC
AQYwDQYJKoZIhvcNAQELBQADggEBAGRQlSmpHmHSdliBSudtb20kpTGIjiB649fD
JPOphWGgZwBn6azsawNX4pty4fp+3Y/bWTFehTJwV0iNs9mLLDSl+xk4PFWzH+me
aWEmlptHOG1/xLtXDOQOS0H6Wp21ufiagDlCXkFBujt/kX1izrFfMf/jHUBUJ/qp
wNbVFOaC3lMFF4nUictjsXS+q1M2R3/d0sMLtBBXwPGkbUyMH3VcRTURFGgqIR8Y
oXmL1gy8BqE9cRp4AcH45rUtrHuyOiaJ7qTa/YW3IXnW4/O+V2kHa3WWCAlwMeki
4wwx3krjOFZK9dH9+yTQ065aiB7amgpA7BONkmvO7f0wHIx9fds=
-----END CERTIFICATE-----

View File

@ -537,13 +537,22 @@ function countTeamHp(memberArr, leader1id, leader2id, solo)
let hp = m.ability ? m.ability[0] : 0;
if (!hp) return 0;
const card = Cards[m.id];
hp = Math.round(hp * memberHpMul(card,ls2,memberArr,solo));
hp = Math.round(hp * memberHpMul(card,ls1,memberArr,solo));
hp = hp1 = Math.round(hp * memberHpMul(card,ls2,memberArr,solo));//战友队长技
hp = hp2 = Math.round(hp * memberHpMul(card,ls1,memberArr,solo));//我方队长技
/*
let hp1,hp2;
hp1 = hp * memberHpMul(card,ls2,memberArr,solo);
hp = Math.round(hp1);
hp2 = hp * memberHpMul(card,ls1,memberArr,solo);
hp = Math.round(hp2);
console.log("%s 第1次倍率血量%s(%s)第2次倍率血量%s(%s)",Cards[m.id].otLangName["chs"],Math.round(hp1),hp1,Math.round(hp2),hp2);
*/
return hp;
});
console.log('单个队伍血量:',mHpArr,mHpArr.reduce((p,c)=>p+c));
//console.log('单个队伍血量:',mHpArr,mHpArr.reduce((p,c)=>p+c));
function memberHpMul(card,ls,memberArr,solo)
{
@ -626,7 +635,6 @@ function countTeamHp(memberArr, leader1id, leader2id, solo)
break;
case 2: //全是转生、超转生8格潜觉
scale = (trueMemberCardsArr.length>0 && trueMemberCardsArr.every(card=>isReincarnated(card))) ? sk[1]/100 : 1;
console.log(trueMemberCardsArr,scale)
break;
}
break;