音乐拼接等

_server/MotaAction.g4

@@ -854,6 +854,8 @@ action
     |   waitAsync_s
     |   stopAsync_s
     |   op_s
+    |   setmusics_s
+    |   introAndLoop_s
     |   battle_s
     |   battle_1_s
     |   openDoor_s
@@ -2612,6 +2614,23 @@ var code = '{"type": "setq"'+IdString_0+'},\n';
 return code;
 */;
 
+introAndLoop_s
+    :   '前奏音乐文件'EvalString? '前奏音乐文件'EvalString'循环音乐文件'EvalString?  Newline
+
+/* introAndLoop_s
+tooltip : introAndLoop：设置任务目标楼层（显示在小地图）
+helpUrl : /_docs/#/instruction
+default : ["",1,""]
+allBgms : ['EvalString_0','EvalString_2']
+colour :this.imageColor
+if(EvalString_1&&!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_1))throw new Error("此项仅能填写小数或整数，单位为秒");
+EvalString_0 = EvalString_0 ? (', "intro": "'+EvalString_0+'"') : '';
+EvalString_1= EvalString_1 ? (', "time": '+EvalString_1+'') : '';
+EvalString_2 = EvalString_2 ? (', "loop": "'+EvalString_2+'"') : '';
+var code = '{"type": "introAndLoop"'+EvalString_0+EvalString_1+EvalString_2+'},\n';
+return code;
+*/;
+
 
 setcgs_s
     :   'cg回廊获取cg 文件名'EvalString?'不填为清空cg获取记录'  Newline
@@ -2627,6 +2646,20 @@ var code = '{"type": "setcgs"'+EvalString_0+'},\n';
 return code;
 */;
 
+setmusics_s
+    :   '音乐鉴赏music 文件名'EvalString?'不填为清空cg获取记录'  Newline
+
+/* setmusics_s
+tooltip : setmusics：音乐鉴赏中的隐藏music获取
+helpUrl : /_docs/#/instruction
+default : [""]
+allBgms : ['EvalString_0']
+colour : this.soundColor
+EvalString_0 = EvalString_0 ? (', "bgm": "'+EvalString_0+'"') : '';
+var code = '{"type": "setmusics"'+EvalString_0+'},\n';
+return code;
+*/;
+
 scaleImage_s
     :   '图片放缩' '图片编号' NInt '中心点像素' 'x' PosString? 'y' PosString? '移动方式' MoveMode_List BGNL? '放缩比例' Number '动画时间' Int '不等待执行完毕' Bool Newline
        
@@ -2635,7 +2668,7 @@ scaleImage_s
 tooltip : scaleImage：图片放缩
 helpUrl : /_docs/#/instruction
 default : [1,'','','',0.8,0,false]
-colour : this.imageColor
+colour : this.soundColor
 if (Number_0 <= 0) throw new Error('放缩比例需要大于0'); 
 var loc = '';
 if (PosString_0 && PosString_1)

_server/MotaActionParser.js

@@ -620,6 +620,20 @@ MotaActionParser = function () {
       case "setcgs":
         this.next = MotaActionBlocks["setcgs_s"].xmlText([data.img, this.next]);
         break;
+      case "setmusics":
+        this.next = MotaActionBlocks["setmusics_s"].xmlText([
+          data.bgm,
+          this.next,
+        ]);
+        break;
+      case "introAndLoop":
+        this.next = MotaActionBlocks["introAndLoop_s"].xmlText([
+          data.intro,
+          data.time,
+          data.loop,
+          this.next,
+        ]);
+        break;
       case "comment": // 注释
         this.next = MotaActionBlocks["comment_s"].xmlText([
           this.EvalString_Multi(data.text),

_server/table/plugins.comment.js

@@ -122,6 +122,12 @@ var plugins_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 				"_type": "textarea",
 				"_range": "typeof(thiseval)=='string' || thiseval==null",
 				"_data": "音乐鉴赏"
+			},
+			"intro&loop": {
+				"_leaf": true,
+				"_type": "textarea",
+				"_range": "typeof(thiseval)=='string' || thiseval==null",
+				"_data": "背景音乐拼接"
 			}
 		}
 		if (obj[key]) return obj[key];