danoniplus 36.6.8 → 36.6.10

package/README.md

@@ -1,10 +1,8 @@
 # Dancing☆Onigiri (CW Edition)
 
-[![CodeFactor](https://www.codefactor.io/repository/github/cwtickle/danoniplus/badge)](https://www.codefactor.io/repository/github/cwtickle/danoniplus)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/1213a18348c34328ac4f10c9e8a2b987)](https://app.codacy.com/gh/cwtickle/danoniplus/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![CodeQL](https://github.com/cwtickle/danoniplus/workflows/CodeQL/badge.svg)](https://github.com/cwtickle/danoniplus/actions?query=workflow%3ACodeQL)
 [![Discord](https://img.shields.io/discord/698460971231870977?style=flat&logo=discord&logoColor=%23ffffff&label=Discord&labelColor=%236666ff&color=%23000066)](https://discord.gg/YVWUdUGyMy)  
-[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/cwtickle/danoniplus?sort=semver)](https://github.com/cwtickle/danoniplus/security/policy)
+[![GitHub release](https://img.shields.io/github/package-json/v/cwtickle/danoniplus/support%2Fv36)](https://github.com/cwtickle/danoniplus/security/policy)
 [![GitHub All Releases](https://img.shields.io/github/downloads/cwtickle/danoniplus/total?color=%23ff3399&label=downloads%20%28recently%29)](https://github.com/cwtickle/danoniplus/releases)
 [![GitHub](https://img.shields.io/github/license/cwtickle/danoniplus)](https://github.com/cwtickle/danoniplus/blob/develop/LICENSE)  
 ![AboutDanOni](http://cw7.sakura.ne.jp/danoni/wiki/danonitop.png)

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/12/07
+ * Revised : 2025/01/28
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 36.6.8`;
-const g_revisedDate = `2024/12/07`;
+const g_version = `Ver 36.6.10`;
+const g_revisedDate = `2025/01/28`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -7900,7 +7900,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 						// g付きの場合は矢印グループから対象の矢印番号を検索
 						const groupVal = setIntVal(val.slice(1));
 						for (let j = 0; j < keyNum; j++) {
-							if (g_keyObj[`color${_keyCtrlPtn}`][j] === groupVal) {
+							if (g_keyObj[`color${g_keyObj.currentKey}_0`][j] === groupVal) {
 								colorVals.push(j);
 							}
 						}
@@ -9902,6 +9902,10 @@ const mainInit = _ => {
 
 		arrowOFF: (_j, _k, _cnt) => {
 
+			// 直前のフリーズアローが未判定で、自身の判定範囲がキター(O.K.)の範囲内のとき判定対象を矢印側へ移す
+			// 本来はシャキン(Great)の範囲内としたいところだが、実装が複雑になるため上記条件とする
+			judgeNextFunc.frzOFF(_j, g_workObj.judgFrzCnt[_j] + 1, _cnt);
+
 			if (g_workObj.judgArrowCnt[_j] === _k - 1 && _cnt <= g_judgObj.arrowJ[g_judgPosObj.shakin]) {
 				const prevArrowName = `arrow${_j}_${g_workObj.judgArrowCnt[_j]}`;
 				const prevArrow = g_attrObj[prevArrowName];
@@ -9929,7 +9933,7 @@ const mainInit = _ => {
 				const prevFrz = g_attrObj[prevFrzName];
 
 				// 自身より前のフリーズアローが移動中かつキター(O.K.)の領域外のとき
-				if (prevFrz.isMoving && prevFrz.cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
+				if (prevFrz && prevFrz.isMoving && prevFrz.cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.kita]) {
 
 					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行う
 					if (prevFrz.cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai] && !prevFrz.judgEndFlg) {
@@ -10190,7 +10194,7 @@ const mainInit = _ => {
 			judgeMotionFunc[`${_name}NG`](_j, _k, frzName, currentFrz.cnt);
 
 		} else {
-			currentFrz.frzBarLength -= g_workObj.currentSpeed;
+			currentFrz.frzBarLength -= movY * currentFrz.dir;
 			if (currentFrz.frzBarLength > 0) {
 				currentFrz.y -= movY;
 				$id(frzName).top = wUnit(currentFrz.y);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "36.6.8",
+  "version": "36.6.10",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "index.js",
   "scripts": {