Skip to content

Commit

Permalink
Merge pull request #1299 from cwtickle/develop
Browse files Browse the repository at this point in the history 
[ver27.8.0] 譜面明細画面周りのボタン仕様、ショートカットキー仕様を見直し
  • Loading branch information
@cwtickle
cwtickle committed Jul 31, 2022
2 parents 22d3fcb + b283a5a commit 882573a
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 23 deletions.
2 changes: 1 addition & 1 deletion SECURITY.md
View file
Expand Up @@ -16,7 +16,7 @@ v19, v25の対応終了時期はv28リリース開始時を予定しています

| Version | Supported | Latest Version | Logs | First Release | End of Support |
| ------- | ------------------ |----------------|------|---------------|----------------|
| v27 | :heavy_check_mark: |[v27.7.0](https://github.com/cwtickle/danoniplus/releases/tag/v27.7.0) |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v27)|2022-03-18|-|
| v27 | :heavy_check_mark: |[v27.8.0](https://github.com/cwtickle/danoniplus/releases/tag/v27.8.0) |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v27)|2022-03-18|-|
| v26 | :heavy_check_mark: |[v26.7.3](https://github.com/cwtickle/danoniplus/releases/tag/v26.7.3) |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v26)|2022-01-30|(At Release v29)|
| v25 | :warning: |[v25.5.9](https://github.com/cwtickle/danoniplus/releases/tag/v25.5.9) |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v25)|2022-01-04|(At Release v28)|
| v24 | :heavy_check_mark: |[v24.6.8](https://github.com/cwtickle/danoniplus/releases/tag/v24.6.8) |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v24)|2021-10-24|(At Release v33)|
Expand Down
44 changes: 27 additions & 17 deletions js/danoni_main.js
View file
Expand Up @@ -4,12 +4,12 @@
*
* Source by tickle
* Created : 2018/10/08
* Revised : 2022/07/01
* Revised : 2022/07/31
*
* https://github.com/cwtickle/danoniplus
*/
const g_version = `Ver 27.7.0`;
const g_revisedDate = `2022/07/01`;
const g_version = `Ver 27.8.0`;
const g_revisedDate = `2022/07/31`;
const g_alphaVersion = ``;

// カスタム用バージョン (danoni_custom.js 等で指定可)
Expand Down Expand Up @@ -4259,45 +4259,55 @@ const createOptionWindow = _sprite => {
if (g_headerObj.scoreDetailUse) {
spriteList.speed.appendChild(
createCss2Button(`btnGraph`, `i`, _ => true, {
x: 415, y: 0, w: 23, h: 23, siz: C_SIZ_JDGCNTS, title: g_msgObj.graph,
x: -25, y: -60, w: 30, h: 30, siz: C_SIZ_JDGCHARA, title: g_msgObj.graph,
resetFunc: _ => setScoreDetail(), cxtFunc: _ => setScoreDetail(),
}, g_cssObj.button_Mini)
);
g_stateObj.scoreDetailViewFlg = false;
const scoreDetail = createEmptySprite(optionsprite, `scoreDetail`, g_windowObj.scoreDetail, g_cssObj.settings_DifSelector);
const viewScText = _ => createScText(lnkScoreDetail, `ScoreDetail`, { targetLabel: `lnkScoreDetail`, x: -10 });

/**
* 譜面明細表示の切替
* @param {number} _val
*/
const changeScoreDetail = (_val = 1) => {
const changeScoreDetail = (_val = 0) => {
if (g_currentPage === `difSelector`) {
resetDifWindow();
}
g_stateObj.scoreDetailViewFlg = true;
scoreDetail.style.visibility = `visible`;

// 表示内容を非表示化、ボタン色をデフォルトに戻す
$id(`detail${g_stateObj.scoreDetail}`).visibility = `hidden`;
setSetting(_val, `scoreDetail`);
viewScText();
document.getElementById(`lnk${g_stateObj.scoreDetail}G`).classList.replace(g_cssObj.button_Setting, g_cssObj.button_Default);

// 選択先を表示、ボタン色を選択中に変更
g_stateObj.scoreDetail = g_settings.scoreDetails[_val];
$id(`detail${g_stateObj.scoreDetail}`).visibility = `visible`;
document.getElementById(`lnk${g_stateObj.scoreDetail}G`).classList.replace(g_cssObj.button_Default, g_cssObj.button_Setting);
};

multiAppend(scoreDetail,
createScoreDetail(`Speed`),
createScoreDetail(`Density`),
createScoreDetail(`ToolDif`, false),
makeSettingLblCssButton(`lnkScoreDetailB`, `- - -`, 0, _ => changeScoreDetail(-1),
g_lblPosObj.lnkScoreDetailB, g_cssObj.button_RevON),
makeSettingLblCssButton(`lnkScoreDetail`, `${getStgDetailName(g_stateObj.scoreDetail)}`, 0, _ => changeScoreDetail(),
Object.assign(g_lblPosObj.lnkScoreDetail, {
cxtFunc: _ => changeScoreDetail(-1),
}), g_cssObj.button_RevON),
);
viewScText();
g_settings.scoreDetails.forEach((sd, j) => {
scoreDetail.appendChild(
makeDifLblCssButton(`lnk${sd}G`, getStgDetailName(sd), j, _ => changeScoreDetail(j), { w: C_LEN_DIFCOVER_WIDTH, btnStyle: (g_stateObj.scoreDetail === sd ? `Setting` : `Default`) })
);
createScText(document.getElementById(`lnk${sd}G`), sd, { targetLabel: `lnk${sd}G`, x: -10 });
});
}

/**
* 譜面明細表示／非表示ボタンの処理
*/
const setScoreDetail = _ => {
if (g_currentPage === `difSelector`) {
resetDifWindow();
g_stateObj.scoreDetailViewFlg = false;
}
const scoreDetail = document.querySelector(`#scoreDetail`);
const detailObj = document.querySelector(`#detail${g_stateObj.scoreDetail}`);
const visibles = [`hidden`, `visible`];
Expand Down Expand Up @@ -4439,7 +4449,7 @@ const createOptionWindow = _sprite => {
const baseLabel = (_bLabel, _bLabelname, _bAlign) =>
document.querySelector(`#detail${_name}`).appendChild(
createDivCss2Label(`${_bLabel}`, `${_bLabelname}`, {
x: 10, y: 65 + _pos * 20, w: 100, h: 20, siz: C_SIZ_DIFSELECTOR, align: _bAlign,
x: 10, y: 105 + _pos * 20, w: 100, h: 20, siz: C_SIZ_DIFSELECTOR, align: _bAlign,
})
);
if (document.querySelector(`#data${_label}`) === null) {
Expand Down Expand Up @@ -4544,7 +4554,7 @@ const createOptionWindow = _sprite => {
makeDifInfoLabel(`dataArrowInfo`, ``, g_lblPosObj.dataArrowInfo),
makeDifInfoLabel(`lblArrowInfo2`, ``, g_lblPosObj.lblArrowInfo2),
makeDifInfoLabel(`dataArrowInfo2`, ``, g_lblPosObj.dataArrowInfo2),
makeSettingLblCssButton(`lnkDifInfo`, g_lblNameObj.s_print, 0, _ => {
makeDifLblCssButton(`lnkDifInfo`, g_lblNameObj.s_print, 8, _ => {
copyTextToClipboard(
`****** ${g_lblNameObj.s_printTitle} [${g_version}] ******\r\n\r\n`
+ `\t${g_lblNameObj.s_printHeader}\r\n\r\n${printData}`, g_msgInfoObj.I_0003
Expand Down
21 changes: 17 additions & 4 deletions js/lib/danoni_constants.js
View file
Expand Up @@ -5,7 +5,7 @@
*
* Source by tickle
* Created : 2019/11/19
* Revised : 2022/07/01 (v27.7.0)
* Revised : 2022/07/31 (v27.8.0)
*
* https://github.com/cwtickle/danoniplus
*/
Expand Down Expand Up @@ -207,7 +207,7 @@ const updateWindowSiz = _ => {
x: 140, y: 70, w: 275, h: 150, overflow: `auto`,
},
lnkDifInfo: {
x: 10, y: 30, w: 100, borderStyle: `solid`,
w: C_LEN_DIFCOVER_WIDTH, borderStyle: `solid`,
},

/** ディスプレイ画面 */
Expand Down Expand Up @@ -1192,8 +1192,12 @@ const g_shortcutObj = {
KeyV: { id: `lnkVolumeR` },

KeyI: { id: `btnGraph` },
ShiftLeft_KeyQ: { id: `lnkScoreDetailB` },
KeyQ: { id: `lnkScoreDetail` },
Digit1: { id: `lnkSpeedG` },
Digit2: { id: `lnkDensityG` },
Digit3: { id: `lnkToolDifG` },
Numpad1: { id: `lnkSpeedG` },
Numpad2: { id: `lnkDensityG` },
Numpad3: { id: `lnkToolDifG` },
KeyP: { id: `lnkDifInfo` },
KeyZ: { id: `btnSave` },

Expand All @@ -1212,6 +1216,15 @@ const g_shortcutObj = {
ArrowDown: { id: `btnDifD` },
ArrowUp: { id: `btnDifU` },

KeyI: { id: `btnGraph` },
Digit1: { id: `lnkSpeedG` },
Digit2: { id: `lnkDensityG` },
Digit3: { id: `lnkToolDifG` },
Numpad1: { id: `lnkSpeedG` },
Numpad2: { id: `lnkDensityG` },
Numpad3: { id: `lnkToolDifG` },
KeyP: { id: `lnkDifInfo` },

Escape: { id: `btnBack` },
Space: { id: `btnKeyConfig` },
Enter: { id: `lnkDifficulty` },
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "danoniplus",
"version": "27.7.0",
"version": "27.8.0",
"description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 882573a

Please sign in to comment.