Fix changeFloor Time

This commit is contained in:
ckcz123 2018-11-25 13:04:30 +08:00
parent 8c4946ffad
commit 41df301079
5 changed files with 21 additions and 34 deletions

View File

@ -197,7 +197,7 @@ if (Floor_List_0!='floorId') toFloorId = Floor_List_0;
var loc = ', "loc": ['+Number_0+', '+Number_1+']'; var loc = ', "loc": ['+Number_0+', '+Number_1+']';
if (Stair_List_0!=='loc')loc = ', "stair": "'+Stair_List_0+'"'; if (Stair_List_0!=='loc')loc = ', "stair": "'+Stair_List_0+'"';
DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"'); DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"');
Int_0 = Int_0 ?(', "time": '+Int_0):''; Int_0 = (Int_0!=='') ?(', "time": '+Int_0):'';
Bool_0 = Bool_0 ?'':(', "portalWithoutTrigger": false'); Bool_0 = Bool_0 ?'':(', "portalWithoutTrigger": false');
var code = '{"floorId": "'+toFloorId+'"'+loc+DirectionEx_List_0+Int_0+Bool_0+' }\n'; var code = '{"floorId": "'+toFloorId+'"'+loc+DirectionEx_List_0+Int_0+Bool_0+' }\n';
return code; return code;

View File

@ -307,6 +307,19 @@ comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
"_bool": "bool", "_bool": "bool",
"_data": "该层是否不允许被浏览地图看到;如果勾上则浏览地图会跳过该层" "_data": "该层是否不允许被浏览地图看到;如果勾上则浏览地图会跳过该层"
}, },
"firstArrive": {
"_leaf": true,
"_type": "event",
"_event": "firstArrive",
"_data": "第一次到该楼层触发的事件,可以双击进入事件编辑器。"
},
"parallelDo": {
"_leaf": true,
"_type": "textarea",
"_string": true,
"_lint": true,
"_data": "在该层楼时执行的并行事件处理。\n可以在这里写上任意需要自动执行的脚本比如打怪自动开门等。\n详见文档-事件-并行事件处理。"
},
"upFloor": { "upFloor": {
"_leaf": true, "_leaf": true,
"_type": "textarea", "_type": "textarea",
@ -353,19 +366,6 @@ comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
"_range": "(thiseval==~~thiseval && thiseval>=0)||thiseval==null", "_range": "(thiseval==~~thiseval && thiseval>=0)||thiseval==null",
"_data": "每一层的宝石/血瓶效果,即获得宝石和血瓶时框内\"ratio\"的值。" "_data": "每一层的宝石/血瓶效果,即获得宝石和血瓶时框内\"ratio\"的值。"
}, },
"firstArrive": {
"_leaf": true,
"_type": "event",
"_event": "firstArrive",
"_data": "第一次到该楼层触发的事件,可以双击进入事件编辑器。"
},
"parallelDo": {
"_leaf": true,
"_type": "textarea",
"_string": true,
"_lint": true,
"_data": "在该层楼时执行的并行事件处理。\n可以在这里写上任意需要自动执行的脚本比如打怪自动开门等。\n详见文档-事件-并行事件处理。"
},
"underGround": { "underGround": {
"_leaf": true, "_leaf": true,
"_type": "checkbox", "_type": "checkbox",

View File

@ -132,11 +132,10 @@ editor_file = function (editor, callback) {
var currData=editor.currentFloorData; var currData=editor.currentFloorData;
var saveStatus = document.getElementById('newMapStatus').checked; var saveStatus = document.getElementById('newMapStatus').checked;
var floorId = saveFilename;
var title = saveStatus?currData.title:"新建楼层"; var title = saveStatus?currData.title:"新建楼层";
var name = saveStatus?currData.name:"0"; var name = saveStatus?currData.name:"0";
if (/^mt\d+$/i.test(floorId)) { if (/^mt\d+$/i.test(saveFilename)) {
name = floorId.substring(2); name = saveFilename.substring(2);
title = "主塔 "+name+" 层"; title = "主塔 "+name+" 层";
} }
editor.currentFloorData = { editor.currentFloorData = {
@ -157,7 +156,7 @@ editor_file = function (editor, callback) {
color: saveStatus?currData.color:null, color: saveStatus?currData.color:null,
weather: saveStatus?currData.weather:null, weather: saveStatus?currData.weather:null,
firstArrive: [], firstArrive: [],
parallelDo: null, parallelDo: "",
events: {}, events: {},
changeFloor: {}, changeFloor: {},
afterBattle: {}, afterBattle: {},

View File

@ -25,11 +25,11 @@ main.floors.MT0=
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
], ],
"firstArrive": [], "firstArrive": [],
"parallelDo": "",
"events": {}, "events": {},
"changeFloor": {}, "changeFloor": {},
"afterBattle": {}, "afterBattle": {},
"afterGetItem": {}, "afterGetItem": {},
"afterOpenDoor": {}, "afterOpenDoor": {},
"cannotMove": {}, "cannotMove": {},
"upFloor": null,
} }

View File

@ -769,19 +769,7 @@ main.floors.sample1=
], ],
"10,12": null "10,12": null
}, },
"afterGetItem": { "afterGetItem": {},
"10,12": null "afterOpenDoor": {},
}, "cannotMove": {},
"afterOpenDoor": {
"10,12": null
},
"cannotMove": {
"10,12": null
},
"bgmap": [
],
"fgmap": [
],
} }