From a1b99cc5d65f2382bd3555de2695db033d98b6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= <mapaler@163.com>
Date: Mon, 27 Jan 2020 02:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=8F=E5=8A=9B=E8=A7=89?=
 =?UTF-8?q?=E9=86=92=E7=9A=84=E8=AE=A1=E7=AE=97=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 universal_function.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/universal_function.js b/universal_function.js
index ff8f35fb..d4fb7e28 100644
--- a/universal_function.js
+++ b/universal_function.js
@@ -256,18 +256,20 @@ function calculateAbility(member = null, assist = null, solo = true)
 			0;
 		//console.log("基础值：%d，加蛋值：%d，觉醒x%d增加：%d，潜觉增加：%d",n_base,n_plus,awokenCount,n_awoken,n_latent);
 		let reValue = n_base + n_plus + n_awoken + n_latent + (n_assist_base + n_assist_plus) * bonusScale[idx];
+		if (awokenList.indexOf(30)>=0)console.log(member,reValue);
 		//协力觉醒的倍率
 		reValue = Math.round(awokenScale[idx].reduce(function(previous,aw){
 			const awokenCount = awokenList.filter(function(a){return a==aw.index;}).length; //每个协力觉醒的数量
 			if (awokenCount>0)
 			{
-				return previous * aw.scale * awokenCount;
+				return previous * Math.pow(aw.scale,awokenCount);
 			}
 			else
 			{
 				return previous;
 			}
 		},reValue));
+		if (awokenList.indexOf(30)>=0)console.log(reValue,awokenList.filter(function(a){return a==30;}).length);
 
 		if (idx<2 && reValue<1) reValue = 1; //HP和ATK最低为1
 		return reValue;