npm - danoniplus - Versions diffs - 29.4.1 → 30.1.1 - Mend

danoniplus 29.4.1 → 30.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/danoni/danoni5.html +256 -0
package/js/danoni_main.js +245 -92
package/js/lib/danoni_constants.js +7 -2
package/js/template/danoni_setting.js +9 -1
package/package.json +1 -1

package/danoni/danoni5.html ADDED Viewed

@@ -0,0 +1,256 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+<meta charset="utf-8">
+<script src="../js/danoni_main.js" charset="UTF-8"></script>
+<title>Dancing★Onigiri</title>
+<style type="text/css">
+<!--//
+a:link   { color:#BAB7E0;}
+a:visited{ color:#BAB7E0;}
+a:active { color:#CCCCCC;}
+body{
+	font-family:"Arial","メイリオ","MS P ゴシック",sans-serif;
+	scrollbar-base-color:"black";
+	scrollbar-arrow-color:"white";
+	color:#cccccc;
+	background-color:#000011;
+	font-size:14px;
+}
+table{
+	border:0;
+	border-collapse:collapse;
+	width:800px;
+	margin:auto;
+}
+th,td{padding:0;}
+a{ text-decoration: none; }
+a:hover  { color:#FF9900; text-decoration: underline; }
+//-->
+</style>
+</head>
+<body>
+<table><tr><td>
+<p style="text-align:center;">
+	<span style="font-size:32px;">Preview</span>
+</p>
+<hr>
+		<input type="hidden" name="dos" id="dos" value='
+|musicTitle=Defeat*comma*I Doll,月人(MoonWind),|
+|difData=Tr,Transform,3.5,70,2,7$14,Normal,3.5|
+|setColor=#9999ff,#99ffff,#ffffff,#ffff99,#ff9966|
+|frzColor=#00ffff,#6600ff,#cccc33,#999933$#99ff99,#99ff99,#cccc33,#999933$#00ffff,#6600ff,#cccc33,#999933$#cc99ff,#9966ff,#cccc33,#999933|
+|startFrame=0|blankFrame=197|
+|endFrame=3:08|
+|keyExtraList=Tr|
+|minWidthTr=800|
+|charaTr=
+aleft,adown,aup,aright,aspace,bleft,bleftdia,bdown,bspace,bup,brightdia,bright,cleft,cdown,cup,cright,dleft,ddown,dup,dright,eleft,edown,eup,eright,fleft,fdown,fup,fright,gleft,gleftdia,gdown,gspace,gup,grightdia,gright,oni,hleft,hleftdia,hdown,hspace,hup,hrightdia,hright
+aspace,aleft,adown,aup,aright,bleft,bleftdia,bdown,bspace,bup,brightdia,bright,cleft,cdown,cup,cright,dleft,ddown,dup,dright,eleft,edown,eup,eright,fleft,fdown,fup,fright,gleft,gleftdia,gdown,gspace,gup,grightdia,gright,oni,hleft,hleftdia,hdown,hspace,hup,hrightdia,hright
+aleft,adown,aspace,aup,aright,bleft,bleftdia,bdown,bspace,bup,brightdia,bright,cleft,cdown,cup,cright,dleft,ddown,dup,dright,eleft,edown,eup,eright,fleft,fdown,fup,fright,gleft,gleftdia,gdown,gspace,gup,grightdia,gright,oni,hleft,hleftdia,hdown,hspace,hup,hrightdia,hright
+aleft,adown,aup,aright,aspace,blefta,bleft,bleftdia,bdown,bleftb,bspace,bup,brightdia,bright,cleft,cdown,cup,cright,dleft,ddown,dup,dright,eleft,edown,eup,eright,fleft,fdown,fup,fright,oni,hleft,hleftdia,hdown,hspace,hup,hrightdia,hright,gleft,gleftdia,gdown,gspace,gup,grightdia,gright
+|
+|colorTr=
+4,4,4,4,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,2,3,3,2,3,3,3,3,0,1,0,2,0,1,0,2,0,1,0,1,0,1,0
+2,4,4,4,4,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,2,3,3,2,3,3,3,3,0,1,0,2,0,1,0,2,0,1,0,1,0,1,0
+4,4,2,4,4,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,2,3,3,2,3,3,3,3,0,1,0,2,0,1,0,2,0,1,0,1,0,1,0
+3,3,3,3,2,0,1,0,1,2,1,0,1,0,4,4,4,4,3,3,3,3,2,3,3,2,1,0,1,0,3,3,3,3,0,1,0,1,0,1,0,2,0,1,0
+|
+|stepRtnTr=
+0,-90,90,180,onigiri,giko,onigiri,iyo,0,-90,90,180,0,-90,90,180,0,-90,90,180,giko,135,45,iyo,0,-90,90,180,0,-45,-90,onigiri,90,135,180,onigiri,0,30,60,90,120,150,180
+onigiri,0,-90,90,180,giko,onigiri,iyo,0,-90,90,180,0,-90,90,180,0,-90,90,180,giko,135,45,iyo,0,-90,90,180,0,-45,-90,onigiri,90,135,180,onigiri,0,30,60,90,120,150,180
+0,-90,onigiri,90,180,giko,onigiri,iyo,0,-90,90,180,0,-90,90,180,0,-90,90,180,giko,135,45,iyo,0,-90,90,180,0,-45,-90,onigiri,90,135,180,onigiri,0,30,60,90,120,150,180
+0,45,135,180,giko,90,120,150,180,onigiri,0,30,60,90,0,-90,90,180,0,-90,90,180,giko,135,45,iyo,45,0,-45,-90,giko,onigiri,iyo,c,90,135,180,225,0,-45,-90,onigiri,90,135,180
+|
+|posTr=
+1,2,3,4,5,0,1,2,3,4,5,6,2.5,3.5,4.5,5.5,0.5,1.5,2.5,3.5,0.5,2.5,3.5,5.5,2,3,4,5,7.5,8.5,9.5,10.5,11.5,12.5,13.5,7,8,9,10,11,12,13,14
+1,2,3,4,5,0,1,2,3,4,5,6,2.5,3.5,4.5,5.5,0.5,1.5,2.5,3.5,0.5,2.5,3.5,5.5,2,3,4,5,7.5,8.5,9.5,10.5,11.5,12.5,13.5,7,8,9,10,11,12,13,14
+1,2,3,4,5,0,1,2,3,4,5,6,2.5,3.5,4.5,5.5,0.5,1.5,2.5,3.5,0.5,2.5,3.5,5.5,2,3,4,5,7.5,8.5,9.5,10.5,11.5,12.5,13.5,7,8,9,10,11,12,13,14
+3.5,4.5,5.5,6.5,7.5,1.5,2.5,3.5,4.5,5.5,6.5,7.5,8.5,9.5,3,4,5,6,5,6,7,8,3,5,6,8,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18
+|
+|keyGroupTr=
+5,5,5,5,5,7i,7i,7i,7i,7i,7i,7i,11,11,11,11,11L,11L,11L,11L,11W,11W,11W,11W,12,12,12,12,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,12,12,12,12,12,12,12,12
+5,5,5,5,5,7i,7i,7i,7i,7i,7i,7i,11,11,11,11,11L,11L,11L,11L,11W,11W,11W,11W,12,12,12,12,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,12,12,12,12,12,12,12,12
+5,5,5,5,5,7i,7i,7i,7i,7i,7i,7i,11,11,11,11,11L,11L,11L,11L,11W,11W,11W,11W,12,12,12,12,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,12,12,12,12,12,12,12,12
+5,5,5,5,5,7i,7i,7i,7i,7i,7i,7i,7i,7i,11,11,11,11,11L,11L,11L,11L,11W,11W,11W,11W,12,12,12,12,12,12,12,12,12,12,12,12,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W
+|
+|divTr=7$7$7$12,19|
+|keyCtrlTr=
+37/0,40/0,38/0,39/0,32/0,90/0,88/0,67/0,37/0,40/0,38/0,39/0,37/0,40/0,38/0,39/0,87/0,69/0,51/52,82/0,49/50,84/0,89/0,48/189,85/0,73/0,56/57/0,79/0,83/0,68/0,70/0,32/0,74/0,75/0,76/0,32/0,78/0,74/0,77/0,75/0,188/0,76/0,190/0
+32/0,37/0,40/0,38/0,39/0,90/0,88/0,67/0,37/0,40/0,38/0,39/0,37/0,40/0,38/0,39/0,87/0,69/0,51/52,82/0,49/50,84/0,89/0,48/189,85/0,73/0,56/57/0,79/0,83/0,68/0,70/0,32/0,74/0,75/0,76/0,32/0,78/0,74/0,77/0,75/0,188/0,76/0,190/0
+68/0,70/0,32/0,74/0,75/0,90/0,88/0,67/0,37/0,40/0,38/0,39/0,37/0,40/0,38/0,39/0,87/0,69/0,51/52,82/0,49/50,84/0,89/0,48/189,85/0,73/0,56/57/0,79/0,83/0,68/0,70/0,32/0,74/0,75/0,76/0,32/0,78/0,74/0,77/0,75/0,188/0,76/0,190/0
+112/0,113/0,114/0,115/0,13/16,52/0,82/0,70/0,86/0,32/0,78/0,74/0,73/0,57/0,87/0,69/0,51/52,82/0,37/0,40/0,38/0,39/0,49/50,84/0,89/0,48/189,112/0,113/0,114/0,115/0,116/0,117/0,118/0,119/0,120/0,121/0,122/0,123/0,83/0,68/0,70/0,32/0,74/0,75/0,76/0
+|
+|shuffleTr=
+0,0,0,0,1,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,9,8,8,8,10,11,11,11,11,11,11,11/0,0,0,0,0,2,2,2,2,2,2,2,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,7,7,7,7,7,7,7,7
+1,0,0,0,0,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,9,8,8,8,10,11,11,11,11,11,11,11/0,0,0,0,0,2,2,2,2,2,2,2,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,7,7,7,7,7,7,7,7
+0,0,1,0,0,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,9,8,8,8,10,11,11,11,11,11,11,11/0,0,0,0,0,2,2,2,2,2,2,2,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,7,7,7,7,7,7,7,7
+0,0,0,0,1,2,2,2,2,3,2,2,2,2,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,8,9,9,9,9,10,10,10,11,10,10,10/0,0,0,0,0,2,2,2,2,2,2,2,2,2,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,7,7,7,7,7,7,7,7,8,8,8,8,8,8,8
+|
+|scrollTr=
+Reverse::-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1/Cross::1,-1,-1,1,1,1,1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1/Flat::1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1/R-Flat::-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+Reverse::-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1/Cross::1,1,-1,-1,1,1,1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1/Flat::1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1/R-Flat::-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+Reverse::-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1/Cross::1,-1,-1,-1,1,1,1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1/Flat::1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1/R-Flat::-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+---::1,1,1,1,1,1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1/Reverse::-1,-1,-1,-1,-1,1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1/Cross::1,-1,-1,1,1,-1,-1,1,1,1,1,1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1/Flat::1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1/R-Flat::-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1
+|
+|transKeyTr=$$$Tr2|
+|shuffleUse=group|
+|gleft_data=205,222,286,391,408,472,1088,1227,1320,1529,1854,2179,2400,2528,2708,2771,2969,3143,3201,3248,10720,10755,10912,10959|
+|gleftdia_data=263,350,460,1018,1273,1343,1413,1506,1715,1773,1831,2400,2470,2620,2679,2737,2830,3027,3120,10703,10720,10796,10935|
+|gdown_data=298,315,495,832,1099,1239,1297,1401,1540,1564,1691,1750,1877,1900,1912,1924,1935,1947,2144,2417,2667,2702,2946,2969,3015,3050,3213,10831,10941|
+|gspace_data=449,1204,1320,1691,2040,2086,2133,2179,2226,2272,2319,2365,2458,2504,2644,2690,2760,2806,2899,3178,10680,10773,10924|
+|gup_data=275,426,484,519,548,1250,1285,1703,1854,2098,2156,2284,2417,2493,2609,2690,2841,2922,2946,3073,3143,3236,10755,10796,10813,10947|
+|grightdia_data=240,333,507,542,1006,1111,1215,1297,1390,1552,1831,2516,2748,3027,3160,10703,10953|
+|gright_data=484,1273,1575,1668,1738,1761,1808,2034,2121,2307,2435,2481,2655,2713,2806,2922,3062,3097,3178,3224,10680,10813|
+|dleft_data=530,611,658,693,948,971,1134,1250,1424,1599,1622,1784,2028,2365,2435,2760,2853,2992,10889|
+|ddown_data=536,577,600,646,704,728,844,902,1064,1169,1192,1355,1436,1575,1796,1970,1982,1993,2005,2353,2713,2789,2864,3259,10900|
+|dup_data=739,797,925,983,1459,1645,1668,2377,2888,3073,3160|
+|dright_data=635,762,995,1041,1076,1157,1378,1482,1599,1808,2017,2330,2783,2876,3108,3259,10959|
+|gfrzLeft_data=553,565|
+|gfrzLdia_data=2063,2098|
+|gfrzDown_data=2249,2284|
+|gfrzSpace_data=|
+|gfrzUp_data=|
+|gfrzRdia_data=2226,2243|
+|gfrzRight_data=2202,2220,10889,10912|
+|dfrzLeft_data=|
+|dfrzDown_data=|
+|dfrzUp_data=2562,2580|
+|dfrzRight_data=553,565,2539,2557,2586,2603|
+|aleft_data=3329,3375,3422,3480,3608,3677,3770,3817,3840,3863,3910,3944,3991,4014,4049,4072,4107,4130,4153,4177,4200,4235,4316,4339,4374,4432,4479,4525,4571,4641,4821,4850,4943,4972,5361,5500,5518|
+|adown_data=3340,3387,3433,3468,3526,3573,3619,3666,3689,3712,3759,3793,3840,3915,3933,3991,4037,4078,4130,4177,4223,4246,4281,4304,4328,4362,4386,4409,4432,4490,4630,4664,4688,4699,4711,4722,4734,4804,4815,4943,4966,5408,5425,5553,5593,5611|
+|aup_data=3491,3515,3561,3631,3654,3747,3817,3851,3944,4026,4066,4119,4165,4211,4258,4362,4397,4420,4455,4537,4641,4827,4955,4978,5338,5535|
+|aright_data=3317,3352,3399,3445,3515,3538,3561,3584,3608,3642,3735,3793,3851,3863,3921,3956,3979,4002,4060,4084,4142,4188,4270,4293,4316,4351,4409,4455,4583,4618,4757,4769,4780,4792,4810,4955,4984,5315,5442,5628|
+|aspace_data=3782,3898,4014,4060,4502,4513,4548,4560,4595,4606,4827,4850,5036,5384,5477,5570,5582,5663|
+|afrzLeft_data=4990,5036,5686,5710|
+|afrzDown_data=|
+|afrzUp_data=|
+|afrzRdia_data=|
+|afrzRight_data=5686,5710|
+|afrzSpace_data=|
+|oni_data=5779,6499,7150,7289,7382,7475,7811,8009,8288,8462,8485,8497|
+|hleft_data=5837,6151,6244,6569,6940,7033,7300,7602,7893,8055|
+|hleftdia_data=6128,6197,6290,6395,6430,6453,6464,6906,7010,7242,7324,7568,7620,7707,7765,7846,8032,8299,8346,8404,8450|
+|hdown_data=5826,5919,6162,6220,6255,6488,6580,6685,6929,6952,7045,7359,7881,8067,8322,8346|
+|hspace_data=6337,6360,6371,6406,6894,6987,7080,7103,7115,7126,7138,7150,7382,7556,7602,7637,7765,7835,7904,8009,8090,8380,8427|
+|hup_data=5849,5942,6174,6313,6476,6592,6917,7022,7266,7335,7579,7719,7742,7991,8044,8322,8363|
+|hrightdia_data=6209,6302,6383,6406,6871,6964,7312,7428,7533,7620,7695,7870,7974,8079,8311,8363,8439|
+|hright_data=5860,6267,6499,6604,6662,7057,7742,7991,8462|
+|fleft_data=6522,6639,7231,7521,7637,7672,7788,7939,7986,8102,8148,8171,8380|
+|fdown_data=6534,6615,6708,7428,7660,7962,7986|
+|fup_data=7173,7184,7196,7208,7219,7486,7811,8195,8218,8230,8253,8264|
+|fright_data=6546,6627,7242,7405,7510,7788,8125,8160,8276|
+|foni_data=6708,6731|
+|hfrzLeft_data=|
+|hfrzLdia_data=6046,6104|
+|hfrzDown_data=|
+|hfrzSpace_data=6000,6023,6743,6778|
+|hfrzUp_data=|
+|hfrzRdia_data=5965,5988,6790,6848,7916,7939|
+|ffrzRight_data=|
+|ffrzLeft_data=|
+|ffrzDown_data=7451,7475|
+|ffrzUp_data=|
+|ffrzRight_data=|
+|bleft_data=8671,8845,8915,8979,9054,9066,9100,9228,9310,9356,9402,9472,9495,9588,9658,9722,9797,9809,9908,9937,9948,10000,10030,10076,10146,10517,10564,10587|
+|bleftdia_data=8682,8857,8961,8973,9025,9147,9240,9269,9280,9292,9379,9449,9472,9542,9565,9635,9704,9716,9768,9890,9902,9954,10146,10169,10570,10587|
+|bdown_data=8694,8868,9008,9019,9071,9089,9112,9182,9205,9251,9333,9426,9519,9565,9611,9629,9751,9762,9815,9983,9995,10030,10175,10186,10540,10575|
+|bspace_data=8555,8590,8717,8764,8833,8880,8938,8996,9031,9100,9147,9251,9321,9379,9402,9507,9588,9640,9693,9739,9786,9832,9867,9890,9902,9913,9925,9937,10012,10088,10186|
+|bup_data=8543,8601,8624,8729,8775,8822,8891,9042,9118,9135,9159,9240,9310,9350,9368,9397,9437,9495,9536,9553,9582,9623,9774,9844,10006,10018,10064,10134,10157,10180|
+|brightdia_data=8648,8740,8787,8903,8950,9182,9205,9460,9646,9728,10111|
+|bright_data=8531,8578,8636,8706,8810,8868,8915,8984,9089,9124,9228,9263,9275,9286,9298,9344,9391,9414,9443,9484,9530,9577,9600,9658,9681,9820,9855,9960,9971,9983,9995,10024,10053,10157|
+|bfrzLeft_data=10192,10215|
+|bfrzLdia_data=|
+|bfrzDown_data=|
+|bfrzSpace_data=|
+|bfrzUp_data=|
+|bfrzRdia_data=|
+|bfrzRight_data=10192,10215|
+|cleft_data=10738|
+|eleft_data=10866|
+|cdown_data=10610,10628|
+|cup_data=10645|
+|cright_data=10738|
+|eright_data=10866|
+|speed_data=3271,0.50,3294,1.00|
+|keych_data=0,11L,1951,5,1955,11L,2810,5,2814,11L,3264,5,3275,11L,3287,11L,3293,5,3299,11L,3304,5,3307,11L,3310,5,5128,12,5134,5,5220,12,5224,5,5481,12,5485,5,5586,12,5589,5,5731,12,5737,5,5742,12,5748,5,5753,12,7153,7i,7157,12,8013,7i,8017,12,8500,7i,8503,12,8506,7i,8509,12,8512,7i,10329,11,10335,7i,10422,11L,10428,7i,10590,11,10594,11W,10598,11,10775,11W,10779,11L,10783,11W,10869,11L|
+|oni2_data=1029,1077,1124,1171,1219,1266,1314,1361,1408,1456,1503,1550,1598,1645,1740,2829,3350,3635,3729,4108,4392,4487,5648|left2_data=248,437,816,864,3232,3410,3469,4132,4369,4440,4464,4511,5056,5506|leftdia2_data=627,650,698,1764,1811,1835,1882,2048,2214,2261,2320,2912,3220,3445,3540,4179,4392,4606,4629,4653,4677,4842,4914,4937,4961,4985,5008,5032,5387,5423,5612|down2_data=342,532,792,828,1953,2000,2016,2367,3196,3244,3398,3481,3540,3658,3682,3694,3706,3729,4144,4345,4381,4452,4523,4546,4570,4594,5079,5103,5127,5150,5174,5198,5221,5292,5328,5517|space2_data=721,745,1006,1053,1148,1195,1242,1258,1385,1432,1479,1527,1574,2119,2225,2308,3433,3457,3564,3587,3599,3611,3635,4191,4404,4606,5245,5375,5411,5482|up2_data=295,485,864,1085,1171,1274,1456,1562,1621,1637,1977,2032,2142,2202,2237,2261,2356,3208,3256,3386,3492,3516,4156,4357,4511,4535,4558,4582,5281,5316,5340,5435,5553,5577,5589|rightdia2_data=674,769,1069,1160,1444,1539,1653,1787,1858,1906,2119,2308,2900,3185,3421,4203,4617,4641,4665,4689,4854,5364,5399,5458,5494,5600|right2_data=390,579,840,1100,1183,1467,1550,2142,2190,2237,3374,3504,5269,5304,5340,5529|sleftdia2_data=1006,1053,1100,1148,1195,1242,1290,1337,2166,2332,2486,2711,2948,3042,3090,3339,3942,4085,4306,4487,4748,4866|sleft2_data=887,982,1385,1432,1479,1527,1574,1621,1716,1929,2095,2296,2498,2545,2687,2746,2806,2889,2983,3019,3114,3753,3777,3789,3824,3931,3990,4061,4250,4321,4700,4736,4760|sdown2_data=911,946,1314,1669,1692,2071,2285,2557,2600,2735,2770,2794,2853,2971,3031,3125,3315,3812,3836,3895,3978,4227,4321,4416,4724,4795,4819|sup2_data=935,958,2095,2474,2569,2585,3007,3848,3871,3883,4712,4807,4831|sright2_data=887,982,1290,1692,1835,2071,2285,2379,2395,2510,2758,2924,3137,3800,3919,3966,4073,4239,4314,4416,4700,4771|srightdia2_data=2411,2521,2782,2877,2995,3161,3279,3303,3327,3350,4014,4037,4274,4298,4748,4866,5624|foni2_data=|frzLeft2_data=|frzLdia2_data=|frzDown2_data=|frzSpace2_data=|frzUp2_data=|frzRdia2_data=|frzRight2_data=|sfrzLdia2_data=|sfrzLeft2_data=|sfrzDown2_data=2427,2450,2652,2669|sfrzUp2_data=4890,4985|sfrzRight2_data=2616,2634|sfrzRdia2_data=|speed2_change=|boost2_data=|color2_data=200,30,#00ffcc,200,31,#339999,200,34,#cc99ff,200,35,#9966ff|
+|keyGroupOrder=11L,5,12,7i|
+|word_data=
+575,2,[right]
+575,2,[fadein]
+575,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#99ff99">11Lkey</span></b>,
+3292,2,[fadeout],
+3312,2,[fadein]
+3312,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#ffcc99">5key</span></b>,
+5733,2,[fadeout],
+5753,2,[fadein]
+5753,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#99ffff">12key</span></b>,
+8492,2,[fadeout],
+8512,2,[fadein]
+8512,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#ffff66">7ikey</span></b>,
+10578,2,[fadeout],
+10598,2,[fadein]
+10598,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#99ffcc">11key</span></b>,
+10763,2,[fadeout],
+10783,2,[fadein]
+10783,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#9999ff">11Wkey</span></b>,
+10849,2,[fadeout],
+10869,2,[fadein]
+10869,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#99ff99">11Lkey</span></b>,
+10959,2,,
+|
+|wordA_data=
+575,2,[right]
+575,2,[fadein]
+575,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#99ffcc">11key</span></b>,
+3292,2,[fadeout],
+3312,2,[fadein]
+3312,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#ff99cc">5gkey</span></b>,
+5733,2,[fadeout],
+5753,2,[fadein]
+5753,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#ffffff">12ikey</span></b>,
+8492,2,[fadeout],
+8512,2,[fadein]
+8512,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#ff9999">9vkey</span></b>,
+10578,2,[fadeout],
+10598,2,[fadein]
+10598,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#99ff99">11Lkey</span></b>,
+10763,2,[fadeout],
+10783,2,[fadein]
+10783,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#9999ff">11Wkey</span></b>,
+10849,2,[fadeout],
+10869,2,[fadein]
+10869,2,<br><b>　　　<span style="color:#ffffff">KeysForm</span>　　　<span style="color:#99ffcc">11key</span></b>,
+10959,2,,
+|
+		|tuning=ティックル|
+		'>
+		<div id="canvas-frame">
+		</div>
+<hr>
+	</td>
+</tr>
+</table>
+</body>
+</html>

package/js/danoni_main.js CHANGED Viewed

@@ -4,12 +4,12 @@
  *
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/01/28
+ * Revised : 2023/02/14
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 29.4.1`;
-const g_revisedDate = `2023/01/28`;
+const g_version = `Ver 30.1.1`;
+const g_revisedDate = `2023/02/14`;
 const g_alphaVersion = ``;
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -224,6 +224,19 @@ const setAttrs = (_baseObj, { ...rest } = {}) =>
  */
 const getNumAttr = (_baseObj, _attrkey) => parseFloat(_baseObj.getAttribute(_attrkey));
+/**
+ * 文字列に埋め込まれた変数を展開
+ * @param {string} _str
+ */
+const convertStrToVal = _str => {
+	const strs = _str.split(`}`).join(`{`).split(`{`);
+	let convStrs = ``;
+	for (let j = 0; j < strs.length; j += 2) {
+		convStrs += escapeHtmlForEnabledTag(strs[j]);
+		convStrs += setVal(strs[j + 1], ``, C_TYP_CALC);
+	}
+	return convStrs;
+};
 /*-----------------------------------------------------------*/
 /* 値や配列のチェック・変換                                    */
@@ -1445,14 +1458,19 @@ const makeSpriteData = (_data, _calcFrame = _frame => _frame) => {
 			const tmpObj = {
 				path: escapeHtml(tmpSpriteData[2] ?? ``, g_escapeStr.escapeCode),   // 画像パス or テキスト
 				class: escapeHtml(tmpSpriteData[3] ?? ``),                          // CSSクラス
-				left: setVal(tmpSpriteData[4], 0, C_TYP_CALC),                      // X座標
-				top: setVal(tmpSpriteData[5], 0, C_TYP_CALC),                       // Y座標
-				width: setIntVal(tmpSpriteData[6]),                                 // spanタグの場合は font-size
-				height: escapeHtml(tmpSpriteData[7] ?? ``),                         // spanタグの場合は color(文字列可)
+				left: setVal(tmpSpriteData[4], `0`).includes(`{`) ?
+					`${setVal(tmpSpriteData[4], 0)}` : `{${setVal(tmpSpriteData[4], 0)}}`, // X座標
+				top: setVal(tmpSpriteData[5], `0`).includes(`{`) ?
+					`${setVal(tmpSpriteData[5], 0)}` : `{${setVal(tmpSpriteData[5], 0)}}`, // Y座標
+				width: `${setIntVal(tmpSpriteData[6])}`,                            // spanタグの場合は font-size
+				height: `${escapeHtml(tmpSpriteData[7] ?? ``)}`,                    // spanタグの場合は color(文字列可)
 				opacity: setVal(tmpSpriteData[8], 1, C_TYP_FLOAT),
 				animationName: escapeHtml(setVal(tmpSpriteData[9], C_DIS_NONE)),
 				animationDuration: setIntVal(tmpSpriteData[10]) / g_fps,
 			};
+			if (setVal(tmpSpriteData[11], g_presetObj.animationFillMode) !== undefined) {
+				tmpObj.animationFillMode = setVal(tmpSpriteData[11], g_presetObj.animationFillMode);
+			}
 			if (g_headerObj.autoPreload) {
 				if (checkImage(tmpObj.path)) {
 					if (g_headerObj.syncBackPath) {
@@ -1468,15 +1486,38 @@ const makeSpriteData = (_data, _calcFrame = _frame => _frame) => {
 				checkDuplicatedObjects(spriteData[tmpFrame]);
 			const emptyPatterns = [``, `[loop]`, `[jump]`];
+			const colorObjFlg = tmpSpriteData[2]?.startsWith(`[c]`) || false;
 			spriteData[tmpFrame][addFrame] = {
 				depth: tmpDepth,
-				command: tmpObj.path,
-				jumpFrame: tmpObj.class,
-				maxLoop: tmpObj.left,
-				animationName: tmpObj.animationName,
-				htmlText: emptyPatterns.includes(tmpObj.path) ?
-					`` : (checkImage(tmpObj.path) ? makeSpriteImage(tmpObj) : makeSpriteText(tmpObj)),
 			};
+			if (colorObjFlg) {
+				// [c]始まりの場合、カラーオブジェクト用の作成準備を行う
+				const data = tmpObj.path.slice(`[c]`.length).split(`/`);
+				spriteData[tmpFrame][addFrame].colorObjInfo = {
+					x: tmpObj.left, y: tmpObj.top, w: tmpObj.width, h: tmpObj.height,
+					rotate: setVal(data[0], `0`), opacity: tmpObj.opacity,
+					background: makeColorGradation(setVal(data[1], `#ffffff`), { _defaultColorgrd: false }),
+					animationName: tmpObj.animationName,
+					animationDuration: `${tmpObj.animationDuration}s`,
+				};
+				spriteData[tmpFrame][addFrame].colorObjId = `${tmpFrame}_${addFrame}`;
+				spriteData[tmpFrame][addFrame].colorObjClass = setVal(tmpObj.class, undefined);
+				if (tmpObj.animationFillMode !== undefined) {
+					spriteData[tmpFrame][addFrame].colorObjInfo.animationFillMode = tmpObj.animationFillMode;
+				}
+			} else if (emptyPatterns.includes(tmpObj.path)) {
+				// ループ、フレームジャンプ、空の場合の処理
+				spriteData[tmpFrame][addFrame].command = tmpObj.path;
+				spriteData[tmpFrame][addFrame].jumpFrame = tmpObj.class;
+				spriteData[tmpFrame][addFrame].maxLoop = tmpObj.left;
+				spriteData[tmpFrame][addFrame].htmlText = ``;
+			} else {
+				// それ以外の画像、テキストの場合
+				spriteData[tmpFrame][addFrame].animationName = tmpObj.animationName;
+				spriteData[tmpFrame][addFrame].htmlText = (checkImage(tmpObj.path) ? makeSpriteImage(tmpObj) : makeSpriteText(tmpObj));
+			}
 		}
 	});
@@ -1517,7 +1558,16 @@ const drawBaseSpriteData = (_spriteData, _name, _condition = true) => {
 		}
 	} else {
 		if (_condition) {
-			baseSprite.innerHTML = _spriteData.htmlText;
+			if (_spriteData.colorObjInfo !== undefined) {
+				const colorObjClass = _spriteData.colorObjClass?.split(`/`) ?? [];
+				const id = `${_name}${_spriteData.depth}${_spriteData.colorObjId}`;
+				[`x`, `y`, `w`, `h`].forEach(val => _spriteData.colorObjInfo[val] = convertStrToVal(_spriteData.colorObjInfo[val]));
+				baseSprite.appendChild(
+					createColorObject2(id, _spriteData.colorObjInfo, ...colorObjClass)
+				);
+			} else {
+				baseSprite.innerHTML = convertStrToVal(_spriteData.htmlText);
+			}
 		}
 	}
 };
@@ -2799,6 +2849,14 @@ const headerConvert = _dosObj => {
 		obj.preloadImages = _dosObj.preloadImages.split(`,`).filter(image => hasVal(image)).map(preloadImage => preloadImage);
 	}
+	// 初期表示する部分キーの設定
+	obj.keyGroupOrder = [];
+	_dosObj.keyGroupOrder?.split(`$`).forEach((val, j) => {
+		if (val !== ``) {
+			obj.keyGroupOrder[j] = val.split(`,`);
+		}
+	});
 	// 最終演出表示有無（noneで無効化）
 	obj.finishView = _dosObj.finishView ?? ``;
@@ -3385,6 +3443,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 	const toFloat = _num => parseFloat(_num);
 	const toStringOrNumber = _str => isNaN(Number(_str)) ? _str : toNumber(_str);
 	const toSplitArray = _str => _str.split(`/`).map(n => toNumber(n));
+	const toSplitArrayStr = _str => _str.split(`/`).map(n => n);
 	/**
 	 * 新キー用複合パラメータ
@@ -3614,6 +3673,9 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) }
 		// シャッフルグループ (shuffleX_Y)
 		newKeyTripleParam(newKey, `shuffle`);
+		// キーグループ (keyGroupX_Y)
+		newKeyMultiParam(newKey, `keyGroup`, toSplitArrayStr);
 		// スクロールパターン (scrollX_Y)
 		// |scroll(newKey)=Cross::1,1,-1,-1,-1,1,1/Split::1,1,1,-1,-1,-1,-1$...|
 		newKeyPairParam(newKey, `scroll`, `scrollDir`, `---`, 1);
@@ -3859,13 +3921,7 @@ const titleInit = _ => {
 	if (g_headerObj.commentVal !== ``) {
 		// コメント文の加工
-		const comments = g_headerObj.commentVal.split(`}`).join(`{`).split(`{`);
-		let convCommentVal = ``;
-		for (let j = 0; j < comments.length; j += 2) {
-			convCommentVal += escapeHtmlForEnabledTag(comments[j]);
-			convCommentVal += setVal(comments[j + 1], ``, C_TYP_CALC);
-		}
+		const convCommentVal = convertStrToVal(g_headerObj.commentVal);
 		if (g_headerObj.commentExternal) {
 			if (document.querySelector(`#commentArea`) !== null) {
 				commentArea.innerHTML = convCommentVal;
@@ -4992,6 +5048,7 @@ const createOptionWindow = _sprite => {
 			if (isNotSameKey && g_keyObj.prevKey !== `Dummy`) {
 				// キーパターン初期化
 				g_keyObj.currentPtn = 0;
+				g_keycons.keySwitchNum = 0;
 			}
 			const hasKeyStorage = localStorage.getItem(`danonicw-${g_keyObj.currentKey}k`);
 			let storageObj, addKey = ``;
@@ -5576,8 +5633,7 @@ const createSettingsDisplayWindow = _sprite => {
 	const dispAppearanceSlider = _ => {
 		[`lblAppearancePos`, `lblAppearanceBar`, `lnkLockBtn`, `lnkfilterLine`].forEach(obj =>
-			document.getElementById(obj).style.visibility =
-			g_appearanceRanges.includes(g_stateObj.appearance) ? `Visible` : `Hidden`
+			$id(obj).visibility = g_appearanceRanges.includes(g_stateObj.appearance) ? `Visible` : `Hidden`
 		);
 	};
 	dispAppearanceSlider();
@@ -5680,6 +5736,9 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	const maxLeftPos = Math.max(divideCnt, posMax - divideCnt - 2) / 2;
 	const maxLeftX = Math.min(0, (kWidth - C_ARW_WIDTH) / 2 - maxLeftPos * g_keyObj.blank);
+	g_keycons.cursorNumList = [...Array(keyNum).keys()].map(i => i);
+	const configKeyGroupList = g_headerObj.keyGroupOrder[g_stateObj.scoreId] ?? tkObj.keyGroupList;
 	/**
 	 * keyconSpriteのスクロール位置調整
 	 * @param {number} _targetX
@@ -5804,6 +5863,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 				createCss2Button(`keycon${j}_${k}`, g_kCd[g_keyObj[`keyCtrl${keyCtrlPtn}`][j][k]], _ => {
 					g_currentj = j;
 					g_currentk = k;
+					g_keycons.cursorNum = g_keycons.cursorNumList.findIndex(val => val === g_currentj);
 					setKeyConfigCursor();
 				}, {
 					x: keyconX, y: 50 + C_KYC_REPHEIGHT * k + keyconY,
@@ -5981,21 +6041,6 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	makeGroupButton(`color`, { cssName: g_cssObj.keyconfig_ColorType });
 	makeGroupButton(`shuffle`, { baseX: g_sWidth * 11 / 12 - 10, cssName: g_cssObj.settings_Shuffle });
-	/**
-	 * 次のカーソルへ移動
-	 * @param {number} _pos
-	 */
-	const searchNextCursor = _pos => {
-		for (let j = g_currentj; j < keyNum + g_currentj; j++) {
-			if (g_keyObj[`keyCtrl${keyCtrlPtn}`][j % keyNum][_pos] !== undefined) {
-				g_currentj = j % keyNum;
-				g_currentk = _pos;
-				return true;
-			}
-		}
-		return false;
-	};
 	/**
 	 * カーソル位置の設定
 	 */
@@ -6017,25 +6062,19 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	};
 	/**
-	 * キーコンフィグ用カーソルのリセット
-	 * @param {number} _resetPos
-	 * @param {boolean} _resetCursorFlg
+	 * カーソル位置の変更
+	 * @param {number} _nextj
 	 */
-	const resetCursor = (_resetPos = 0, _resetCursorFlg = true) => {
-		g_prevKey = -1;
-		if (_resetCursorFlg) {
-			g_currentj = 0;
-			if (!searchNextCursor(_resetPos)) {
-				g_currentk = 0;
-			}
-		} else {
-			if (g_keyObj[`keyCtrl${keyCtrlPtn}`][g_currentj][_resetPos] === undefined) {
-				searchNextCursor(_resetPos);
-			} else {
-				g_currentk = _resetPos;
-			}
+	const changeConfigCursor = (_nextj = ++g_keycons.cursorNum % g_keycons.cursorNumList.length) => {
+		g_keycons.cursorNum = _nextj;
+		g_currentj = g_keycons.cursorNumList[_nextj];
+		g_currentk = 0;
+		if (g_kcType === `Replaced` && (g_keyObj[`keyCtrl${keyCtrlPtn}`][g_currentj][1] !== undefined)) {
+			g_currentk = 1;
 		}
 		setKeyConfigCursor();
+		keyconSprite.scrollLeft = - maxLeftX;
 	};
 	const getNextNum = (_scrollNum, _groupName, _target) => {
@@ -6049,10 +6088,51 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	 */
 	const setConfigType = (_scrollNum = 1) => {
 		g_kcType = g_keycons.configTypes[getNextNum(_scrollNum, `configTypes`, g_kcType)];
-		resetCursor(Number(g_kcType === `Replaced`), _scrollNum === 0);
+		changeConfigCursor(g_keycons.cursorNum);
 		lnkKcType.textContent = getStgDetailName(g_kcType);
 	};
+	/**
+	 * 一部のキーコンフィグを表示する
+	 * （キーグループ毎にフィルターされたもののみを表示する）
+	 * @param {number} _num
+	 */
+	const appearConfigSteps = _num => {
+		const appearConfigView = (_j, _display) => {
+			$id(`arrow${_j}`).display = _display;
+			$id(`arrowShadow${_j}`).display = _display;
+			$id(`color${_j}`).display = _display;
+			if (document.getElementById(`sArrow${_j}`) !== null) {
+				$id(`sArrow${_j}`).display = _display;
+			}
+			const ctrlPtn = g_keyObj[`keyCtrl${g_headerObj.keyLabels[g_stateObj.scoreId]}_${g_keyObj.currentPtn}`][_j];
+			for (let k = 0; k < ctrlPtn.length; k++) {
+				$id(`keycon${_j}_${k}`).display = _display;
+			}
+		};
+		g_keycons.keySwitchNum = _num;
+		g_keycons.cursorNumList = [];
+		for (let j = 0; j < keyNum; j++) {
+			appearConfigView(j, C_DIS_NONE);
+			if (tkObj.keyGroupMaps[j].includes(configKeyGroupList[_num])) {
+				g_keycons.cursorNumList.push(j);
+				appearConfigView(j, C_DIS_INHERIT);
+			}
+		}
+		changeConfigCursor(0);
+		// keySwitchボタンを一旦非選択にして、選択中のものを再度色付け
+		if (configKeyGroupList.length > 1) {
+			for (let j = 0; j < configKeyGroupList.length; j++) {
+				document.getElementById(`key${j}`).classList.replace(g_cssObj.button_Next, g_cssObj.button_Mini);
+			}
+			document.getElementById(`key${_num}`).classList.replace(g_cssObj.button_Mini, g_cssObj.button_Next);
+		}
+	};
 	/**
 	 * ColorPickerの色切替
 	 * @param {number} _j
@@ -6062,9 +6142,9 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	const changeColorPicker = (_j, _type, _color) => {
 		if (_color !== ``) {
 			document.getElementById(`pick${_type}${_j}`).value = _color.slice(0, 7);
-			document.getElementById(`pick${_type}${_j}`).style.display = C_DIS_INHERIT;
+			$id(`pick${_type}${_j}`).display = C_DIS_INHERIT;
 		} else {
-			document.getElementById(`pick${_type}${_j}`).style.display = C_DIS_NONE;
+			$id(`pick${_type}${_j}`).display = C_DIS_NONE;
 		}
 	};
@@ -6213,6 +6293,22 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	// ユーザカスタムイベント(初期)
 	g_customJsObj.keyconfig.forEach(func => func());
+	// 部分キー表示用ボタン描画
+	if (configKeyGroupList.length > 1) {
+		multiAppend(divRoot,
+			createDivCss2Label(`lblkey`, `KeySwitch`, { x: g_sWidth - 80, y: 90, w: 60, h: 20, siz: 14 }));
+		configKeyGroupList.forEach((val, j) => {
+			divRoot.appendChild(
+				createCss2Button(`key${j}`, `${j + 1}`, _ => {
+					appearConfigSteps(j);
+				}, { x: g_sWidth - 60, y: 110 + j * 20, w: 50, h: 20, siz: 14 }, g_cssObj.button_Mini),
+			);
+		});
+	}
+	// カーソル位置の初期化
+	appearConfigSteps(g_keycons.keySwitchNum);
 	// ラベル・ボタン描画
 	multiAppend(divRoot,
@@ -6241,14 +6337,17 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		// キーコンフィグリセットボタン描画
 		createCss2Button(`btnReset`, g_lblNameObj.b_reset, _ => {
 			if (window.confirm(g_msgObj.keyResetConfirm)) {
-				for (let j = 0; j < keyNum; j++) {
+				const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
+				for (let m = 0; m < g_keycons.cursorNumList.length; m++) {
+					const j = g_keycons.cursorNumList[m];
 					for (let k = 0; k < g_keyObj[`keyCtrl${keyCtrlPtn}`][j].length; k++) {
 						g_keyObj[`keyCtrl${keyCtrlPtn}`][j][k] = setIntVal(g_keyObj[`keyCtrl${keyCtrlPtn}d`][j][k]);
 						document.querySelector(`#keycon${j}_${k}`).textContent = g_kCd[g_keyObj[`keyCtrl${keyCtrlPtn}`][j][k]];
 						changeKeyConfigColor(j, k, g_keyObj.currentPtn === -1 ? g_cssObj.keyconfig_Defaultkey : g_cssObj.title_base);
 					}
 				}
-				resetCursor(Number(g_kcType === `Replaced`));
+				changeConfigCursor(0);
 				keyconSprite.scrollLeft = - maxLeftX;
 			}
 		}, g_lblPosObj.btnKcReset, g_cssObj.button_Reset),
@@ -6296,20 +6395,8 @@ const keyConfigInit = (_kcType = g_kcType) => {
 			g_currentk++;
 			cursor.style.top = `${parseInt(cursor.style.top) + C_KYC_REPHEIGHT}px`;
-		} else if (g_currentj < keyNum - 1) {
-			// 他の代替キーが存在せず、次の矢印がある場合
-			g_currentj++;
-			g_currentk = 0;
-			// 代替キーのみの場合は次の代替キーがあるキーを探す
-			if (g_kcType === `Replaced`) {
-				searchNextCursor(1);
-			}
-			setKeyConfigCursor();
 		} else {
-			// 全ての矢印・代替キーの巡回が終わった場合は元の位置に戻す
-			resetCursor(Number(g_kcType === `Replaced`));
+			changeConfigCursor();
 		}
 	});
@@ -6337,8 +6424,13 @@ const getKeyInfo = _ => {
 	const posMax = (g_keyObj[`divMax${keyCtrlPtn}`] !== undefined ?
 		g_keyObj[`divMax${keyCtrlPtn}`] : g_keyObj[`pos${keyCtrlPtn}`][keyNum - 1] + 1);
 	const divideCnt = g_keyObj[`div${keyCtrlPtn}`] - 1;
+	const keyGroupMaps = setVal(g_keyObj[`keyGroup${keyCtrlPtn}`], [...Array(keyNum)].fill([0]), C_TYP_STRING);
+	const keyGroupList = makeDedupliArray(keyGroupMaps.flat()).sort((a, b) => parseInt(a) - parseInt(b));
-	return { keyCtrlPtn: keyCtrlPtn, keyNum: keyNum, posMax: posMax, divideCnt: divideCnt };
+	return {
+		keyCtrlPtn: keyCtrlPtn, keyNum: keyNum, posMax: posMax, divideCnt: divideCnt,
+		keyGroupMaps: keyGroupMaps, keyGroupList: keyGroupList,
+	};
 };
 /**
@@ -7056,6 +7148,29 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		_dosObj[`${_header}${_type}_data`]
 	];
+	/**
+	 * 歌詞表示、背景・マスクデータの優先順取得
+	 * @returns
+	 */
+	const getPriorityHeader = _ => {
+		const list = [];
+		let type = ``;
+		if (g_stateObj.scroll !== `---`) {
+			type = `Alt`;
+		} else if (g_stateObj.reverse === C_FLG_ON) {
+			type = `Rev`;
+		}
+		if (hasVal(g_keyObj[`transKey${_keyCtrlPtn}`])) {
+			list.push(`${type}A`);
+		}
+		if (type !== ``) {
+			list.push(type);
+		}
+		list.push(``);
+		return list;
+	};
 	/**
 	 * 歌詞データの分解
 	 * @param {string} _scoreNo
@@ -7065,11 +7180,9 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		let wordReverseFlg = false;
 		const divideCnt = getKeyInfo().divideCnt;
 		const addDataList = (_type = ``) => wordDataList.push(...getPriorityList(`word`, _type, _scoreNo));
+		getPriorityHeader().forEach(val => addDataList(val));
-		if (g_stateObj.scroll !== `---`) {
-			addDataList(`Alt`);
-		} else if (g_stateObj.reverse === C_FLG_ON) {
-			addDataList(`Rev`);
+		if (g_stateObj.reverse === C_FLG_ON) {
 			// wordRev_dataが指定されている場合はそのままの位置を採用
 			// word_dataのみ指定されている場合、下記ルールに従って設定
@@ -7082,7 +7195,6 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 				}
 			}
 		}
-		addDataList();
 		const inputWordData = wordDataList.find((v) => v !== undefined);
 		return (inputWordData !== undefined ? makeSpriteWordData(inputWordData, wordReverseFlg) : [[], -1]);
@@ -7151,13 +7263,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	const makeBackgroundData = (_header, _scoreNo) => {
 		const dataList = [];
 		const addDataList = (_type = ``) => dataList.push(...getPriorityList(_header, _type, _scoreNo));
-		if (g_stateObj.scroll !== `---`) {
-			addDataList(`Alt`);
-		} else if (g_stateObj.reverse === C_FLG_ON) {
-			addDataList(`Rev`);
-		}
-		addDataList();
+		getPriorityHeader().forEach(val => addDataList(val));
 		const data = dataList.find((v) => v !== undefined);
 		return (data !== undefined ? makeSpriteData(data, calcFrame) : [[], -1]);
@@ -7255,6 +7361,17 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		});
 	}
+	// キー変化定義
+	obj.keychFrames = [];
+	if (hasVal(_dosObj[`keych${setScoreIdHeader(g_stateObj.scoreId, g_stateObj.scoreLockFlg)}_data`])) {
+		const keychdata = _dosObj[`keych${setScoreIdHeader(g_stateObj.scoreId, g_stateObj.scoreLockFlg)}_data`]?.split(`,`);
+		obj.keychFrames = keychdata.filter((val, j) => j % 2 === 0);
+		obj.keychTarget = keychdata.filter((val, j) => j % 2 === 1);
+	} else {
+		obj.keychFrames = [0];
+		obj.keychTarget = [0];
+	}
 	return obj;
 };
@@ -7958,6 +8075,9 @@ const getArrowSettings = _ => {
 	g_workObj.diffList = [];
 	g_workObj.mainEndTime = 0;
+	g_workObj.keyGroupMaps = tkObj.keyGroupMaps;
+	g_workObj.keyGroupList = tkObj.keyGroupList;
 	const keyCtrlLen = g_workObj.keyCtrl.length;
 	g_workObj.keyCtrlN = [...Array(keyCtrlLen)].map(_ => []);
 	g_workObj.keyHitFlg = [...Array(keyCtrlLen)].map(_ => []);
@@ -8181,7 +8301,8 @@ const mainInit = _ => {
 	const dummyFrzCnts = [...Array(keyNum)].fill(0);
 	let speedCnts = 0;
 	let boostCnts = 0;
-	const stepZoneDisp = (g_stateObj.d_stepzone === C_FLG_OFF || g_stateObj.scroll === `Flat`) ? C_DIS_NONE : C_DIS_INHERIT;
+	let keychCnts = 0;
+	const stepZoneDisp = (g_stateObj.d_stepzone === C_FLG_OFF || g_settings.scrollFlat.includes(g_stateObj.scroll)) ? C_DIS_NONE : C_DIS_INHERIT;
 	for (let j = 0; j < keyNum; j++) {
 		const colorPos = g_keyObj[`color${keyCtrlPtn}`][j];
@@ -8202,6 +8323,8 @@ const mainInit = _ => {
 			);
 		}
+		appearStepZone(j, C_DIS_NONE);
 		// ステップゾーン
 		multiAppend(stepRoot,
@@ -8222,14 +8345,17 @@ const mainInit = _ => {
 		);
 	}
-	if (g_stateObj.scroll === `Flat` && g_stateObj.d_stepzone === C_FLG_ON) {
+	if (g_settings.scrollFlat.includes(g_stateObj.scroll) && g_stateObj.d_stepzone === C_FLG_ON) {
+		// スクロール名に`R-`が含まれていればリバースと見做す
+		const reverseFlg = g_stateObj.reverse === C_FLG_ON || g_stateObj.scroll.startsWith(`R-`);
 		// ステップゾーンの代わり
 		const lineY = [(C_ARW_WIDTH - g_stateObj.flatStepHeight) / 2, (C_ARW_WIDTH + g_stateObj.flatStepHeight) / 2];
 		lineY.forEach((y, j) => {
 			mainSprite.appendChild(
 				createColorObject2(`stepBar${j}`, {
-					x: 0, y: C_STEP_Y + g_posObj.reverseStepY * Number(g_stateObj.reverse === C_FLG_ON) + y,
+					x: 0, y: C_STEP_Y + g_posObj.reverseStepY * Number(reverseFlg) + y,
 					w: g_headerObj.playingWidth - 50, h: 1, styleName: `lifeBar`,
 				}, g_cssObj.life_Failed)
 			);
@@ -8964,7 +9090,7 @@ const mainInit = _ => {
 			const boostCnt = currentArrow.boostCnt;
 			currentArrow.prevY = currentArrow.y;
 			currentArrow.y -= (g_workObj.currentSpeed * currentArrow.boostSpd + g_workObj.motionOnFrames[boostCnt] * currentArrow.boostDir) * currentArrow.dir;
-			document.getElementById(arrowName).style.top = `${currentArrow.y}px`;
+			$id(arrowName).top = `${currentArrow.y}px`;
 			currentArrow.boostCnt--;
 		}
 		judgeMotionFunc[`${_name}${g_stateObj.autoAll}`](_j, arrowName, --currentArrow.cnt);
@@ -9068,7 +9194,7 @@ const mainInit = _ => {
 				// 移動
 				if (g_workObj.currentSpeed !== 0) {
 					currentFrz.y -= movY + g_workObj.motionOnFrames[currentFrz.boostCnt] * currentFrz.dir * currentFrz.boostDir;
-					document.getElementById(frzName).style.top = `${currentFrz.y}px`;
+					$id(frzName).top = `${currentFrz.y}px`;
 					currentFrz.boostCnt--;
 				}
 				currentFrz.cnt--;
@@ -9108,7 +9234,7 @@ const mainInit = _ => {
 			currentFrz.frzBarLength -= g_workObj.currentSpeed;
 			if (currentFrz.frzBarLength > 0) {
 				currentFrz.y -= movY;
-				document.getElementById(frzName).style.top = `${currentFrz.y}px`;
+				$id(frzName).top = `${currentFrz.y}px`;
 			} else {
 				judgeObjDelete[_name](_j, frzName);
 			}
@@ -9195,6 +9321,14 @@ const mainInit = _ => {
 		});
+		// キー変化
+		while (currentFrame >= g_scoreObj.keychFrames[keychCnts]) {
+			for (let j = 0; j < keyNum; j++) {
+				appearKeyTypes(j, g_scoreObj.keychTarget[keychCnts]);
+			}
+			keychCnts++;
+		}
 		// ダミー矢印生成（背面に表示するため先に処理）
 		if (g_workObj.mkDummyArrow[currentFrame] !== undefined) {
 			g_workObj.mkDummyArrow[currentFrame].forEach(data =>
@@ -9422,6 +9556,25 @@ const makeCounterSymbol = (_id, _x, _class, _heightPos, _text, _display = C_DIS_
 	}, _class);
 };
+/**
+ * ステップゾーンの表示・非表示切替
+ * @param {number} _j
+ * @param {string} _display
+ */
+const appearStepZone = (_j, _display) => $id(`stepRoot${_j}`).display = _display;
+/**
+ * 部分キーのステップゾーン出現処理
+ * @param {number} _j
+ * @param {string} _target
+ */
+const appearKeyTypes = (_j, _target) => {
+	appearStepZone(_j, C_DIS_NONE);
+	if (g_workObj.keyGroupMaps[_j].includes(_target)) {
+		appearStepZone(_j, C_DIS_INHERIT);
+	}
+};
 // TODO: この部分を矢印塗りつぶし部分についても適用できるように関数を見直し
 /**
@@ -9490,7 +9643,7 @@ const changeHitFrz = (_j, _k, _name) => {
 	// フリーズアロー位置の修正（ステップゾーン上に来るように）
 	const delFrzLength = parseFloat($id(`stepRoot${_j}`).top) - currentFrz.y;
-	document.getElementById(frzName).style.top = $id(`stepRoot${_j}`).top;
+	$id(frzName).top = $id(`stepRoot${_j}`).top;
 	// 早押ししたboostCnt分のフリーズアロー終端位置の修正
 	const delFrzMotionLength = sumData(g_workObj.motionOnFrames.slice(0, currentFrz.boostCnt + 1));

package/js/lib/danoni_constants.js CHANGED Viewed

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/01/28 (v29.4.1)
+ * Revised : 2023/02/14 (v30.1.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -754,6 +754,7 @@ const g_settings = {
     scrolls: [],
     scrollNum: 0,
+    scrollFlat: [`Flat`, `R-Flat`],
     shuffles: [C_FLG_OFF, `Mirror`, `Asym-Mirror`, `Random`, `Random+`, `S-Random`, `S-Random+`],
     shuffleNum: 0,
@@ -847,6 +848,10 @@ const g_keycons = {
     groupSelf: `S`,
     groups: [`color`, `shuffle`],
+    cursorNumList: [],
+    cursorNum: 0,
+    keySwitchNum: 0,
 };
 let g_displays = [`stepZone`, `judgment`, `fastSlow`, `lifeGauge`, `score`, `musicInfo`, `filterLine`,
@@ -2577,7 +2582,7 @@ g_keycons.groups.forEach(type => {
 const g_keyCopyLists = {
     simpleDef: [`blank`, `scale`],
     simple: [`div`, `divMax`, `blank`, `scale`, `keyRetry`, `keyTitleBack`, `transKey`, `scrollDir`, `assistPos`],
-    multiple: [`chara`, `color`, `stepRtn`, `pos`, `shuffle`],
+    multiple: [`chara`, `color`, `stepRtn`, `pos`, `shuffle`, `keyGroup`],
 };
 // タイトル画面関連のリスト群

package/js/template/danoni_setting.js CHANGED Viewed

@@ -1,7 +1,7 @@
 'use strict';
 /**
  * Dancing☆Onigiri 設定用jsファイル
- * Template Update: 2022/03/25 (v27.1.0)
+ * Template Update: 2023/02/14 (v30.1.1)
  *
  * このファイルでは、作品全体に対しての初期設定を行うことができます。
  * 譜面データ側で個別に同様の項目が設定されている場合は、譜面データ側の設定が優先されます。
@@ -187,6 +187,14 @@ g_presetObj.customDesignUse = {
 */
 //g_presetObj.customImageList = [`ball`, `square`];
+/**
+ * 背景・マスクモーションで利用する「animationFillMode」のデフォルト値
+ * - none      : 初期画像へ戻す
+ * - forwards  : アニメーション100%の状態を維持（デフォルト）
+ * - backwards : アニメーション  0%の状態に戻す
+ */
+//g_presetObj.animationFillMode = `none`;
 /*
 ------------------------------------------------------------------------

package/package.json CHANGED Viewed

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