冲突处理

This commit is contained in:
草莓 2025-01-05 00:14:24 +08:00
parent 0c482ad796
commit 1c3885ff30
2 changed files with 243 additions and 1322 deletions

File diff suppressed because one or more lines are too long

View File

@ -31,121 +31,239 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = {
],
floorPartitions: [],
images: [
"HPGaugeEnemy_A.png",
"HPGaugeEnemy_B.png",
"background.png",
"backgroundvertical.png",
"bear.png",
"bg.jpg",
"bg2.jpg",
"bg_1511.png",
"bg_1521.png",
"bg_2010.png",
"bg_2011.png",
"bg_2521.png",
"bg_3042.png",
"bg_3531.png",
"bg_3551.png",
"bg_3563.png",
"bg_3571.png",
"bg_3601.png",
"bg_3721.png",
"bg_5033.png",
"bg_5043.png",
"bg_5044.png",
"bg_6004.png",
"brave.png",
"cao.png",
"d.png",
"dl.png",
"dlr.png",
"dr.png",
"dragon.png",
"eve_010102.png",
"eve_010203.png",
"eve_010304.png",
"eve_010501.png",
"eve_010601.png",
"eve_010701.png",
"eve_010801.png",
"eve_010902.png",
"eve_011001.png",
"eve_011101.png",
"eve_011202.png",
"eve_011302.png",
"eve_011402.png",
"eve_020102.png",
"eve_020201.png",
"eve_020301.png",
"eve_020401.png",
"eve_020501.png",
"eve_020605.png",
"eve_020701.png",
"eve_020801.png",
"eve_030101.png",
"eve_030206.png",
"eve_030302.png",
"eve_030508.png",
"eve_030601.png",
"eve_030801.png",
"eve_030901.png",
"eve_031002.png",
"eve_031101.png",
"eve_040201.png",
"eve_040401.png",
"eve_040501.png",
"eve_040601.png",
"eve_040702.png",
"eve_040801.png",
"eve_050101.png",
"eve_050201.png",
"eve_050401.png",
"eve_050501.png",
"eve_050601.png",
"eve_050704.png",
"eve_050801.png",
"eve_070101.png",
"face_050445.png",
"face_120107.png",
"green.png",
"h25.png",
"hero.png",
"l.png",
"lane1.png",
"light.png",
"lock.png",
"lr.png",
"maba.png",
"now.png",
"null.png",
"other_0001.png",
"other_0002.png",
"other_0003.png",
"other_0004.png",
"r.png",
"status.png",
"statusBackground.jpg",
"statusBackground.png",
"statusBackground2.png",
"statusBackground_vertical.png",
"statusBackgroundv4.png",
"t012d0ffd2cc7d751fc.jpg",
"t015d97564abe3b6a74.jpg",
"t0187fe5a5fa586419d.jpg",
"t01c16e1361b78b9412.jpg",
"tati_050145a.png",
"tati_120124.png",
"u.png",
"ud.png",
"udl.png",
"udlr.png",
"udr.png",
"ul.png",
"ulr.png",
"unknow.png",
"ur.png",
"winskin.png",
"winskin1.png",
"HPGaugeEnemy_A.webp",
"HPGaugeEnemy_B.webp",
"background.webp",
"backgroundvertical.webp",
"bg_1511.webp",
"bg_1521.webp",
"bg_2010.webp",
"bg_2011.webp",
"bg_2521.webp",
"bg_3042.webp",
"bg_3531.webp",
"bg_3551.webp",
"bg_3563.webp",
"bg_3571.webp",
"bg_3601.webp",
"bg_3721.webp",
"bg_5033.webp",
"bg_5043.webp",
"bg_5044.webp",
"bg_6004.webp",
"cao.webp",
"d.webp",
"dl.webp",
"dlr.webp",
"dr.webp",
"dragon.webp",
"eve_010102.webp",
"eve_010203.webp",
"eve_010304.webp",
"eve_010501.webp",
"eve_010601.webp",
"eve_010701.webp",
"eve_010801.webp",
"eve_010902.webp",
"eve_011001.webp",
"eve_011101.webp",
"eve_011202.webp",
"eve_011302.webp",
"eve_011402.webp",
"eve_020102.webp",
"eve_020201.webp",
"eve_020301.webp",
"eve_020401.webp",
"eve_020501.webp",
"eve_020605.webp",
"eve_020701.webp",
"eve_020801.webp",
"eve_030101.webp",
"eve_030206.webp",
"eve_030302.webp",
"eve_030508.webp",
"eve_030601.webp",
"eve_030801.webp",
"eve_030901.webp",
"eve_031002.webp",
"eve_031101.webp",
"eve_040201.webp",
"eve_040401.webp",
"eve_040501.webp",
"eve_040601.webp",
"eve_040702.webp",
"eve_040801.webp",
"eve_050101.webp",
"eve_050201.webp",
"eve_050401.webp",
"eve_050501.webp",
"eve_050601.webp",
"eve_050704.webp",
"eve_050801.webp",
"eve_070101.webp",
"face_020101.webp",
"face_020102.webp",
"face_020103.webp",
"face_020104.webp",
"face_020105.webp",
"face_020106.webp",
"face_020107.webp",
"face_020108.webp",
"face_020109.webp",
"face_020110.webp",
"face_020111.webp",
"face_020112.webp",
"face_020113.webp",
"face_020114.webp",
"face_020115.webp",
"face_020116.webp",
"face_020117.webp",
"face_020118.webp",
"face_020121.webp",
"face_020122.webp",
"face_020123.webp",
"face_020124.webp",
"face_020125.webp",
"face_020126.webp",
"face_020127.webp",
"face_020128.webp",
"face_020129.webp",
"face_020130.webp",
"face_020131.webp",
"face_020132.webp",
"face_020133.webp",
"face_020134.webp",
"face_020135.webp",
"face_020136.webp",
"face_020137.webp",
"face_020141.webp",
"face_020142.webp",
"face_020143.webp",
"face_020144.webp",
"face_020145.webp",
"face_020146.webp",
"face_020147.webp",
"face_020148.webp",
"face_020149.webp",
"face_020150.webp",
"face_020151.webp",
"face_020152.webp",
"face_020153.webp",
"face_020154.webp",
"face_020155.webp",
"face_020156.webp",
"face_020157.webp",
"face_020158.webp",
"face_020159.webp",
"face_050445.webp",
"face_120107.webp",
"green.webp",
"hero.webp",
"l.webp",
"lane1.webp",
"light.webp",
"lock.webp",
"lr.webp",
"maba.webp",
"null.webp",
"other_0001.webp",
"other_0002.webp",
"other_0003.webp",
"other_0004.webp",
"r.webp",
"status.webp",
"tati_020101.webp",
"tati_020101a.webp",
"tati_020101y.webp",
"tati_020102.webp",
"tati_020102a.webp",
"tati_020103.webp",
"tati_020103y.webp",
"tati_020104.webp",
"tati_020104a.webp",
"tati_020104y.webp",
"tati_020105.webp",
"tati_020105a.webp",
"tati_020105y.webp",
"tati_020106.webp",
"tati_020107.webp",
"tati_020107a.webp",
"tati_020107y.webp",
"tati_020109.webp",
"tati_020110.webp",
"tati_020111.webp",
"tati_020111a.webp",
"tati_020113.webp",
"tati_020113a.webp",
"tati_020114.webp",
"tati_020115.webp",
"tati_020115y.webp",
"tati_020116.webp",
"tati_020116a.webp",
"tati_020117.webp",
"tati_020117a.webp",
"tati_020118.webp",
"tati_020121a.webp",
"tati_020122.webp",
"tati_020123.webp",
"tati_020123y.webp",
"tati_020124.webp",
"tati_020124a.webp",
"tati_020125.webp",
"tati_020125a.webp",
"tati_020125y.webp",
"tati_020126.webp",
"tati_020126y.webp",
"tati_020127.webp",
"tati_020129.webp",
"tati_020130.webp",
"tati_020131.webp",
"tati_020131a.webp",
"tati_020131y.webp",
"tati_020132.webp",
"tati_020133.webp",
"tati_020134.webp",
"tati_020135.webp",
"tati_020135a.webp",
"tati_020136.webp",
"tati_020137.webp",
"tati_020141.webp",
"tati_020141a.webp",
"tati_020142.webp",
"tati_020142a.webp",
"tati_020142y.webp",
"tati_020143.webp",
"tati_020143y.webp",
"tati_020144.webp",
"tati_020144a.webp",
"tati_020145.webp",
"tati_020145a.webp",
"tati_020145y.webp",
"tati_020146.webp",
"tati_020147.webp",
"tati_020149.webp",
"tati_020150.webp",
"tati_020151.webp",
"tati_020151a.webp",
"tati_020152.webp",
"tati_020153.webp",
"tati_020154.webp",
"tati_020157.webp",
"tati_020157a.webp",
"tati_020158.webp",
"tati_050145a.webp",
"tati_120124.webp",
"u.webp",
"ud.webp",
"udl.webp",
"udlr.webp",
"udr.webp",
"ul.webp",
"ulr.webp",
"unknow.webp",
"ur.webp",
"winskin.webp",
"winskin1.webp",
],
tilesets: [
"magictower.webp",
@ -234,7 +352,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = {
穿脱装备: "equip.mp3",
背景音乐: "bgm.mp3",
攻击: "attack.mp3",
背景图: "bg.jpg",
背景图: "bg.webp",
商店: "shop.mp3",
领域: "zone",
},
@ -242,14 +360,14 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = {
equipName: ["武器", "武器", "防具", "饰品"],
startBgm: "theme.mp3",
styles: {
startBackground: "project/images/background.png",
startVerticalBackground: "project/images/backgroundvertical.png",
startBackground: "project/images/background.webp",
startVerticalBackground: "project/images/backgroundvertical.webp",
startLogoStyle: "color: black",
startButtonsStyle:
"background-color: #000000; opacity: 0.45; color: #FFFFFF; border: #FFFFFF 2px solid; caret-color: #FFD700;",
statusLeftBackground: "url(project/materials/ground.png) repeat",
statusTopBackground: "url(project/materials/ground.png) repeat",
toolsBackground: "url(project/materials/ground.png) repeat",
statusLeftBackground: "url(project/materials/ground.webp) repeat",
statusTopBackground: "url(project/materials/ground.webp) repeat",
toolsBackground: "url(project/materials/ground.webp) repeat",
floorChangingStyle: "background-color: black; color: white",
statusBarColor: [255, 255, 255, 1],
borderColor: [204, 204, 204, 1],
@ -258,7 +376,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = {
},
splitImages: [
{
name: "dragon.png",
name: "dragon.webp",
width: 384,
height: 96,
prefix: "dragon_",
@ -271,7 +389,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = {
version: "鸽子窝造塔小队",
floorId: "street01",
hero: {
image: "hero.png",
image: "hero.webp",
animate: false,
name: "Caim",
lv: 1,
@ -405,7 +523,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = {
data: [
{
type: "drawSelector",
image: "winskin.png",
image: "winskin.webp",
code: 1,
x: 245,
y: "261 + 40*flag:selection",