diff --git a/project/data.js b/project/data.js index 7ce2e10..235fd90 100644 --- a/project/data.js +++ b/project/data.js @@ -906,7 +906,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "7.webp", "10.webp", "C5.webp", - "c6.png" + "c6.png", + "2233.png" ], "animates": [ "hand", diff --git a/project/floors/changguan1.js b/project/floors/changguan1.js index 5c6b7b7..833d90e 100644 --- a/project/floors/changguan1.js +++ b/project/floors/changguan1.js @@ -65,13 +65,6 @@ main.floors.changguan1= 6, 0 ] - }, - "12,7": { - "floorId": "yiqu1", - "loc": [ - 0, - 7 - ] } }, "beforeBattle": {}, @@ -89,7 +82,7 @@ main.floors.changguan1= [110265,110266,110267,110268, 0, 0, 0, 0, 0,110304,110305,110306,110307], [110273,110274,110275,110276, 0, 0, 0, 0, 0,110116,110313,110314,110315], [110281,110282,110283,110284, 0, 0, 0, 0, 0,110132, 0, 0, 0], - [110289,110290,110291,110292, 0, 0, 0, 0, 0, 0, 0, 0, 94], + [110289,110290,110291,110292, 0, 0, 0, 0, 0, 0, 0, 0, 0], [110297,110298,110299,110300, 0, 0, 0, 0, 0,110116, 0, 0, 0], [110305,110306,110307,110308, 0, 0, 0, 0, 0,110261,110262,110262,110263], [110313,110314,110315,110316,110122,110122, 0,110122,110122,110269,110270,110270,110271], diff --git a/project/floors/guangchang6.js b/project/floors/guangchang6.js index 3b9dd67..e2f79e3 100644 --- a/project/floors/guangchang6.js +++ b/project/floors/guangchang6.js @@ -52,17 +52,17 @@ main.floors.guangchang6= "map": [ [140095,120160,120161,120162,120163,120164,365, 0, 0, 0, 0,143,143], [140095,120168,120169,120170,120171,120172,365, 0, 0, 0, 0,143,143], - [140103,120176,120177,20122,120179,120180,365, 0, 0, 0, 0,143,143], - [140111,20110,140107,140108,140109,20110,365, 0, 0, 0, 0,130192,130193], - [362,362,362,362,362,362,362, 0, 0, 0, 0,130200,130201], - [210178,210178,210178,210167,210178,210178,210176, 0, 0, 0, 0,140099,140100], - [210178,210178,210178,210178,210178,210178,210184, 0, 0, 0, 0,140107,140108], - [210194,210175,210194,210194,210194,210194,210192, 0, 0, 0, 0, 0, 94], + [140103,120176,120177,20122,120179,120180,365,20122,122, 0, 0,143,143], + [140111,20110,140107,140108,140109,20110,365,20130, 0, 0,130075,130192,130193], + [362,362,362,362,362,362,362,20113, 0, 0,130082,130200,130201], + [210178,210178,210178,210167,210178,210178,210176, 0, 0, 0,137,140099,140100], + [210178,210178,210178,210178,210178,210178,210184,20113,121, 0, 0,140107,140108], + [210194,210175,210194,210194,210194,210194,210192,20114, 0, 0, 0, 0, 94], [110239, 0, 0, 0, 0, 0,365, 0, 0, 0, 0,120109,120110], - [ 92, 0, 0, 0,362, 0,363, 0, 0, 0, 0,120117,120118], - [ 0, 0, 0, 0, 17,130046, 17, 0, 0, 0,140086,120125,120126], - [130183, 0, 0, 0, 17,130046, 17, 0, 0, 0,140094,120133,120134], - [130191, 0, 93, 0, 17, 0, 0, 0, 0, 0,140102,120141,120142] + [ 92, 0, 0, 0,362, 0,363,128, 0, 0,10165,120117,120118], + [ 0, 0, 0, 0, 17, 0, 17, 0, 0, 0,10173,120125,120126], + [130183, 0, 0, 0, 17, 0, 17, 0, 0, 0,10173,120133,120134], + [130191, 0, 93, 0, 17, 0, 0, 0, 0,138,10157,120141,120142] ], "areas": "牢狱", "bgmap": [ @@ -71,9 +71,9 @@ main.floors.guangchang6= [30052,30052,30052,30052,30052,30052,30052,90078, 0,90078,90078,90078,90078], [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], - [30052,30052,30052,30052, 0, 0, 0,90078,90078,90078,90078,90078,90078], - [30052,30052,30052,30052, 0, 0, 0, 0,90078,90078,90078,90078,90078], - [30052,30052,30052,30052, 0, 0, 0,90078,90078,90078,90078,90078,90078], + [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], + [30052,30052,30052,30052,30052,30052,30052, 0,90078,90078,90078,90078,90078], + [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], [30052,30052,30052,30052,210187,210178,210187,90078,90078,90078,90078,90078,90078], @@ -81,9 +81,9 @@ main.floors.guangchang6= [30052,30052,30052,30052,90078,90078,90078,90078,90078,90078,90078,90078,90078] ], "fgmap": [ - [ 0, 0, 0, 0, 0, 0, 0,140087, 0, 0, 0, 0, 0], - [ 0, 0,140091,140092,140093, 0, 0,140095, 0, 0, 0, 0, 0], - [ 0,20102,140099,140100,140101,20102, 0,140103, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,140087, 0, 0,140094, 0, 0], + [ 0, 0,140091,140092,140093, 0, 0,140095, 0, 0,140102, 0, 0], + [ 0,20102,140099,140100,140101,20102, 0,140103, 0, 0,140110, 0, 0], [ 0, 0, 0, 0, 0, 0, 0,140111, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0,140087, 0, 0, 0,140091,140092], [ 0, 0, 0, 0, 0, 0, 0,140095, 0, 0, 0, 0, 0], @@ -91,18 +91,18 @@ main.floors.guangchang6= [110231, 0, 0, 0, 0, 0,365,140111, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140086, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140094, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,140102, 0, 0] ], "bg2map": [ [ 0, 0, 0, 0, 0, 0,160032, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0,160032, 0, 0, 0, 0, 0, 0], [ 0, 0, 0,120178, 0, 0,160032, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0,20130, 0, 0,160032, 0, 0, 0, 0, 0, 0], - [120103,120103,120103,120103,120103,120103,120103, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,20130, 0, 0,160032, 0, 0, 0,130088, 0, 0], + [120103,120103,120103,120103,120103,120103,120103, 0, 0, 0,130096, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130076,130076], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130084,130084], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0,365, 0, 0, 0, 0, 0, 0, 0, 0, 0], diff --git a/project/floors/yiqu1.js b/project/floors/yiqu1.js index db59c0f..68910bd 100644 --- a/project/floors/yiqu1.js +++ b/project/floors/yiqu1.js @@ -58,16 +58,16 @@ main.floors.yiqu1= "map": [ [143,143,143,143,130193,130193,130193,130193,130193,143,143,143,143], [143,143,143,143,130060,130061,130062,130201,130201,143,143,143,143], - [143,130193,130193,130194,130068,130069,130070, 0,120023,130192,130193,130193,143], - [130194,130201,130201,130202,130007,130006,130099,130098,120031,130200,130201,130201,143], - [130202, 32, 0, 21,201021,401,110116, 0,201, 81, 0, 21,130192], - [140101, 0,205, 0,201037,421,110124, 31, 0,110116, 31, 0,130200], - [140109,201037, 0,201037,200199, 81,110140,110138, 81,110138,110138,202,90667], - [ 92,201, 0, 0, 0, 0,202, 0, 0, 82, 0, 0,90675], - [120111, 0, 0, 21, 0, 0,201021,205,110138,110138,201021, 0, 94], - [120119,110122, 81,110122,201037,201,201029,402, 0, 31,201029,205,90650], - [120127,202, 31,202,201037, 0,201029, 0, 21, 0,201029, 0,110189], - [120135, 22,205,403,201037,202,201037,110122,110122, 81,201037,201,110197], + [143,130193,140170,130194,130068,130069,130070, 0,120023,130192,130157,130193,143], + [130194,130201,140178,130202,130007,130006,130099,130098,120031,130200,130167,130201,143], + [130202, 32, 0, 21,201021,401,220008, 0,201, 81, 0, 21,130192], + [140101, 0,205, 0,201037,421,220008, 31, 0,220008, 31, 0,130200], + [140109,201037, 0,201037,200199, 81,220012,220013, 81,220012,220013,202,90667], + [ 92,201, 0, 21, 0, 0,202, 0, 21, 0, 82, 0,90675], + [120111, 0, 0, 0, 0, 0,201021,205,110138,110138,201021, 0, 94], + [120119,220013, 81,220013,201037,201,201029, 0, 31, 0,201029,205,90650], + [120127,202, 31,202,201037, 0,201029, 21, 0,402,201029, 0,110189], + [120135, 22,205,403,201037,202,201037,220013,220013, 81,201037,201,110197], [120143,110138,110138,110138,201029, 0,201, 0, 31, 0, 21, 0,110197] ], "bgmap": [ @@ -90,25 +90,25 @@ main.floors.yiqu1= [ 0, 0, 0, 0, 0, 0, 0, 0,120074, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0,130091,130090, 0, 0, 0, 0, 0], [ 0, 0, 0, 0,200175, 0, 0, 0, 0, 0, 0, 0, 0], - [140093, 0, 0, 0,200183, 0, 0, 0, 0,110152, 0, 0, 0], - [ 0,201021, 0,201021,200191, 0, 0, 0, 0,110160, 0, 0,90667], + [140093, 0, 0, 0,200183, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0,201021, 0,201021,200191, 0, 0,220009, 0, 0,220009, 0,90667], [ 0, 0, 0, 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,201021, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0,220009, 0,220009,201021, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0,201021, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0,201021, 0, 0,110114,110114, 0, 0, 0, 0], + [ 0, 0, 0, 0,201021, 0, 0,220009,220009, 0, 0, 0, 0], [ 0, 0, 0, 0,201021, 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,120082, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,130193, 0, 0, 0, 0, 0,120082, 0,130193, 0, 0], + [ 0, 0,130201, 0, 0, 0, 0, 0, 0, 0,130201, 0, 0], [ 0, 0, 0, 0,130015, 0, 0, 0, 0, 0, 0, 0, 0], + [130076, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [130084, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0,110129, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0,110146,110146, 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,110146,110146, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,90658], diff --git a/project/floors/yiqu2.js b/project/floors/yiqu2.js index 16400e4..9ebbfdc 100644 --- a/project/floors/yiqu2.js +++ b/project/floors/yiqu2.js @@ -39,14 +39,14 @@ main.floors.yiqu2= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], - [ 1, 22, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], - [ 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], - [ 1, 81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 22], - [ 1, 81, 1, 1, 1, 1, 1, 1, 1, 0, 83, 0,403], - [ 31, 0,401,209, 0,402, 1, 0, 34, 0, 1,209, 0], - [ 0,202, 0, 1, 32, 0, 1,405, 0,408, 1, 81, 1], - [ 1, 81, 1, 1, 0,421, 1, 0,204, 0, 1, 0, 94], + [143,120034,140120,140121,120034,120012, 1, 1, 1, 1, 1, 1, 1], + [143,170007,140128,140129,170007,120019, 1, 1, 1, 1, 1, 1, 1], + [143, 0, 0, 0, 0,120019, 1, 1, 1, 1, 1, 1, 1], + [143, 81, 0, 22, 0,120020, 1, 1, 1, 1, 1, 0, 22], + [130194, 81,120014,120010,120010,120028, 1, 1, 1, 0, 83, 0,403], + [130202, 31, 0,209, 0,402, 1, 0, 34, 0, 1,209, 0], + [401, 0,202, 1, 32, 0, 1,405, 0,408, 1, 81, 1], + [ 1, 1, 81, 1, 0,421, 1, 0,204, 0, 1, 0, 94], [ 92, 0, 21, 1, 1, 81, 1, 1, 82, 1, 1,205, 1], [ 1, 1, 0,202, 0, 0, 32,209, 0, 1, 21, 0, 1], [ 0,201, 0, 1, 81, 1, 1, 1, 0,205, 0, 0,421], @@ -54,7 +54,7 @@ main.floors.yiqu2= [ 0, 21, 21, 1, 0,202, 0,201, 0, 1, 1, 1, 22] ], "bgmap": [ - [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], + [90078,90078,180033,180033,90078,90078,90078,90078,90078,90078,90078,90078,90078], [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], @@ -69,10 +69,34 @@ main.floors.yiqu2= [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, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,120002,120002,120002, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 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,180025,120034,120034,180025,180026, 0, 0, 0, 0, 0, 0, 0], + [ 0,180025,180025,180025,180025,180026, 0, 0, 0, 0, 0, 0, 0], + [ 0,180025,180025,180025,180025,180026, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,180025,130061,130060,180026, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 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/tilesets/2233.png b/project/tilesets/2233.png new file mode 100644 index 0000000..a3bba4f Binary files /dev/null and b/project/tilesets/2233.png differ