Compare commits
No commits in common. "e2ff0cd6b6b9bfa4135cf2dea346b06740746567" and "c231be42bfd5ed9860a83961156fbd923e2a2434" have entirely different histories.
e2ff0cd6b6
...
c231be42bf
|
Before Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
@ -13,9 +13,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
|
||||
"MT8",
|
||||
"MT9",
|
||||
"MT10",
|
||||
"MT11",
|
||||
"Caimhome",
|
||||
"jiuguan"
|
||||
"MT11"
|
||||
],
|
||||
"floorPartitions": [],
|
||||
"images": [
|
||||
@ -68,22 +66,11 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
|
||||
],
|
||||
"tilesets": [
|
||||
"magictower.png",
|
||||
<<<<<<< HEAD
|
||||
"5.png",
|
||||
"4.png",
|
||||
"3.png",
|
||||
"2.png",
|
||||
"1.png",
|
||||
"11.png",
|
||||
"6.png",
|
||||
"12.png"
|
||||
=======
|
||||
"Outside_B.png",
|
||||
"C4.png",
|
||||
"C3.png",
|
||||
"C2.png",
|
||||
"C1.png"
|
||||
>>>>>>> c231be42bfd5ed9860a83961156fbd923e2a2434
|
||||
],
|
||||
"animates": [
|
||||
"hand",
|
||||
@ -220,7 +207,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
|
||||
"loc": {
|
||||
"direction": "up",
|
||||
"x": 6,
|
||||
"y": 9
|
||||
"y": 10
|
||||
},
|
||||
"flags": {
|
||||
"itemDetail": true,
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
main.floors.jiuguan=
|
||||
{
|
||||
"floorId": "jiuguan",
|
||||
"title": "主塔 11 层",
|
||||
"name": "11",
|
||||
"width": 13,
|
||||
"height": 13,
|
||||
"canFlyTo": true,
|
||||
"canFlyFrom": true,
|
||||
"canUseQuickShop": true,
|
||||
"images": [],
|
||||
"ratio": 1,
|
||||
"defaultGround": "grass",
|
||||
"weather": [
|
||||
"snow",
|
||||
6
|
||||
],
|
||||
"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,20066, 0,20204,20205,20206,20207,40056,30022,40058, 0],
|
||||
[ 0, 0, 0, 0,333,20212,20213,20214,20215,40064,30030, 0, 0],
|
||||
[ 0, 0, 0, 0,334,20220,20221,20222,20223,40072,40074,10173, 0],
|
||||
[ 0, 0, 0, 0,342,340,340,340,339, 0, 0, 0, 0],
|
||||
[ 0, 0, 0, 0,336,337,337,337,338, 0,30070,10292, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10292, 0],
|
||||
[ 0, 0, 0, 0, 0, 0,40054, 0, 0,40054,40054,20110, 0],
|
||||
[ 0,40054,80004,40054, 0, 0,40040,40042, 0,40040,40042, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0,40048,40050, 0,40048,40050, 0, 0],
|
||||
[ 0,40054,80012,40054, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0,30022,80040,80041,80042],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0,30030,80048,80049,80050]
|
||||
],
|
||||
"areas": "下层",
|
||||
"bgmap": [
|
||||
[142,142,142,142,142,142,142,142,142,142,142,142,142],
|
||||
[142,40017,40017,40017,40017,40017,40017,40017,40017,40017,40017,40017,142],
|
||||
[142,40025,40025,40025,40025,40025,40025,40025,40025,40025,40025,40025,142],
|
||||
[142,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,142],
|
||||
[142,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,142],
|
||||
[142,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,142],
|
||||
[142,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,142],
|
||||
[142,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,142],
|
||||
[142,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,142],
|
||||
[142,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,30057,142],
|
||||
[142,30057,30057,30057,30057,142,142,142,142,142,142,142,142],
|
||||
[142,142,142,142,30057,142,40017,40017,40017,40017,40017,40017,40017],
|
||||
[40017,40017,40017,142,30057,142,40017,40017,40017,40017,40017,40017,40017]
|
||||
],
|
||||
"fgmap": [
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
[ 0,20137,20138, 0, 0, 0,20200,20201, 0, 0, 0, 0, 0],
|
||||
[ 0,20145,20146, 0, 0, 0,20208,20209, 0, 0,40066,10165, 0],
|
||||
[ 0,20153,20154, 0, 0, 0,20216,20217, 0, 0,10292, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,20102, 0],
|
||||
[ 0, 0, 0, 0, 0, 0,40032,40034, 0,40032,40034, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0,40054,40054, 0,40054,40054, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
|
||||
]
|
||||
}
|
||||
@ -65,17 +65,7 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
|
||||
"sWallTBR": 33,
|
||||
"sWallTBL": 34,
|
||||
"T331": 35,
|
||||
"T332": 36,
|
||||
"T333": 37,
|
||||
"T334": 38,
|
||||
"T335": 39,
|
||||
"T336": 40,
|
||||
"T337": 41,
|
||||
"T338": 42,
|
||||
"T339": 43,
|
||||
"T340": 44,
|
||||
"T341": 45,
|
||||
"T342": 46
|
||||
"T332": 36
|
||||
},
|
||||
"animates": {
|
||||
"star": 0,
|
||||
@ -280,12 +270,6 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
|
||||
"autotile2": 0,
|
||||
"autotile3": 0,
|
||||
"autotile4": 0,
|
||||
<<<<<<< HEAD
|
||||
"autotile8": 0,
|
||||
"autotile9": 0,
|
||||
"autotile10": 0
|
||||
=======
|
||||
"autotile5": 0
|
||||
>>>>>>> c231be42bfd5ed9860a83961156fbd923e2a2434
|
||||
}
|
||||
}
|
||||
@ -106,13 +106,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
|
||||
"137": {"cls":"npcs","id":"greenMan"},
|
||||
"138": {"cls":"npcs","id":"blueTrader"},
|
||||
"140": {"cls":"autotile","id":"autotile4"},
|
||||
<<<<<<< HEAD
|
||||
"141": {"cls":"autotile","id":"autotile8"},
|
||||
"142": {"cls":"autotile","id":"autotile9"},
|
||||
"143": {"cls":"autotile","id":"autotile10"},
|
||||
=======
|
||||
"141": {"cls":"autotile","id":"autotile5"},
|
||||
>>>>>>> c231be42bfd5ed9860a83961156fbd923e2a2434
|
||||
"151": {"cls":"autotile","id":"autotile1"},
|
||||
"152": {"cls":"autotile","id":"autotile2"},
|
||||
"153": {"cls":"autotile","id":"autotile3"},
|
||||
@ -233,15 +227,5 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
|
||||
"329": {"cls":"enemy48","id":"bearRight"},
|
||||
"330": {"cls":"enemy48","id":"bearUp"},
|
||||
"331": {"cls":"terrains","id":"T331"},
|
||||
"332": {"cls":"terrains","id":"T332"},
|
||||
"333": {"cls":"terrains","id":"T333"},
|
||||
"334": {"cls":"terrains","id":"T334"},
|
||||
"335": {"cls":"terrains","id":"T335"},
|
||||
"336": {"cls":"terrains","id":"T336"},
|
||||
"337": {"cls":"terrains","id":"T337"},
|
||||
"338": {"cls":"terrains","id":"T338"},
|
||||
"339": {"cls":"terrains","id":"T339"},
|
||||
"340": {"cls":"terrains","id":"T340"},
|
||||
"341": {"cls":"terrains","id":"T341"},
|
||||
"342": {"cls":"terrains","id":"T342"}
|
||||
"332": {"cls":"terrains","id":"T332"}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 810 KiB |
|
Before Width: | Height: | Size: 1.6 MiB |
|
Before Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 65 KiB |
|
Before Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 101 KiB |
|
Before Width: | Height: | Size: 57 KiB |
|
Before Width: | Height: | Size: 328 KiB |