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

显示选择项提供启用条件

Browse Source
This commit is contained in:
ckcz123 2020-07-15 19:18:44 +08:00
parent da3546c840
commit a216caf004
6 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_server/MotaAction.g4
View File

@ -2428,20 +2428,21 @@ return code;
*/;
choicesContext
: '子选项' EvalString '图标' IdString? '颜色' ColorString? Colour '出现条件' EvalString? BGNL? Newline action+
: '子选项' EvalString '图标' IdString? '颜色' ColorString? Colour '启用条件' EvalString? '出现条件' EvalString? BGNL? Newline action+
/* choicesContext
tooltip : 选项的选择
helpUrl : /_docs/#/instruction
default : ["提示文字:红钥匙","","",""]
default : ["提示文字:红钥匙","","","",""]
allIds : ['IdString_0']
colour : this.subColor
ColorString_0 = ColorString_0 ? (', "color": ['+ColorString_0+']') : '';
EvalString_1 = EvalString_1 && (', "condition": "'+EvalString_1+'"')
EvalString_1 = EvalString_1 && (', "need": "'+EvalString_1+'"');
EvalString_2 = EvalString_2 && (', "condition": "'+EvalString_2+'"');
IdString_0 = IdString_0?(', "icon": "'+IdString_0+'"'):'';
var collapsed=block.isCollapsed()?', "_collapsed": true':'';
var code = '{"text": "'+EvalString_0+'"'+IdString_0+ColorString_0+EvalString_1+collapsed+', "action": [\n'+action_0+']},\n';
var code = '{"text": "'+EvalString_0+'"'+IdString_0+ColorString_0+EvalString_1+EvalString_2+collapsed+', "action": [\n'+action_0+']},\n';
return code;
*/;

2
_server/MotaActionParser.js
View File

@ -689,7 +689,7 @@ ActionParser.prototype.parseAction = function() {
for(var ii=data.choices.length-1,choice;choice=data.choices[ii];ii--) {
choice.color = this.Colour(choice.color);
text_choices=MotaActionFunctions.xmlText('choicesContext', [
choice.text,choice.icon,choice.color,'rgba('+choice.color+')',choice.condition||'',this.insertActionList(choice.action),text_choices],
choice.text,choice.icon,choice.color,'rgba('+choice.color+')',choice.need||'',choice.condition||'',this.insertActionList(choice.action),text_choices],
/* isShadow */false, /*comment*/ null, /*collapsed*/ choice._collapsed);
}
if (!this.isset(data.text)) data.text = '';

2
_server/editor_blocklyconfig.js
View File

@ -108,7 +108,7 @@ editor_blocklyconfig=(function(){
MotaActionBlocks['confirm_s'].xmlText(),
MotaActionBlocks['choices_s'].xmlText([
'选择剑或者盾','流浪者','man',0,MotaActionBlocks['choicesContext'].xmlText([
'剑','','',null,'',MotaActionFunctions.actionParser.parseList([{"type": "openDoor", "loc": [3,3]}]),
'剑','','',null,'','',MotaActionFunctions.actionParser.parseList([{"type": "openDoor", "loc": [3,3]}]),
])
]),
],

7
libs/actions.js
View File

@ -974,10 +974,15 @@ actions.prototype._clickAction = function (x, y) {
if (x >= this.CHOICES_LEFT && x <= this.CHOICES_RIGHT) {
var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0);
if (y >= topIndex && y < topIndex + choices.length) {
var choice = choices[y - topIndex];
if (choice.need != null && choice.need != '' && !core.calValue(choice.need)) {
core.drawTip("无法选择此项");
return;
}
clearTimeout(core.status.event.interval);
// 选择
core.status.route.push("choices:" + (y - topIndex));
core.insertAction(choices[y - topIndex].action);
core.insertAction(choice.action);
core.doAction();
}
}

8
libs/events.js
View File

@ -1866,7 +1866,13 @@ events.prototype._action_choices = function (data, x, y, prefix) {
setTimeout(function () {
core.status.route.push("choices:"+index);
if (index != 'none') {
core.insertAction(data.choices[index].action);
// 检查
var choice = data.choices[index];
if (choice.need != null && choice.need != '' && !core.calValue(choice.need)) {
// 无法选择此项：直接忽略
} else {
core.insertAction(choice.action);
}
}
core.doAction();
}, core.status.replay.speed == 24 ? 1 : 750 / Math.max(1, core.status.replay.speed));

1
libs/ui.js
View File

@ -1659,6 +1659,7 @@ ui.prototype._drawChoices_drawChoices = function (choices, isWindowSkin, hPos, v
core.setFont('ui', this._buildFont(17, true));
for (var i = 0; i < choices.length; i++) {
var color = core.arrayToRGBA(choices[i].color || core.status.textAttribute.text);
if (choices[i].need != null && choices[i].need != '' && !core.calValue(choices[i].need)) color = '#999999';
core.setFillStyle('ui', color);
var offset = this.HPIXEL;
if (choices[i].icon) {