From 33852b8f9f35f2c72a9810b44caa3a0d12f6ec22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Wed, 28 Aug 2024 02:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8A=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E9=80=A0=E6=88=90=E7=9A=84=E6=96=B0BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script-universal_function.js | 9 +++++---- service-worker.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/script-universal_function.js b/script-universal_function.js index bd5b673d..5fce9d7c 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -820,10 +820,11 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) { //地下城强化 const dge = formation.dungeonEnchance; const dgeRate = [dge.rate.hp, dge.rate.atk, dge.rate.rcv]; - const isDge = (memberAttrsTypesWithWeapon=>{ + const isDge = (()=>{ + const memberAttrsTypesWithWeapon = typeof member.getAttrsTypesWithWeapon === "function" ? member.getAttrsTypesWithWeapon(assist) : memberCard; const baseBool = dge.rarities.includes(memberCard.rarity) //符合星级 - || dge?.collabs?.includes(memberCard.collabId) //符合合作 - ||dge?.gachas?.some(n=>memberCard.gachaIds.includes(n)); //符合抽蛋桶 + || dge?.collabs?.includes(memberCard.collabId) //符合合作 + || dge?.gachas?.some(n=>memberCard.gachaIds.includes(n)); //符合抽蛋桶 return { awoken: baseBool //计算武器觉醒 || memberAttrsTypesWithWeapon.attrs.some(attr=>dge.attrs.includes(attr)) //符合属性 @@ -834,7 +835,7 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) { || memberCard.types.some(type=>dge.types.includes(type)) //符合类型 , }; - })(member.getAttrsTypesWithWeapon(assist)); + })(); //地下城阴阳加护强化 if (dge.benefit) { //当存在加护 diff --git a/service-worker.js b/service-worker.js index 377bd6d1..afae1342 100644 --- a/service-worker.js +++ b/service-worker.js @@ -33515,7 +33515,7 @@ const cachesMap = new Map([ ], [ "script-universal_function.js", - "d6f10d009ef4d6b6cae7d833ac3a7422" + "c1aa9336465c19f92f53d5a3086ece6f" ], [ "script.js",