From c02bd41fbb035b219e836fd06223bf876eb4df3a Mon Sep 17 00:00:00 2001 From: oc Date: Tue, 27 Feb 2018 22:30:17 +0800 Subject: [PATCH 1/3] Fix Hide Bug --- libs/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/core.js b/libs/core.js index 32035bfe..c40c2373 100644 --- a/libs/core.js +++ b/libs/core.js @@ -2965,7 +2965,6 @@ core.prototype.moveBlock = function(x,y,steps,time,immediateHide,callback) { ////// 显示/隐藏某个块时的动画效果 ////// core.prototype.animateBlock = function (loc,type,time,callback) { if (type!='hide') type='show'; - core.status.replay.animate=true; //clearInterval(core.interval.tipAnimate); core.saveCanvas('animate'); @@ -2991,6 +2990,7 @@ core.prototype.animateBlock = function (loc,type,time,callback) { return; } + core.status.replay.animate=true; var draw = function () { list.forEach(function (t) { core.canvas.animate.drawImage(t.blockImage, 0, t.blockIcon * 32, 32, 32, t.x * 32, t.y * 32, 32, 32); From 3be76240ff42937a9232378a76d2b65d4f3e6483 Mon Sep 17 00:00:00 2001 From: YouWei Zhao Date: Wed, 28 Feb 2018 14:02:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=AF=E8=AE=BE=E7=BD=AE=E5=8F=AF?= =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=A2=9E=E5=8A=A0null?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _server/blockly/MotaAction.g4 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index ca65da91..f4e63988 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -5,21 +5,22 @@ grammar MotaAction; //事件 事件编辑器入口之一 event_m - : '事件' BGNL? Newline '启用' Bool '不可通行' Bool '显伤' Bool BGNL? Newline action+ BEND + : '事件' BGNL? Newline '启用' Bool '通行状态' B_List '显伤' Bool BGNL? Newline action+ BEND ; /* event_m tooltip : 编辑魔塔的事件 helpUrl : https://ckcz123.github.io/mota-js/#/event -default : [null,null,false] +default : [null,[['不改变','null'],['不可通行','true'],['可以通行','false']],false] +B_List_0=eval(B_List_0); var code = { 'trigger': 'action', 'enable': Bool_0, - 'noPass': Bool_1, - 'displayDamage': Bool_2, + 'noPass': B_List_0, + 'displayDamage': Bool_1, 'data': 'data_asdfefw' } -if (Bool_0 && Bool_1 && !Bool_2) code = 'data_asdfefw'; +if (Bool_0 && (B_List_0===null) && !Bool_1) code = 'data_asdfefw'; code=JSON.stringify(code,null,2).split('"data_asdfefw"').join('[\n'+action_0+']\n'); return code; */ @@ -236,8 +237,8 @@ setText_s /* setText_s tooltip : setText：设置剧情文本的属性,颜色为RGB三元组或RGBA四元组 helpUrl : https://ckcz123.github.io/mota-js/#/event?id=settext%ef%bc%9a%e8%ae%be%e7%bd%ae%e5%89%a7%e6%83%85%e6%96%87%e6%9c%ac%e7%9a%84%e5%b1%9e%e6%80%a7 -default : [null,"255,215,0,1","255,255,255,1","0,0,0,0.85",[['不改变','null'],['设为粗体','true'],['取消粗体','false']]] -SetTextPosition_List_0 = ', "position": "'+SetTextPosition_List_0+'"'; +default : [[['不改变','null'],['上','up'],['中','center'],['下','down']],"255,215,0,1","255,255,255,1","0,0,0,0.85",[['不改变','null'],['设为粗体','true'],['取消粗体','false']]] +SetTextPosition_List_0 =SetTextPosition_List_0==='null'?'': ', "position": "'+SetTextPosition_List_0+'"'; var colorRe = /^(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d),(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d),(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(,0(\.\d+)?|,1)?$/; if (EvalString_0) { if (!colorRe.test(EvalString_0))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1'); @@ -908,7 +909,7 @@ Stair_List ; SetTextPosition_List - : 'center'|'up'|'down' + : 'null'|'center'|'up'|'down' ; ShopUse_List From d754df5a831954a5a2701cbdf06f0740ad1d808b Mon Sep 17 00:00:00 2001 From: YouWei Zhao Date: Wed, 28 Feb 2018 14:48:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9event=E6=98=BE=E4=BC=A4?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _server/blockly/MotaAction.g4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index f4e63988..efc92009 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -11,7 +11,7 @@ event_m /* event_m tooltip : 编辑魔塔的事件 helpUrl : https://ckcz123.github.io/mota-js/#/event -default : [null,[['不改变','null'],['不可通行','true'],['可以通行','false']],false] +default : [null,[['不改变','null'],['不可通行','true'],['可以通行','false']],null] B_List_0=eval(B_List_0); var code = { 'trigger': 'action', @@ -20,7 +20,7 @@ var code = { 'displayDamage': Bool_1, 'data': 'data_asdfefw' } -if (Bool_0 && (B_List_0===null) && !Bool_1) code = 'data_asdfefw'; +if (Bool_0 && (B_List_0===null) && Bool_1) code = 'data_asdfefw'; code=JSON.stringify(code,null,2).split('"data_asdfefw"').join('[\n'+action_0+']\n'); return code; */