op制作完毕/cg事件重制

_saves/Eustia_autoSave

@@ -1 +1 @@
-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
+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=

_server/MotaAction.g4

@@ -853,6 +853,7 @@ action
     |   wait_s
     |   waitAsync_s
     |   stopAsync_s
+    |   op_s
     |   battle_s
     |   battle_1_s
     |   openDoor_s
@@ -3295,6 +3296,17 @@ var code = '{"type": "stopAsync"},\n';
 return code;
 */;
 
+op_s
+    :   '播放op（长按2秒可跳过）' BGNL Newline
+
+
+/* op_s
+tooltip : op: 开始播放op
+helpUrl : /_docs/#/instruction
+colour : this.soundColor
+var code = '{"type": "op"},\n';
+return code;
+*/;
 
 callBook_s
     :   '呼出怪物手册'

_server/MotaActionParser.js

@@ -1955,6 +1955,9 @@ MotaActionParser = function () {
       case "stopAsync": // 立刻停止所有异步事件
         this.next = MotaActionBlocks["stopAsync_s"].xmlText([this.next]);
         break;
+      case "op": // 立刻停止所有异步事件
+        this.next = MotaActionBlocks["op_s"].xmlText([this.next]);
+        break;
       case "drawWarning":
         this.next = MotaActionBlocks["drawWarning_s"].xmlText([
           data.x,

project/data.js

@@ -305,6 +305,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"Asphodelus_Ceui.mp3",
 			"Blind_Alley.mp3",
 			"Crawler.mp3",
+			"op.mp3",
 			"theme.mp3"
 		],
 		"sounds": [

project/floors/street01.js

@@ -29,7 +29,7 @@ main.floors.street01=
         "5,10": [
             {
                 "type": "insert",
-                "name": "chapter01"
+                "name": "chapter0"
             }
         ],
         "6,11": [
@@ -40,88 +40,7 @@ main.floors.street01=
         ],
         "4,11": [
             {
-                "type": "overlist",
-                "image": "bg_5043.png",
-                "memory": true,
-                "hidetime": 30,
-                "list": [
-                    {
-                        "text": "试试",
-                        "sound": "",
-                        "time": 30,
-                        "textColor": [
-                            255,
-                            255,
-                            255,
-                            1
-                        ],
-                        "boldColor": [
-                            0,
-                            0,
-                            0,
-                            1
-                        ],
-                        "font": "bold 48px Verdana",
-                        "frame": 0
-                    },
-                    {
-                        "text": "这可以",
-                        "sound": "",
-                        "time": 50,
-                        "textColor": [
-                            255,
-                            255,
-                            255,
-                            1
-                        ],
-                        "boldColor": [
-                            0,
-                            0,
-                            0,
-                            1
-                        ],
-                        "font": "bold 48px Verdana",
-                        "frame": 0
-                    },
-                    {
-                        "text": "变速的脏翅膀对话",
-                        "sound": "",
-                        "time": 80,
-                        "textColor": [
-                            255,
-                            255,
-                            255,
-                            1
-                        ],
-                        "boldColor": [
-                            0,
-                            0,
-                            0,
-                            1
-                        ],
-                        "font": "bold 48px Verdana",
-                        "frame": 0
-                    },
-                    {
-                        "text": "牛逼",
-                        "sound": "",
-                        "time": 20,
-                        "textColor": [
-                            255,
-                            255,
-                            255,
-                            1
-                        ],
-                        "boldColor": [
-                            0,
-                            0,
-                            0,
-                            1
-                        ],
-                        "font": "bold 48px Verdana",
-                        "frame": 0
-                    }
-                ]
+                "type": "op"
             }
         ]
     },

project/functions.js

@@ -171,8 +171,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		core.removeFlag("__events__");
 	} else {
 		// 每次抵达楼层执行的事件
-		core.ui.statusBar._update_map(); //更新小地图缓存
 		core.insertAction(core.floors[floorId].eachArrive);
+		core.ui.statusBar._update_map()
 		// 首次抵达楼层时执行的事件（后插入，先执行）
 		if (!core.hasVisitedFloor(floorId)) {
 			core.insertAction(core.floors[floorId].firstArrive);
@@ -1166,7 +1166,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	core.updateStatus()
 	// 更新状态栏
 	core.ui.statusBar.update();
-
 	// 更新阻激夹域的伤害值
 	core.updateCheckBlock();
 	// 更新全地图显伤