jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add animate_1_s

Browse Source
This commit is contained in:
ckcz123 2021-07-23 14:43:42 +08:00
parent 0743875310
commit edba4dad59
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_server/MotaAction.g4
View File

@ -1893,7 +1893,7 @@ helpUrl : /_docs/#/instruction
default : ["zone","","",false,false] default : ["zone","","",false,false]
allAnimates : ['IdString_0'] allAnimates : ['IdString_0']
material : ["./project/animates/", "IdString_0"] material : ["./project/animates/", "IdString_0"]
selectPoint : ["PosString_0", "PosString_1"] menu : [['选择位置', 'editor_blockly.selectPoint(block, ["PosString_0", "PosString_1"])']]
colour : this.soundColor colour : this.soundColor
var loc = PosString_0&&PosString_1?(', "loc": ['+PosString_0+','+PosString_1+']'):''; var loc = PosString_0&&PosString_1?(', "loc": ['+PosString_0+','+PosString_1+']'):'';
Bool_0 = Bool_0?', "alignWindow": true':''; Bool_0 = Bool_0?', "alignWindow": true':'';

15
_server/editor_blockly.js
View File

@ -344,7 +344,7 @@ editor_blockly = function () {
editor_blockly.selectMaterial = function(b,material){ editor_blockly.selectMaterial = function(b,material){
editor.uievent.selectMaterial([b.getFieldValue(material[1])], '请选择素材', material[0], function (one) { editor.uievent.selectMaterial([b.getFieldValue(material[1])], '请选择素材', material[0], function (one) {
if (b.type == 'animate_s') { if (b.type == 'animate_s' || b.type == 'animate_1_s') {
return /^[-A-Za-z0-9_.]+\.animate$/.test(one) ? one.substring(0, one.length - 8) : null; return /^[-A-Za-z0-9_.]+\.animate$/.test(one) ? one.substring(0, one.length - 8) : null;
} }
return /^[-A-Za-z0-9_.]+$/.test(one) ? one : null; return /^[-A-Za-z0-9_.]+$/.test(one) ? one : null;
@ -485,10 +485,6 @@ editor_blockly = function () {
var floorId = editor.currentFloorId, pos = editor.pos, x = pos.x, y = pos.y; var floorId = editor.currentFloorId, pos = editor.pos, x = pos.x, y = pos.y;
var xv = block.getFieldValue(arr[0]), yv = block.getFieldValue(arr[1]); var xv = block.getFieldValue(arr[0]), yv = block.getFieldValue(arr[1]);
if (arr[0] === arr[1]) {
var v = block.getFieldValue(arr[0]).split(",");
xv = parseInt(v[0]); yv = parseInt(v[1]);
}
if (xv != null) x = xv; if (xv != null) x = xv;
if (yv != null) y = yv; if (yv != null) y = yv;
if (arr[2] != null) floorId = block.getFieldValue(arr[2]) || floorId; if (arr[2] != null) floorId = block.getFieldValue(arr[2]) || floorId;
@ -499,13 +495,8 @@ editor_blockly = function () {
if (fv != editor.currentFloorId || editor_blockly.entryType == 'commonEvent') block.setFieldValue(fv, arr[2]); if (fv != editor.currentFloorId || editor_blockly.entryType == 'commonEvent') block.setFieldValue(fv, arr[2]);
else block.setFieldValue(arr[3] ? fv : "", arr[2]); else block.setFieldValue(arr[3] ? fv : "", arr[2]);
} }
if (arr[0] === arr[1]) { block.setFieldValue(xv+"", arr[0]);
block.setFieldValue(xv+","+yv, arr[0]); block.setFieldValue(yv+"", arr[1]);
}
else {
block.setFieldValue(xv+"", arr[0]);
block.setFieldValue(yv+"", arr[1]);
}
if (block.type == 'changeFloor_m' || block.type == 'changeFloor_s') { if (block.type == 'changeFloor_m' || block.type == 'changeFloor_s') {
block.setFieldValue("floorId", "Floor_List_0"); block.setFieldValue("floorId", "Floor_List_0");
block.setFieldValue("loc", "Stair_List_0"); block.setFieldValue("loc", "Stair_List_0");