Merge pull request #931 from cwtickle/develop

[ver18.9.1] 同一レーン上に通常矢印とフリーズアローが短い間隔で存在するときの問題を修正

SECURITY.md

@@ -15,7 +15,7 @@ v9, v16の対応終了時期はv19リリース開始時を予定しています
 
 | Version | Supported          | Latest Version | First Release | End of Support |
 | ------- | ------------------ |----------------|---------------|----------------|
-| v18     | :heavy_check_mark: |[v18.9.0](../../releases/tag/v18.9.0)          |2020-10-25|-|
+| v18     | :heavy_check_mark: |[v18.9.1](../../releases/tag/v18.9.1)          |2020-10-25|-|
 | v17     | :heavy_check_mark: |[v17.5.7](../../releases/tag/v17.5.7)          |2020-09-27|(At Release v20)|
 | v16     | :warning:          |[v16.4.9](../../releases/tag/v16.4.9)          |2020-08-06|(At Release v19)|
 | v15     | :x:                |[v15.7.5 (final)](../../releases/tag/v15.7.5)  |2020-05-13|2020-10-25|

js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2021/01/01
+ * Revised : 2021/01/03
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 18.9.0`;
-const g_revisedDate = `2021/01/01`;
+const g_version = `Ver 18.9.1`;
+const g_revisedDate = `2021/01/03`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -8666,14 +8666,15 @@ function judgeArrow(_j) {
 	const arrowName = `arrow${_j}_${currentNo}`;
 	const judgArrow = document.getElementById(arrowName);
 
-	if (judgArrow !== null) {
-		const difFrame = g_attrObj[arrowName].cnt;
-		const difCnt = Math.abs(difFrame);
+	const fcurrentNo = g_workObj.judgFrzCnt[_j];
+	const frzName = `frz${_j}_${fcurrentNo}`;
+	const judgFrz = document.getElementById(frzName);
 
-		if (difCnt <= g_judgObj.arrowJ[C_JDG_UWAN]) {
-			const [resultFunc, resultJdg] = checkJudgment(difCnt);
-			resultFunc(difFrame);
-			countFastSlow(difFrame, g_headerObj.justFrames);
+	function judgeTargetArrow(_difCnt, _difFrame) {
+		if (_difCnt <= g_judgObj.arrowJ[C_JDG_UWAN]) {
+			const [resultFunc, resultJdg] = checkJudgment(_difCnt);
+			resultFunc(_difFrame);
+			countFastSlow(_difFrame, g_headerObj.justFrames);
 
 			const stepDivHit = document.querySelector(`#stepHit${_j}`);
 			stepDivHit.style.top = `${g_attrObj[arrowName].prevY - parseFloat($id(`stepRoot${_j}`).top) - 15}px`;
@@ -8684,30 +8685,52 @@ function judgeArrow(_j) {
 
 			document.querySelector(`#arrowSprite${g_attrObj[arrowName].dividePos}`).removeChild(judgArrow);
 			g_workObj.judgArrowCnt[_j]++;
-			return;
 		}
 	}
 
-	const fcurrentNo = g_workObj.judgFrzCnt[_j];
-	const frzName = `frz${_j}_${fcurrentNo}`;
-	const judgFrz = document.getElementById(frzName);
-
-	if (judgFrz !== null) {
-		const difFrame = g_attrObj[frzName].cnt;
-		const difCnt = Math.abs(difFrame);
-
-		if (difCnt <= g_judgObj.frzJ[C_JDG_SFSF] && !g_attrObj[frzName].judgEndFlg) {
+	function judgeTargetFrzArrow(_difCnt, _difFrame) {
+		if (_difCnt <= g_judgObj.frzJ[C_JDG_SFSF] && !g_attrObj[frzName].judgEndFlg) {
 			if (g_headerObj.frzStartjdgUse &&
 				(g_workObj.judgFrzHitCnt[_j] === undefined || g_workObj.judgFrzHitCnt[_j] <= fcurrentNo)) {
-				const [resultFunc] = checkJudgment(difCnt);
-				resultFunc(difFrame);
-				countFastSlow(difFrame, g_headerObj.justFrames);
+				const [resultFunc] = checkJudgment(_difCnt);
+				resultFunc(_difFrame);
+				countFastSlow(_difFrame, g_headerObj.justFrames);
 				g_workObj.judgFrzHitCnt[_j] = fcurrentNo + 1;
 			}
 			changeHitFrz(_j, fcurrentNo, `frz`);
-			return;
 		}
 	}
+
+	if (judgArrow !== null && judgFrz !== null) {
+		const difFrame = g_attrObj[arrowName].cnt;
+		const difCnt = Math.abs(difFrame);
+		const frzDifFrame = g_attrObj[frzName].cnt;
+		const frzDifCnt = Math.abs(frzDifFrame);
+
+		if (difFrame < frzDifFrame) {
+			judgeTargetArrow(difCnt, difFrame);
+		} else {
+			judgeTargetFrzArrow(frzDifCnt, frzDifFrame);
+		}
+		return;
+	}
+
+	if (judgArrow !== null) {
+		const difFrame = g_attrObj[arrowName].cnt;
+		const difCnt = Math.abs(difFrame);
+
+		judgeTargetArrow(difCnt, difFrame);
+		return;
+	}
+
+	if (judgFrz !== null) {
+		const difFrame = g_attrObj[frzName].cnt;
+		const difCnt = Math.abs(difFrame);
+
+		judgeTargetFrzArrow(difCnt, difFrame);
+		return;
+	}
+
 	$id(`stepDiv${_j}`).display = C_DIS_INHERIT;
 }