diff --git a/_server/editor_blocklyconfig.js b/_server/editor_blocklyconfig.js index e993a51..be72015 100644 --- a/_server/editor_blocklyconfig.js +++ b/_server/editor_blocklyconfig.js @@ -105,7 +105,6 @@ editor_blocklyconfig=(function(){ MotaActionBlocks['autoText_s'].xmlText(), MotaActionBlocks['scrollText_s'].xmlText(), MotaActionBlocks['setText_s'].xmlText(), - MotaActionBlocks['addPop_s'].xmlText(), MotaActionBlocks['tip_s'].xmlText(), MotaActionBlocks['confirm_s'].xmlText(), MotaActionBlocks['choices_s'].xmlText([ @@ -198,8 +197,6 @@ editor_blocklyconfig=(function(){ ]}), MotaActionBlocks['waitAsync_s'].xmlText(), MotaActionBlocks['stopAsync_s'].xmlText(), - MotaActionBlocks['changeMouse_s'].xmlText(), - MotaActionBlocks['removeMouse_s'].xmlText(), MotaActionBlocks['vibrate_s'].xmlText(), MotaActionBlocks['animate_s'].xmlText(), MotaActionBlocks['animate_1_s'].xmlText(), diff --git a/project/floors/jiuguan.js b/project/floors/jiuguan.js index ca3187a..9b8e621 100644 --- a/project/floors/jiuguan.js +++ b/project/floors/jiuguan.js @@ -18,34 +18,7 @@ main.floors.jiuguan= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": { - "4,6": [ - { - "type": "addPop", - "value": "这段话将在游戏中以弹幕显示", - "px": 32, - "py": 32, - "color": [ - 255, - 0, - 0, - 1 - ], - "boldColor": [ - 0, - 0, - 0, - 1 - ], - "left": false, - "jump": false, - "time": 60, - "show": 30, - "font": "16px Verdana", - "speed": 1 - } - ] - }, + "events": {}, "changeFloor": {}, "beforeBattle": {}, "afterBattle": {}, diff --git a/project/plugins.js b/project/plugins.js index a94661d..1d7d791 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -7108,6 +7108,7 @@ core.plugin.animate = { MotaActionBlocks['scrollText_s'].xmlText(), MotaActionBlocks['setText_s'].xmlText(), MotaActionBlocks['tip_s'].xmlText(), + MotaActionBlocks['addPop_s'].xmlText(), MotaActionBlocks['confirm_s'].xmlText(), MotaActionBlocks['choices_s'].xmlText([ '选择剑或者盾', '流浪者', 'man', 0, '', MotaActionBlocks['choicesContext'].xmlText([ @@ -7207,6 +7208,8 @@ core.plugin.animate = { }), MotaActionBlocks['waitAsync_s'].xmlText(), MotaActionBlocks['stopAsync_s'].xmlText(), + MotaActionBlocks['changeMouse_s'].xmlText(), + MotaActionBlocks['removeMouse_s'].xmlText(), MotaActionBlocks['vibrate_s'].xmlText(), MotaActionBlocks['animate_s'].xmlText(), MotaActionBlocks['animate_1_s'].xmlText(),