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

Small fix

Browse Source
This commit is contained in:
ckcz123 2021-07-21 17:51:09 +08:00
parent 92779303ef
commit 634c9cdeba
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_server/MotaAction.g4
View File

@ -3274,6 +3274,9 @@ var ops = {
'**': 'Math.pow('+expression_0+','+expression_1+')', '**': 'Math.pow('+expression_0+','+expression_1+')',
'min': 'Math.min('+expression_0+','+expression_1+')', 'min': 'Math.min('+expression_0+','+expression_1+')',
'max': 'Math.max('+expression_0+','+expression_1+')', 'max': 'Math.max('+expression_0+','+expression_1+')',
'blockId': 'core.getBlockId('+expression_0+','+expression_1+')',
'blockNum': 'core.getBlockNum('+expression_0+','+expression_1+')',
'blockCls': 'core.getBlockCls('+expression_0+','+expression_1+')',
} }
if (ops[Arithmetic_List_0])code = ops[Arithmetic_List_0]; if (ops[Arithmetic_List_0])code = ops[Arithmetic_List_0];
var orders = { var orders = {
@ -3296,6 +3299,9 @@ var orders = {
'^': Blockly.JavaScript.ORDER_BITWISE_XOR, '^': Blockly.JavaScript.ORDER_BITWISE_XOR,
'min': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA 'min': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA
'max': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA 'max': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA
'blockId': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA
'blockNum': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA
'blockCls': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA
} }
return [code, orders[Arithmetic_List_0]]; return [code, orders[Arithmetic_List_0]];
*/; */;
@ -3522,8 +3528,8 @@ ShopUse_List
/*ShopUse_List ['money','exp']*/; /*ShopUse_List ['money','exp']*/;
Arithmetic_List Arithmetic_List
: '加'|'减'|'乘'|'除'|'取余'|'乘方'|'等于'|'不等于'|'大于'|'小于'|'大于等于'|'小于等于'|'且'|'或'|'异或'|'取较大'|'取较小'|'弱相等'|'弱不相等' : '加'|'减'|'乘'|'除'|'取余'|'乘方'|'等于'|'不等于'|'大于'|'小于'|'大于等于'|'小于等于'|'且'|'或'|'异或'|'取较大'|'取较小'|'弱相等'|'弱不相等'|'图块id'|'图块数字'|'图块类型'
/*Arithmetic_List ['+','-','*','/','%','**','===','!==','>','<','>=','<=','&&','||','^','max','min','==','!=']*/; /*Arithmetic_List ['+','-','*','/','%','**','===','!==','>','<','>=','<=','&&','||','^','max','min','==','!=','blockId','blockNum','blockCls']*/;
AssignOperator_List AssignOperator_List
: '设为'|'增加'|'减少'|'乘以'|'除以'|'乘方'|'除以并取商'|'除以并取余'|'设为不小于'|'设为不大于' : '设为'|'增加'|'减少'|'乘以'|'除以'|'乘方'|'除以并取商'|'除以并取余'|'设为不小于'|'设为不大于'

1
libs/events.js
View File

@ -560,7 +560,6 @@ events.prototype._sys_getItem = function (data, callback) {
////// 获得某个物品 ////// ////// 获得某个物品 //////
events.prototype.getItem = function (id, num, x, y, isGentleClick, callback) { events.prototype.getItem = function (id, num, x, y, isGentleClick, callback) {
if (num == null) num = 1; if (num == null) num = 1;
num = num || 1;
var itemCls = core.material.items[id].cls; var itemCls = core.material.items[id].cls;
core.removeBlock(x, y); core.removeBlock(x, y);
core.items.getItemEffect(id, num); core.items.getItemEffect(id, num);

6
project/functions.js
View File

@ -214,7 +214,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
core.status.route.push("fly:" + toId); core.status.route.push("fly:" + toId);
// 传送 // 传送
core.ui.closePanel(); core.ui.closePanel();
core.changeFloor(toId, stair, loc, null, callback); core.setFlag('__isFlying__', true);
core.changeFloor(toId, stair, loc, null, function () {
core.removeFlag("__isFlying__");
if (callback) callback();
});
return true; return true;
}, },