diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4 index fd95279..3937e68 100644 --- a/_server/MotaAction.g4 +++ b/_server/MotaAction.g4 @@ -1968,16 +1968,17 @@ return code; */; drawWarning_s - : '警告坐标x' PosString 'y' PosString '文字大小'Int '警告内容' EvalString? '副标题' EvalString? '不播放音效' Bool? Newline + : '警告坐标x' PosString 'y' PosString '缩放倍率'EvalString '文字大小'Int '警告内容' EvalString? '副标题' EvalString? '不播放音效' Bool? Newline /* drawWarning_s tooltip : drawWarning: 绘制warning警告并拉进镜头,本事件为异步事件,下一事件将在3100ms后执行 helpUrl : /_docs/#/instruction -default : [0, 0,24,"这里是提示内容","绿色史莱姆",false] +default : [0, 0,'2',24,"这里是提示内容","绿色史莱姆",false] colour : this.soundColor selectPoint : ["PosString_0", "PosString_1"] -var code = '{"type": "drawWarning", "x": '+PosString_0+', "y": '+PosString_1+',"size":'+Int_0+',"text": "'+EvalString_0+'", "text2": "'+EvalString_1+'", "warning": '+Bool_0+'},\n'; +if(!EvalString_1||!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_1))throw new Error("此项仅能填写小数或整数"); +var code = '{"type": "drawWarning", "x": '+PosString_0+', "y": '+PosString_1+',"large":'+EvalString_0+',"size":'+Int_0+',"text": "'+EvalString_1+'", "text2": "'+EvalString_2+'", "warning": '+Bool_0+'},\n'; return code; */; diff --git a/_server/MotaActionParser.js b/_server/MotaActionParser.js index 18f7066..85647da 100644 --- a/_server/MotaActionParser.js +++ b/_server/MotaActionParser.js @@ -2105,6 +2105,7 @@ MotaActionParser = function () { this.next = MotaActionBlocks["drawWarning_s"].xmlText([ data.x, data.y, + data.large, data.size, data?.text, data?.text2, diff --git a/project/data.js b/project/data.js index 1100d93..3684d33 100644 --- a/project/data.js +++ b/project/data.js @@ -11,7 +11,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "jiaotang", "shengnvhome", "shinvhome", - "jiedao", + "changguan2", "street01", "street02", "guangchang", @@ -28,7 +28,12 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "yiqu7", "yiqu8", "yiqu9", - "yiqu10" + "yiqu10", + "changguan1", + "guangchang3", + "guangchang4", + "yushou", + "zhujuejia" ], "floorPartitions": [], "images": [ @@ -886,7 +891,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "8.webp", "7.webp", "10.webp", - "C5.webp" + "C5.webp", + "c6.png" ], "animates": [ "hand", @@ -1097,7 +1103,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "title": "秽翼的尤斯蒂娅", "name": "Eustia", "version": "鸽子窝造塔小队", - "floorId": "street01", + "floorId": "yiqu1", "hero": { "image": "hero.webp", "animate": false, @@ -1122,7 +1128,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "loc": { "direction": "up", "x": 5, - "y": 11 + "y": 10 }, "flags": { "itemDetail": true, diff --git a/project/floors/changguan1.js b/project/floors/changguan1.js new file mode 100644 index 0000000..b87602f --- /dev/null +++ b/project/floors/changguan1.js @@ -0,0 +1,99 @@ +main.floors.changguan1= +{ + "floorId": "changguan1", + "title": "主塔 10 层", + "name": "10", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "images": [], + "ratio": 1, + "defaultGround": "grass2", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "6,12": { + "floorId": "changguan2", + "loc": [ + 6, + 0 + ] + }, + "6,0": { + "floorId": "guangchang", + "loc": [ + 6, + 12 + ] + }, + "5,0": { + "floorId": "guangchang", + "loc": [ + 5, + 12 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [70014,70014,70014,70014, 0, 91, 91, 0,70014,70014,70014,70014,70014], + [70014,70014,70014,70014, 0, 0, 0, 0,70014,70014,70014,70014,70014], + [70014,70014,70014,70014, 0, 0, 0, 0,70014,70014,70014,70014,70014], + [70014,70014,70014,70014,200199, 0, 0, 0, 0,70014,70014,70014,70014], + [70014,70014,70014,70014, 0, 0, 0, 0, 0,70014,70014,70014,70014], + [70014,70014,70014,70014, 0, 0, 0, 0, 0, 0, 0, 0, 94], + [70014,70014,70014,70014, 0, 0, 0, 0, 0, 0, 0,10254,10248], + [70014,70014,70014,70014, 0, 0, 0,200199, 0,143,143,143,143], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,143,143,143,143], + [210145,210145,210146, 0, 0, 0, 0, 0, 0,143,143,143,143], + [210153,210153,210154, 0, 0, 0, 0, 0,143,143,143,143,143], + [210153,210153,210154, 0, 0, 0, 0, 0,143,143,143,143,143], + [210153,210153,210154, 0, 0, 0, 93, 0,143,143,143,143,143] +], + "bgmap": [ + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,70025,70025,70025,70025,70025,70025], + [90078,90078,90078,90078,90078,70025,70025,70025,70025,70025,70025,70025,70025], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70025,70025,90078,90078,90078,90078,90078,90078] +], + "fgmap": [ + [ 0, 0, 0, 0,200175, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,200183, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,200191, 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, 0, 0,200175, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,200183, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,200191, 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, 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, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,200175, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,200183, 0, 0, 0, 0, 0, 0, 0, 0] +], + "bg2map": [ + +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/project/floors/changguan2.js b/project/floors/changguan2.js new file mode 100644 index 0000000..6b42098 --- /dev/null +++ b/project/floors/changguan2.js @@ -0,0 +1,105 @@ +main.floors.changguan2= +{ + "floorId": "changguan2", + "title": "街道", + "name": "1", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "images": [], + "ratio": 1, + "defaultGround": "X20003", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "6,0": { + "floorId": "changguan1", + "loc": [ + 6, + 12 + ] + }, + "12,8": { + "floorId": "street01", + "loc": [ + 0, + 8 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [130177,130178,50095,130061, 0, 0, 91, 0,210152,210152,210153,210153,210154], + [130177,130178, 0, 0,200199, 0, 0, 0,210160,210152,210153,210153,210154], + [130177,130178, 0, 0, 0, 0, 0, 0,210168,210152,210153,210153,210154], + [143,143,143,143, 0, 0, 0, 0,120165,210152,210153,210153,210154], + [143,210148,143,143, 0, 0, 0,71826,120173,210160,210161,210161,210162], + [143,143,143,143,71226, 0, 0, 0,50151,210168,210169,210169,210170], + [143,143,143,143,71819, 0, 0, 0, 0,120165,120166,120166,120167], + [210153,210153,210153,143,71827, 0, 0, 0,71826,120056,120174,120174,120175], + [210153,210153,210153,143,71695, 0, 0, 0, 0, 0, 0, 0, 94], + [143,143,143,143, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [130177,130177,130178,120167, 0, 0,200199, 0, 0, 0,210144,143,143], + [130177,130177,130178,40165, 0,71791,71791,71791, 0, 0,130176,143,143], + [130185,130185,130186,110114,110114,143,143,143,143,143,130176,143,143] +], + "areas": "牢狱", + "bgmap": [ + [90078,90078,90078,90078,90078,70041,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70024,70026,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70033,70041,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70040,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70033,70024,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70026,70040,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70041,70026,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70024,70025,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,70026,70033,70024,70033,70033,70024,70040,70041], + [90078,90078,90078,90078,90078,70040,70025,70026,70040,70041,70025,70026,70033], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078] +], + "fgmap": [ + [210153,210154, 0, 0,200191, 0, 0, 0, 0, 0, 0, 0, 0], + [210153,210154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [210153,210154,130068,130069, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [210161,210162,210145,210146, 0, 0, 0,71818, 0, 0, 0, 0, 0], + [210147,210148,210153,210154,71218, 0, 0, 0,71818, 0, 0, 0, 0], + [210153,210153,210153,210154, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [210153,210153,210153,210154,71685, 0, 0, 0,71818, 0,90587, 0, 0], + [210145,210145,210146,210154,71844, 0,200175, 0, 0, 0, 0, 0, 0], + [210153,210153,210154,210162, 0, 0,200183, 0, 0, 0, 0, 0, 0], + [210153,210153,210154,210170, 0, 0,200191, 0, 0, 0, 0, 0, 0], + [210153,210153,210154, 0, 0, 0, 0, 0, 0,71818,210144,140,140], + [210153,210153,210154, 0, 0, 0, 0, 0,71832,71833,210152,140,140], + [210153,210153,210154, 0, 0,210144,140,140,140,210146,210152,140,140] +], + "bg2map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,50103, 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, 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, 0, 0, 0, 0, 0,71826, 0, 0, 0, 0], + [ 0, 0, 0, 0,71693, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,120173, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,120064, 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, 0, 0, 0], + [ 0, 0, 0,120175, 0, 0, 0, 0, 0,71826, 0, 0, 0], + [ 0, 0, 0,40173, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/project/floors/guangchang.js b/project/floors/guangchang.js index 2adfdaa..0928a7f 100644 --- a/project/floors/guangchang.js +++ b/project/floors/guangchang.js @@ -10,27 +10,40 @@ main.floors.guangchang= "canUseQuickShop": true, "images": [], "ratio": 1, - "defaultGround": "grass2", + "defaultGround": "X90078", "firstArrive": [], "eachArrive": [], "parallelDo": "", "events": {}, "changeFloor": { - "12,6": { - "floorId": "street02", + "6,0": { + "floorId": "guangchang4", + "loc": [ + 6, + 12 + ] + }, + "12,10": { + "floorId": "guangchang2", "loc": [ 0, - 6 + 10 ], "direction": "right" }, "6,12": { - "floorId": "guangchang2", + "floorId": "changguan1", "loc": [ 6, 0 - ], - "direction": "down" + ] + }, + "5,12": { + "floorId": "changguan1", + "loc": [ + 5, + 0 + ] } }, "beforeBattle": {}, @@ -41,29 +54,53 @@ main.floors.guangchang= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,140], + [ 0, 0, 0, 0, 0, 0, 91, 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, 0, 0, 0, 0, 0, 94], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,140,141] + [ 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], + [ 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], + [ 0, 0, 0, 0, 0, 0, 0,140091,140092,140093, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,140099,140100,140101, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,140107,140108,140109, 0, 0, 0], + [140087, 0, 0, 0, 0, 0, 0,70819,70820,70821, 0, 0, 94], + [140095, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [140103, 0, 0, 0, 0, 93, 93, 0, 0, 0, 0, 0, 0] ], "areas": "牢狱", "bgmap": [ - + [ 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], + [ 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], + [ 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], + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,70803,70804,70805, 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, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fgmap": [ ], "bg2map": [ - + [ 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], + [ 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], + [ 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], + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0,122, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,60167, 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, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fg2map": [ diff --git a/project/floors/guangchang2.js b/project/floors/guangchang2.js index 8247ca4..3f5dc05 100644 --- a/project/floors/guangchang2.js +++ b/project/floors/guangchang2.js @@ -10,26 +10,39 @@ main.floors.guangchang2= "canUseQuickShop": true, "images": [], "ratio": 1, - "defaultGround": "grass2", + "defaultGround": "X90078", "firstArrive": [], "eachArrive": [], "parallelDo": "", "events": {}, "changeFloor": { - "6,0": { - "floorId": "guangchang", - "loc": [ - 6, - 12 - ], - "direction": "up" - }, "12,10": { "floorId": "xiaoxiang01", "loc": [ 0, 10 ] + }, + "6,0": { + "floorId": "guangchang3", + "loc": [ + 6, + 12 + ] + }, + "0,10": { + "floorId": "guangchang", + "loc": [ + 12, + 10 + ] + }, + "9,12": { + "floorId": "yushou", + "loc": [ + 9, + 0 + ] } }, "beforeBattle": {}, @@ -40,23 +53,35 @@ main.floors.guangchang2= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 0, 0, 0, 0, 0, 0, 91, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,141], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140] + [ 0, 0, 0, 0, 0, 0, 91, 0, 0, 0, 0,143,143], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143,143], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130192,130193], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130200,143], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], + [ 0, 0, 0, 0, 0,210105,210106,210107, 0, 0, 0, 0,143], + [ 0, 0, 0, 0, 0,210113,210114,210115, 0, 0, 0, 0,143], + [ 0, 0, 0, 0, 0,210121,210122,210123, 0, 0, 0, 0,143], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130192], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130200], + [ 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,110189], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 0, 0,110197] ], "areas": "牢狱", "bgmap": [ - + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209] ], "fgmap": [ diff --git a/project/floors/guangchang3.js b/project/floors/guangchang3.js new file mode 100644 index 0000000..9abb480 --- /dev/null +++ b/project/floors/guangchang3.js @@ -0,0 +1,104 @@ +main.floors.guangchang3= +{ + "floorId": "guangchang3", + "title": "主塔 10 层", + "name": "10", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "images": [], + "ratio": 1, + "defaultGround": "X90078", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "6,12": { + "floorId": "guangchang2", + "loc": [ + 6, + 0 + ] + }, + "0,10": { + "floorId": "guangchang4", + "loc": [ + 12, + 10 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [210161,210161,210162,210185,210186,210186,210186,210186,210186,210186,210160,210161,210161], + [210169,210169,210170,210185,210186,210186,210186,210186,210186,210186,210168,210169,210169], + [210178,210178,210176,210193,210194,210194,210194,210194,210194,210194,210176,210177,210178], + [210178,210178,210184, 0, 0, 0, 0, 0, 0, 0,210184,210177,210178], + [210178,210178,210184,364, 0, 0,132, 0, 0,365,210184,210177,210178], + [210186,210186,210184,364, 0, 0, 0, 0, 0,365,210184,210185,210186], + [210194,210194,210192,361,362,362,362,362,362,363,210192,210193,210194], + [210076,210077, 0,210184,210185,210186,210186,210186,210186,210184, 0,210078,210079], + [210084,210085, 0,210192,210193,210194,210194,210194,210194,210192, 0,210086,210087], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 92, 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, 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, 0, 0] +], + "bgmap": [ + [ 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], + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [210209,210209,210209, 0, 0, 0, 0, 0, 0, 0,210209,210209,210209], + [210209,210209,210209, 0, 0, 0, 0, 0, 0, 0,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209] +], + "fgmap": [ + [ 0, 0, 0, 0,210142, 0, 0, 0,210142, 0, 0, 0, 0], + [ 0, 0, 0, 0,210150, 0, 0, 0,210150, 0, 0, 0, 0], + [ 0,210142, 0, 0, 0, 0, 0, 0, 0, 0, 0,210142, 0], + [210131,210150, 0, 0, 0, 0, 0, 0, 0, 0, 0,210150,210131], + [210139, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,210139], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [210068,210069, 0, 0, 0, 0, 0, 0, 0, 0, 0,210070,210071], + [ 0, 0, 0, 0, 0,210142, 0,210142, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,210150, 0,210150, 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, 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, 0, 0, 0, 0, 0] +], + "bg2map": [ + [ 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], + [ 0, 0, 0,70513,70513,70513,70513,70513,70513,70513, 0, 0, 0], + [ 0, 0, 0,70513,70513,70513,70513,70513,70513,70513, 0, 0, 0], + [ 0, 0, 0,70512,70513,70513,70513,70513,70513,70514, 0, 0, 0], + [ 0, 0, 0,70512,70513,70513,70513,70513,70513,70514, 0, 0, 0], + [ 0, 0, 0,70520,70521,70521,70521,70521,70521,70522, 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, 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, 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, 0, 0, 0] +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/project/floors/guangchang4.js b/project/floors/guangchang4.js new file mode 100644 index 0000000..d0b1b98 --- /dev/null +++ b/project/floors/guangchang4.js @@ -0,0 +1,104 @@ +main.floors.guangchang4= +{ + "floorId": "guangchang4", + "title": "主塔 10 层", + "name": "10", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "images": [], + "ratio": 1, + "defaultGround": "X90078", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "6,12": { + "floorId": "guangchang", + "loc": [ + 6, + 0 + ] + }, + "12,10": { + "floorId": "guangchang3", + "loc": [ + 0, + 10 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [210161,210161,210161,210162,364, 0,272, 0,365,210160,210161,210161,210161], + [210169,210169,210169,210170,364,271, 0,271,365,210168,210169,210169,210169], + [210181,210181,210182,210176,361,362,362,362,363,210176,210180,210181,210181], + [210178,210178,210178,210184,210185,210186,210186,210186,210186,210184,210178,210178,210178], + [210178,210178,210178,210184,210177,10104,10105,10106,210178,210184,210178,210178,210178], + [210186,210186,210186,210184,210193,10112,10113,10114,210194,210184,210186,210186,210186], + [210194,210194,210194,210192,90600,90600,90600,90600,90600,210192,210194,210194,210194], + [ 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], + [ 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, 94], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, 0, 0] +], + "bgmap": [ + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209], + [210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209,210209] +], + "fgmap": [ + [ 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], + [ 0, 0,210142, 0, 0, 0, 0, 0, 0, 0,210142, 0, 0], + [210131,210131,210150, 0,210142, 0, 0, 0,210142, 0,210150,210131,210131], + [210139,210139, 0, 0,210150, 0, 0, 0,210150, 0, 0,210139,210139], + [210142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,210142], + [210150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,210150], + [ 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], + [ 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], + [ 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] +], + "bg2map": [ + [ 0, 0, 0, 0,70513,70513,70513,70513,70513, 0, 0, 0, 0], + [ 0, 0, 0, 0,70513,70513,70513,70513,70513, 0, 0, 0, 0], + [ 0, 0, 0, 0,70513,70513,70513,70513,70513, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,210178,210178,210178, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,210194,210194,210194, 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, 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, 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, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/project/floors/jiuguan.js b/project/floors/jiuguan.js index 02fa764..07f4309 100644 --- a/project/floors/jiuguan.js +++ b/project/floors/jiuguan.js @@ -32,6 +32,7 @@ main.floors.jiuguan= "type": "over", "text": "这段话将在屏幕中心", "image": "bg_5043.png", + "memory": false, "time": 3000, "hidetime": 30, "sound": "", diff --git a/project/floors/street01.js b/project/floors/street01.js index dd4df24..939b8da 100644 --- a/project/floors/street01.js +++ b/project/floors/street01.js @@ -25,41 +25,21 @@ main.floors.street01= ], "direction": "up" } - ], - "10,11": [ - { - "type": "setmusics", - "bgm": "op.opus" - } - ], - "10,10": [ - { - "type": "setmusics", - "bgm": "ed.opus" - }, - { - "type": "setmusics", - "bgm": "Asphodelus_Ceui.opus" - } - ], - "10,9": [ - { - "type": "setmusics" - } - ], - "6,11": [ - { - "type": "insert", - "name": "chapter01" - } ] }, "changeFloor": { "0,8": { - "floorId": "street02", + "floorId": "changguan2", "loc": [ 12, - 6 + 8 + ] + }, + "12,9": { + "floorId": "zhujuejia", + "loc": [ + 0, + 9 ] } }, @@ -91,7 +71,7 @@ main.floors.street01= [110118,110118,200096,110116,110020, 0,200014, 0, 0, 0, 0, 0,110125], [ 92, 0, 0,110124, 0,201, 0, 0,110125,110122,110122,110122,110122], [ 0, 0, 0,110118,110118,202,110118,110118,110122, 0, 0, 0, 94], - [130170, 0, 0, 0, 71, 35, 0, 0, 0, 0, 0, 0, 0], + [130170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [130178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130168,130169], [130225,130169,130169,130169,130169,130170,110122,110122,130168,130169,130169,130224,130177] ], diff --git a/project/floors/street02.js b/project/floors/street02.js index 2c49a82..9bce79d 100644 --- a/project/floors/street02.js +++ b/project/floors/street02.js @@ -16,13 +16,6 @@ main.floors.street02= "parallelDo": "", "events": {}, "changeFloor": { - "12,6": { - "floorId": "street01", - "loc": [ - 0, - 8 - ] - }, "0,6": { "floorId": "guangchang", "loc": [ @@ -30,6 +23,13 @@ main.floors.street02= 6 ], "direction": "left" + }, + "12,8": { + "floorId": "street01", + "loc": [ + 0, + 8 + ] } }, "beforeBattle": {}, @@ -46,9 +46,9 @@ main.floors.street02= [141,141,141,141,141,141,141,141,141,141,141,141,141], [140,140,140,140,140,140,140,140,140,140,140,140,140], [ 0, 0,140, 27, 0,210, 0,209, 0, 0,217, 0, 0], - [ 92, 0,140,140,140,140, 0,140,140,140,140, 0, 94], + [ 92, 0,140,140,140,140, 0,140,140,140,140, 0,140], [ 0, 0,217, 0, 0,209, 0,210, 0, 28,140, 0, 0], - [140,140,140,140,140,140,140,140,140,140,140,140,140], + [140,140,140,140,140,140,140,140,140,140,140,140, 94], [141,141,141,141,141,141,141,141,141,141,141,141,141], [141,141,141,141,141,141,141,141,141,141,141,141,141], [141,141,141,141,141,141,141,141,141,141,141,141,141], diff --git a/project/floors/xiaoxiang01.js b/project/floors/xiaoxiang01.js index 3943dfe..c092a6c 100644 --- a/project/floors/xiaoxiang01.js +++ b/project/floors/xiaoxiang01.js @@ -46,31 +46,79 @@ main.floors.xiaoxiang01= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [141,141,141,141,141,141,141,141,141,141,141,141,141], - [141,141,141,141,141,141,141,141,141,141,141,141,141], - [141,141,141,141,141,141,141,141,141,141,141,141,141], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140, 30,140, 0, 81, 0,221, 0,224, 0, 28, 27,140], - [140,224,140,225,140, 31,140, 0,140,140,140,224,140], - [140, 0, 32, 0,140, 0,140,225,140,224, 0, 0,140], - [140,225,140,140,140, 81,140, 0, 0, 0,140, 0, 94], - [140, 0,222, 0,221, 0,140, 81,140,225,140,140,140], - [140,140,140, 81,140,140,140, 0,140, 0, 81, 31,140], - [ 92, 0, 32, 22, 32,140, 31, 0,140, 0,140,140,140], - [140, 21, 21, 21, 21,140, 0, 0, 81, 0,222, 29,140], - [140,140,140,140,140,140, 93,140,140,140,140,140,140] + [143,143,143,143,130193,130193,130193,130193,130193,143,143,143,143], + [143,143,143,143,130060,130061,130062, 0,120074,143,143,143,143], + [130193,130193,130193,130194,130068,130069,130070,130090,120023,130192,130193,130193,143], + [143,50022,130201,130202,130015,120041,130099,130098,120031,130200,130201,130201,143], + [143, 30,201029, 0, 81, 0,221, 0,224, 0, 28, 27,130192], + [143,224,201037,225,201037, 31,201021, 0,110121,110122,110122,224,130200], + [143, 0, 32, 0,200199, 0,201029,225,110132,224, 0, 0,90675], + [143,225,200998,200999,201037, 81,201029, 0, 0, 0,110116, 0, 94], + [130194, 0,222, 0,221, 0,201029, 81,110116,225,110137,110138,90650], + [130202,201037,201037, 81,201037,201037,201037, 0,110124, 0, 81, 31,90658], + [ 92, 0, 32, 22, 32,80089, 31, 0,110132, 0,110122,110122,110197], + [110191, 21, 21, 21, 21,80089, 0, 0, 81, 0,222, 29,110197], + [140,140,140,110191,80083,80097, 93,110138,110138,140189,140,140,140] ], "areas": "牢狱", "bgmap": [ - + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078] ], "fgmap": [ - + [ 0, 0, 0, 0, 0,120080, 0, 0,120066, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [60038, 0,60038, 0,130007, 0,130091, 0, 0, 0, 0, 0, 0], + [ 0, 0,60046, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,201021, 0, 0, 0,110114,110114,110114, 0, 0], + [ 0, 0, 0, 0,200191, 0, 0, 0, 0, 0, 0, 0,90667], + [ 0, 0,200990,200991,201021, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0,201021,201021, 0,201021,201021, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,110114,110114,110189], + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "bg2map": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,130201,130201, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,120082, 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, 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, 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, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,110134,110134, 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, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fg2map": [ - + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,201021, 0,200175, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,200183, 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, 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0] ] } \ No newline at end of file diff --git a/project/floors/xiaoxiang02.js b/project/floors/xiaoxiang02.js index 13e9a9d..cd94f20 100644 --- a/project/floors/xiaoxiang02.js +++ b/project/floors/xiaoxiang02.js @@ -32,29 +32,65 @@ main.floors.xiaoxiang02= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [141,141,141,141,141,141,141,141,141,141,141,141,141], - [141,141,141,141,141,141,141,141,141,141,141,141,141], - [141,141,141,141,141,141,141,141,141,141,141,141,141], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140, 0, 81, 0,140, 0, 0, 0, 0,140, 0, 0,140], - [140, 0,140, 0,140,140,140,140, 81,140,140, 81,140], - [140, 0,140, 0, 0, 0, 0, 0, 0, 0, 0, 0,140], - [ 92, 0,140,140,140,140, 81,140,140,140, 81,140,140], - [140, 0, 0, 0, 0, 0, 0, 0, 0,140, 0, 0,140], - [140,140,140,140,140, 0,140,140, 82,140,140, 0,140], - [140, 0, 0, 0,140, 0,140, 0, 0, 0, 81, 0,140], - [140, 0, 0, 0, 81, 0,140, 0, 0, 0,140, 0,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140] + [143,143,143,143,143,120166,120166,110205,110206,110206,110206,110206,110206], + [143,143,143,143,143,120174,120174,130192,130193,130193,130193,130193,130193], + [143,130193,130193,130193,130194,190142,90771,130192,130193,130193,130193,130193,130193], + [143,130201,130201,130201,130202,190150,190150,130200,130201, 0,130201,130201,130201], + [130194, 0, 81, 0,72106, 0, 0, 0, 0,72106, 0, 0,143], + [130202, 0,110116, 0,90064,90064,90064,90064, 81,90064,90064, 81,143], + [90675, 0,110124, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], + [ 92, 0,110122,110122,110122,110122, 81,110122,110122,110122, 81,110122,143], + [90651, 0, 0, 0, 0, 0, 0, 0, 0,110129, 0, 0,143], + [90659,71844,110122,200199,110122, 0,110121,110122, 82,110122,110122, 0,143], + [110199, 0, 0, 0, 81, 0,110129, 0, 0, 0, 81, 0,130192], + [110199, 0, 0, 0,110117, 0,110129, 0, 0, 0,200637, 0,143], + [140,140,140,140,110191,72098,72098,72098,143,143,143,143,143] ], "areas": "牢狱", "bgmap": [ - + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078] ], "fgmap": [ - + [ 0, 0, 0, 0, 0,200063,200063, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,90799,110072], + [ 0, 0,90804, 0, 0,190023,190148, 0,90797, 0, 0, 0,110080], + [ 0, 0, 0, 0,72112, 0,190030, 0,90805,72112, 0, 0,110088], + [ 0, 0, 0, 0, 0,72098,72098,72098, 0, 0,72098, 0, 0], + [90667, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,110114,110114,110114,110114, 0,110114,110114,110114, 0,110114, 0], + [ 0, 0, 0,200175, 0, 0, 0, 0, 0,110116, 0, 0, 0], + [ 0,110114,110114,200191,110114, 0,110114,110114, 0,110114,110114, 0, 0], + [110191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,200638, 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, 0, 0] ], "bg2map": [ - + [ 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], + [ 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], + [ 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], + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0,110122, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,110133, 0,110132, 0, 0, 0, 0, 0, 0] ], "fg2map": [ diff --git a/project/floors/xiaoxiang3.js b/project/floors/xiaoxiang3.js index 9b9d310..89ea925 100644 --- a/project/floors/xiaoxiang3.js +++ b/project/floors/xiaoxiang3.js @@ -14,7 +14,68 @@ main.floors.xiaoxiang3= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": {}, + "events": { + "4,8": { + "trigger": null, + "enable": false, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + }, + "8,8": { + "trigger": null, + "enable": false, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + }, + "7,10": { + "trigger": null, + "enable": false, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + }, + "5,10": { + "trigger": null, + "enable": false, + "noPass": null, + "displayDamage": true, + "opacity": 1, + "filter": { + "blur": 0, + "hue": 0, + "grayscale": 0, + "invert": false, + "shadow": 0 + }, + "data": [] + } + }, "changeFloor": { "6,0": { "floorId": "xiaoxiang01", @@ -28,117 +89,112 @@ main.floors.xiaoxiang3= "afterBattle": { "6,8": [ { - "type": "setValue", - "name": "flag:door_xiaoxiang3_4_9", - "operator": "+=", - "value": "1" - }, - { - "type": "setValue", - "name": "flag:door_xiaoxiang3_8_9", - "operator": "+=", - "value": "1" - }, - { - "type": "setValue", - "name": "flag:door_xiaoxiang3_6_11", - "operator": "+=", - "value": "1" + "type": "show", + "loc": [ + [ + 4, + 8 + ], + [ + 5, + 10 + ], + [ + 7, + 10 + ], + [ + 8, + 8 + ], + [ + 6, + 12 + ] + ], + "time": 500 } ] }, "afterGetItem": {}, "afterOpenDoor": {}, - "autoEvent": { - "4,9": { - "0": { - "condition": "flag:door_xiaoxiang3_4_9==1", - "currentFloor": true, - "priority": 0, - "delayExecute": false, - "multiExecute": false, - "data": [ - { - "type": "openDoor" - }, - { - "type": "setValue", - "name": "flag:door_xiaoxiang3_4_9", - "operator": "=", - "value": "null" - } - ] - } - }, - "8,9": { - "0": { - "condition": "flag:door_xiaoxiang3_8_9==1", - "currentFloor": true, - "priority": 0, - "delayExecute": false, - "multiExecute": false, - "data": [ - { - "type": "openDoor" - }, - { - "type": "setValue", - "name": "flag:door_xiaoxiang3_8_9", - "operator": "=", - "value": "null" - } - ] - } - }, - "6,11": { - "0": { - "condition": "flag:door_xiaoxiang3_6_11==1", - "currentFloor": true, - "priority": 0, - "delayExecute": false, - "multiExecute": false, - "data": [ - { - "type": "openDoor" - }, - { - "type": "setValue", - "name": "flag:door_xiaoxiang3_6_11", - "operator": "=", - "value": "null" - } - ] - } - } - }, + "autoEvent": {}, "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [140,140,140,140, 0, 0, 91, 0, 0,140,140,140,140], - [140,140,140,140, 0, 0, 0, 0, 0,140,140,140,140], - [140,140,140,140,140,140, 0,140,140,140,140,140,140], - [140,140,140,140,140,140, 0,140, 0,140,140,140,140], - [140,140,140,140, 0, 0, 0, 0, 0,140,140,140,140], - [140,140,140,140,140,140, 83,140,140,140,140,140,140], - [140,140,140,140, 0, 0, 0, 0, 0,140,140,140,140], - [140,140,140,140, 0, 0, 0, 0, 0,140,140,140,140], - [140,140,140,140, 0, 0,247, 0, 0,140,140,140,140], - [140,140,140,140, 85,140, 0,140, 85,140,140,140,140], - [140,140,140,140, 34,140, 0,140, 27,140,140,140,140], - [140,140,140,140, 21,140, 85,140, 28,140,140,140,140], - [140,140,140,140,140,140, 93,140,140,140,140,140,140] + [ 0, 0, 0,140199,80091,80092, 91,110146,110146,140197,140,140,140], + [ 0, 0, 0,140,140,140, 0,140, 0, 0, 0, 0,140], + [ 0, 0, 0,140204,140206,140206,140206,140206,140206,140203,140,140,140], + [ 0, 0, 0,140199,170263,170252,170253,170254,170263,140197,140,140,140], + [ 0, 0, 0,140199,170263,170260, 0,170262,170263,140197,140,140,140], + [ 0, 0, 0,140199,170263,170268, 83,170270,170263,140205,140206,140206,140206], + [ 0, 0, 0,140199,71843,110122, 0,110122,90649,110208,110209,110209,110209], + [140206,140206,140206,140207, 0, 0, 0, 0, 0,110189,140,140,140], + [110209,110209,110209,110210, 21, 0,247, 0, 27,110197,140,140,140], + [140,140,140,110191, 0, 0, 0, 0, 0,110197,140,140,140], + [140,140,140,110199, 0, 34, 0, 28, 0,140,140,140,140], + [140,140,140,110199,110199, 0, 0, 0,110197,110204,110206,110206,110206], + [140,140,140,110199,110207, 0, 0, 0,110197,110199,110225,110225,110225] ], "areas": "牢狱", "bgmap": [ - + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078] ], "fgmap": [ - + [140,140,140, 0, 0, 0, 0, 0, 0, 0,140,140,140], + [140,140,140,140,140,140,140,140,140,140,140,140,140], + [140,140,140, 0, 0, 0,140206,110327, 0, 0,140,140,140], + [140,140,140, 0, 0, 0,170253,110335, 0, 0,140,140,140], + [140,140,140, 0, 0,110153, 0,110152, 0, 0,140,140,140], + [140,140,140, 0,71835,110161, 0,110160,90648, 0, 0, 0, 0], + [140,140,140, 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, 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, 0,110191, 0, 0, 0,110189, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,110138, 0,110138, 0, 0, 0, 0, 0] ], "bg2map": [ - + [140,140,140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [140,140,140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [140,140,140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [140,140,140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [140,140,140, 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, 0, 0, 0, 0, 0, 0,110216, 0, 0, 0], + [ 0, 0, 0,110218, 0, 0, 0, 0, 0,110216, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,110218, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fg2map": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,110319, 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, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,110114, 0,110114, 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, 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, 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, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ] } \ No newline at end of file diff --git a/project/floors/yiqu1.js b/project/floors/yiqu1.js index 0fbd450..ec80832 100644 --- a/project/floors/yiqu1.js +++ b/project/floors/yiqu1.js @@ -15,39 +15,103 @@ main.floors.yiqu1= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "0,7": { + "floorId": "yiqu2", + "loc": [ + 12, + 7 + ] + } + }, "beforeBattle": {}, "afterBattle": {}, "afterGetItem": {}, "afterOpenDoor": {}, "autoEvent": {}, - "cannotMove": {}, - "cannotMoveIn": {}, + "cannotMove": { + "8,1": [ + "right" + ] + }, + "cannotMoveIn": { + "8,1": [ + "right" + ] + }, "map": [ - [140,140,140,140,140,140, 91,140,140,140,140,140,140], - [140,140,140,140,140,140, 0,140,140, 0, 0, 0, 94], - [140,140,140,140,140,140, 0, 0,140,140, 81, 0, 0], - [140,140,140,140,140,140, 0, 0, 0,140, 0,140,140], - [140, 0, 0, 0,140, 0, 0, 0,140,140,140,140,140], - [140, 0,140,140,140, 0,140, 0,140, 0, 0, 0, 94], - [140, 0, 0,140, 0, 0,140, 0, 0, 0, 0, 0,140], - [ 92, 0, 0,140,140,140,140, 0,140,140, 81,140,140], - [140,140, 0,140, 0, 0, 0, 0,140, 0, 0, 0,140], - [140, 0, 0, 0, 0, 0,140, 0,140, 0, 0, 0,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140] + [140,140,140,110199,110234, 0, 91, 0,110205,110207,110233,110233,110233], + [110206,110206,110206,110207,90425, 0, 0, 0,110224,110226, 0, 0, 94], + [110225,110225,110225,110226, 0, 0, 0,110122,110232,110234, 81,110122,110123], + [110233,110233,110233,110234,110122,110122, 0, 0, 0,110131, 0, 0,110189], + [140134, 0, 0,120020,201029, 0, 0, 0,110138,110139,200998,200999,110197], + [140142, 0,120015,120028,201037, 0,201029, 0, 0, 0, 0, 0,110197], + [140150, 0, 0,120019, 0, 0,201029, 0,110189,140,110191, 0,110205], + [ 92, 0, 0,120019,201037,201037,201037, 0,110197,140,110199, 81,110224], + [ 0, 0, 0,120027, 0, 0, 0, 0,110197,140,110199, 0,110232], + [110191, 0, 0, 0, 0, 0,110189,140,140,140,110199, 0, 94], + [110199,140,140,110191, 0, 0,110197,140,140,110204,110207, 0, 0], + [140,140,140,110199,90684,90684,110197,140,140,110199,110234, 0, 0], + [140,140,140,110199,100307,100308,110197,140,140,110199, 0, 0, 0] ], "bgmap": [ - + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078] ], "fgmap": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,110114, 0, 0, 0,110114,110114], + [130156,140119,130156, 0,110116,110114, 0, 0, 0,110143, 0, 0, 0], + [130167,140127,130167,120039,201021, 0, 0, 0, 0, 0,200990,200991, 0], + [ 0,140135,120007,120020, 0, 0,201021, 0, 0, 0, 0, 0, 0], + [ 0,140143, 0,120019, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0,140151, 0, 0,201021,201021, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [201007, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "bg2map": [ - + [ 0, 0, 0, 0, 0,110146, 0,110146, 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, 0, 0, 0, 0, 0], + [200991, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,110131], + [200999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,120019, 0, 0, 0, 0,110146,110146, 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, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [201015, 0, 0,120035, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fg2map": [ - + [ 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], + [140118, 0, 0, 0,110113, 0, 0, 0, 0, 0, 0, 0, 0], + [140126, 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, 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, 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, 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, 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] ] } \ No newline at end of file diff --git a/project/floors/yiqu10.js b/project/floors/yiqu10.js index 98f1172..f5b5689 100644 --- a/project/floors/yiqu10.js +++ b/project/floors/yiqu10.js @@ -1,29 +1,29 @@ main.floors.yiqu10= { -"floorId": "yiqu10", -"title": "主塔 10 层", -"name": "10", -"width": 13, -"height": 13, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"images": [], -"ratio": 1, -"defaultGround": "grass2", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ + "floorId": "yiqu10", + "title": "主塔 10 层", + "name": "10", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "images": [], + "ratio": 1, + "defaultGround": "grass2", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": {}, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ [ 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], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], @@ -38,4 +38,16 @@ main.floors.yiqu10= [ 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] ], + "bgmap": [ + +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/project/floors/yiqu2.js b/project/floors/yiqu2.js index 7dca682..082012e 100644 --- a/project/floors/yiqu2.js +++ b/project/floors/yiqu2.js @@ -15,7 +15,15 @@ main.floors.yiqu2= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "12,7": { + "floorId": "yiqu1", + "loc": [ + 0, + 7 + ] + } + }, "beforeBattle": {}, "afterBattle": {}, "afterGetItem": {}, @@ -24,30 +32,78 @@ main.floors.yiqu2= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140,140,140,140,140,140,140,140, 32, 21, 28, 27,140], - [140,140,140,140,140,140,140,140,140, 82,140,140,140], - [140, 32, 0, 0,210, 0,140, 0, 0,214, 0, 0,140], - [140,140,140, 81,140, 0, 81, 0,140, 21,140, 0,140], - [140, 0,209, 0,140,140,140,210,140,140,140, 0,140], - [140,210,140,214,140, 27,140, 0,140, 22, 0, 0, 94], - [140, 0,209, 0, 81, 28,140, 0, 81, 21, 21, 21, 0], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140], - [140,140,140,140,140,140,140,140,140,140,140,140,140] + [140,140,140,140,140,140,140,110199,110232,110233,120080,110233,110197], + [110206,110206,110206,110206,110206,110206,110206,110207,90648, 21, 28,90424,110205], + [143,110225,110225,110225,110225,110225,110225,110226,90649, 32, 27,90851,110224], + [143,110233,110233,110233,110233,110233,110233,110234,120015, 82,120015,120010,200990], + [143, 0, 32, 0, 0,210,201037, 0, 0,214, 0, 0,140133], + [143,201037,201037, 81,201037, 0, 81, 0,110116, 21,110117, 0,140141], + [143, 0,209, 0,110129, 0,110117, 0,110160,110138,110139, 0,140149], + [143,210,110024,214,110129,110122,110131,210,110146, 22, 0, 0, 94], + [130194, 0,209, 0,110150, 27,110131, 0, 81, 21, 21, 21, 0], + [140,140,140, 0, 81, 28,110131, 0,110189,140,140,140,140], + [140,140,140,110199,110191,110189,140,140,110197,140,140,140,140], + [140,140,140,110199,110199,110197,140,140,140,140,140,140,140], + [140,140,140,110199,110199,110197,140,140,140,140,140,140,140] ], "bgmap": [ - + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078] ], "fgmap": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0,90651, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0,140091,140092,140092,140093, 0, 0, 0,120007, 0,120007,120007,140117], + [ 0,140099,140100,140100,140101, 0,201021, 0, 0, 0, 0,140124,140125], + [ 0,201021,201021, 0,201021, 0, 0, 0, 0, 0, 0,140132, 0], + [ 0, 0, 0, 0,110116, 0, 0, 0, 0, 0, 0,140140, 0], + [ 0, 0,110016, 0, 0,110114,110142, 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, 0, 0, 0, 0, 0,201007], + [ 0, 0, 0,110191,110114,110114, 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, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "bg2map": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,110233, 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, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,200990], + [ 0,140107,140108,140108,140109, 0, 0, 0, 0, 0, 0, 0,200998], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,110114, 0, 0, 0,110138, 0, 0, 0, 0], + [ 0, 0, 0, 0,110122, 0,110122, 0,110132,110146,110146, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,110116, 0, 0, 0, 0], + [ 0, 0, 0, 0,110122,110122, 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, 0, 0, 0, 0, 0, 0, 0] ], "fg2map": [ - + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140116, 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, 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, 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, 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, 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, 0] ] } \ No newline at end of file diff --git a/project/floors/yiqu3.js b/project/floors/yiqu3.js index 394234a..cf7a28a 100644 --- a/project/floors/yiqu3.js +++ b/project/floors/yiqu3.js @@ -1,29 +1,29 @@ main.floors.yiqu3= { -"floorId": "yiqu3", -"title": "主塔 3 层", -"name": "3", -"width": 13, -"height": 13, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"images": [], -"ratio": 1, -"defaultGround": "grass2", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ + "floorId": "yiqu3", + "title": "主塔 3 层", + "name": "3", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "images": [], + "ratio": 1, + "defaultGround": "grass2", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": {}, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ [ 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], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], @@ -38,4 +38,16 @@ main.floors.yiqu3= [ 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] ], + "bgmap": [ + +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/project/floors/yushou.js b/project/floors/yushou.js new file mode 100644 index 0000000..5abf05c --- /dev/null +++ b/project/floors/yushou.js @@ -0,0 +1,62 @@ +main.floors.yushou= +{ + "floorId": "yushou", + "title": "广场", + "name": "1", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "images": [], + "ratio": 1, + "defaultGround": "grass2", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "9,0": { + "floorId": "guangchang2", + "loc": [ + 9, + 12 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 91, 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, 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, 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, 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, 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, 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, 0, 0, 0] +], + "areas": "牢狱", + "bgmap": [ + +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/project/floors/zhujuejia.js b/project/floors/zhujuejia.js new file mode 100644 index 0000000..5e13867 --- /dev/null +++ b/project/floors/zhujuejia.js @@ -0,0 +1,75 @@ +main.floors.zhujuejia= +{ + "floorId": "zhujuejia", + "title": "新建楼层", + "name": "0", + "width": 13, + "height": 13, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "cannotMoveDirectly": false, + "images": [], + "ratio": 1, + "defaultGround": "ground", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "0,9": { + "floorId": "street01", + "loc": [ + 12, + 9 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [ 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], + [ 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], + [ 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], + [ 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], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 92, 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, 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] +], + "bgmap": [ + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308], + [308,308,308,308,308,308,308,308,308,308,308,308,308] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/project/icons.js b/project/icons.js index f44bfe9..8a3e33c 100644 --- a/project/icons.js +++ b/project/icons.js @@ -113,7 +113,12 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "T392": 81, "T393": 82, "T394": 83, - "T395": 84 + "T395": 84, + "T361": 85, + "T362": 86, + "T363": 87, + "T364": 88, + "T365": 89 }, "animates": { "star": 0, diff --git a/project/maps.js b/project/maps.js index fc722c6..407c757 100644 --- a/project/maps.js +++ b/project/maps.js @@ -259,6 +259,11 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "358": {"cls":"terrains","id":"T358"}, "359": {"cls":"terrains","id":"T359"}, "360": {"cls":"terrains","id":"T360"}, + "361": {"cls":"terrains","id":"T361"}, + "362": {"cls":"terrains","id":"T362"}, + "363": {"cls":"terrains","id":"T363"}, + "364": {"cls":"terrains","id":"T364"}, + "365": {"cls":"terrains","id":"T365"}, "376": {"cls":"terrains","id":"T376"}, "377": {"cls":"terrains","id":"T377"}, "378": {"cls":"terrains","id":"T378"}, diff --git a/project/materials/terrains.png b/project/materials/terrains.png index 378c4bf..fd82855 100644 Binary files a/project/materials/terrains.png and b/project/materials/terrains.png differ diff --git a/project/plugins.js b/project/plugins.js index c39164e..4ed7b66 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -52,14 +52,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = if (!main.replayChecking && !core.isReplaying()) { data.text = core.replaceText(data.text); data.text2 = core.replaceText(data.text2); - core.drawWarning( - data.x, - data.y, - data.size, - data?.text, - data?.text2, - data?.warning - ); + core.drawWarning(data.x, data.y, data?.text, data?.text2, data?.warning, data.large, data.size) + setTimeout(() => core.doAction(), 3100); } else { core.doAction(); @@ -3620,6 +3614,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = 31 * 3, 31 * 3, ]); + if ( + core.status.lockControl || + core.isMoving() + ) + return; if (core.isReplaying()) { this.replayAction[col][row].call(core); } else if (core.isPlaying()) { @@ -3644,7 +3643,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = core.isMoving() ) return; - core.ui._drawViewMaps(core.floorIds.indexOf(core.status.floorId)); + core.useItem('fly'); return; } /*const equipBox = makeBox([EQUIP_BLOCK_LEFT_VERTICAL, EQUIP_BLOCK_TOP_VERTICAL], [90 * 3, 130 * 3]) @@ -3662,7 +3661,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = core.isMoving() ) return; - core.ui._drawViewMaps(core.floorIds.indexOf(core.status.floorId)); + core.useItem('fly'); return; } /* @@ -3706,6 +3705,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = 31 * 3, 31 * 3, ]); + if ( + core.status.lockControl || + core.isMoving() + ) return if (core.isReplaying()) { this.replayAction[col][row].call(core); } else if (core.isPlaying()) { @@ -14895,9 +14898,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = }; }, "warning": function () { - // 在此增加新插件 // 默认音效名 - var defaultSound = "jingbao.opus"; + var defaultSound = "jingbao.mp3"; // 默认字体名 var defaultFont = "Verdana"; @@ -14907,10 +14909,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = * @param {number} y 纵坐标 * @param {string} text 显示的文字 */ - this.drawWarning = function (x, y, size, text, text2, warning) { + this.drawWarning = function (x, y, text, text2, warning, large = 2, size = 36) { if (timeout) return; x = x ?? 6; - y = y ?? 6; + y = y ?? 6 text = text || "boss"; text += "
"; for (var i = 0; i < 10; i++) text += " "; @@ -14934,26 +14936,75 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = t.style.left = 416 * core.domStyle.scale + "px"; }, 50); // 计算偏移量 - var px = ((6 - x) / 12) * 50; - var py = ((6 - y) / 12) * 50; + var px = ((6 - x) / 12) * (100 - 100 / large + 2); + var py = ((6 - y) / 12) * (100 - 100 / large + 2); // 修改画布的scale和transform - elements.forEach(function (v) { - if (v instanceof HTMLCanvasElement) { - v.style.transform = "scale(2)translate(" + px + "%, " + py + "%)"; + let time = 0; + let s = 1; + let sx = 0; + let sy = 0; + let cishu = 1; + core.registerAnimationFrame("big", true, function (temptime) { + if (temptime - time > 10) { + + time = temptime; + s += (large - 1) / 30; + sx += px / 30; + sy += py / 30; + elements.forEach(function (v) { + if (v instanceof HTMLCanvasElement) { + v.style.transform = "scale(" + s + ")translate(" + sx + "%, " + sy + "%)"; + + } + }); + cishu++; + if (cishu == 30) { + core.unregisterAnimationFrame("big"); + } } }); if (!warning) core.playSound(defaultSound); // 拉回镜头 timeout = setTimeout(function () { - timeout = setTimeout(function () { - timeout = void 0; - core.dom.gameDraw.removeChild(t); - }, 1500); - elements.forEach(function (v) { - if (v instanceof HTMLCanvasElement) { - v.style.transform = "none"; + // timeout = setTimeout(function () { + // timeout = void 0; + // core.dom.gameDraw.removeChild(t); + // }, 1500); + let time2 = 0; + let s2 = large - (large - 1) / 30; + let sx2 = px; + let sy2 = py; + let cishu2 = 1; + core.registerAnimationFrame("small", true, function (temptime) { + if (temptime - time2 > 10) { + + time2 = temptime; + s2 -= (large - 1) / 30; + sx2 -= px / 30; + sy2 -= py / 30; + elements.forEach(function (v) { + if (v instanceof HTMLCanvasElement) { + v.style.transform = "scale(" + s2 + ")translate(" + sx2 + "%, " + sy2 + "%)"; + + } + }); + cishu2++; + if (cishu2 == 30) { + core.unregisterAnimationFrame("small") + elements.forEach(function (v) { + if (v instanceof HTMLCanvasElement) { + v.style.transform = "none"; + } + }); + } } }); + // elements.forEach(function (v) { + // if (v instanceof HTMLCanvasElement) { + // v.style.transform = "none"; + // } + // }); + }, 1600); }; }, diff --git a/project/tilesets/c6.png b/project/tilesets/c6.png new file mode 100644 index 0000000..ecec049 Binary files /dev/null and b/project/tilesets/c6.png differ