Merge branch 'map' of https://gitea.mota.press/Dove/Eustia into map

project/data.js

@@ -1523,6 +1523,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"name": "Eustia",
 		"version": "鸽子窝造塔小队",
 		"floorId": "jiaocheng01",
+		"floorId": "jiaocheng01",
 		"hero": {
 			"image": "hero.webp",
 			"animate": false,
@@ -1534,8 +1535,11 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"mana": 0,
 			"atk": 30,
 			"def": 20,
+			"atk": 30,
+			"def": 20,
 			"mdef": 100,
 			"speed": 20,
+			"speed": 20,
 			"money": 0,
 			"exp": 0,
 			"equipment": [],
@@ -1548,6 +1552,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 				"direction": "up",
 				"x": 6,
 				"y": 12
+				"y": 12
 			},
 			"flags": {
 				"itemDetail": true,
@@ -1561,6 +1566,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"spell": 10,
 			"spelldef": 0,
 			"mhp": 100
+			"mhp": 100
 		},
 		"startCanvas": [
 			{
@@ -2135,6 +2141,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"bluePotion": 250,
 		"yellowPotion": 500,
 		"greenPotion": 900,
+		"greenPotion": 900,
 		"breakArmor": 0.9,
 		"counterAttack": 0.1,
 		"purify": 3,
@@ -2144,6 +2151,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"statusCanvasRowsOnMobile": 3,
 		"floorChangeTime": 500,
 		"yellowGem": 2
+		"floorChangeTime": 500,
+		"yellowGem": 2
 	},
 	"flags": {
 		"statusBarItems": [

project/enemys.js

@@ -55,7 +55,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"dragon": {"name":"魔龙","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"bigImage":null,"mdef":0,"spell":0,"speed":1},
 	"skeletonKnight": {"name":"骷髅武士","hp":330,"atk":113,"def":2,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":20},
 	"skeletonPresbyter": {"name":"骷髅巫师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
-	"ironRock": {"name":"铁面人","hp":111,"atk":97,"def":35,"money":0,"exp":0,"point":0,"special":[3],"mdef":0,"spell":0,"speed":14},
+	"ironRock": {"name":"铁面人","hp":111,"atk":97,"def":37,"money":0,"exp":0,"point":0,"special":[3],"mdef":0,"spell":0,"speed":14},
 	"grayRock": {"name":"灰色石头人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"yellowPriest": {"name":"中级法师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"evilPrincess": {"name":"痛苦魔女","hp":1000,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[10],"mdef":0,"spell":0,"speed":1},

project/floors/jiaocheng01.js

@@ -33,14 +33,22 @@ main.floors.jiaocheng01=
     },
     "beforeBattle": {},
     "afterBattle": {},
-    "afterGetItem": {},
+    "afterGetItem": {
-    "afterOpenDoor": {},
+        "6,9": [
+            "\t[黄钥匙,yellowKey]可以打开一扇黄门，使用后会消失"
+        ]
+    },
+    "afterOpenDoor": {
+        "8,10": [
+            "\t[黄门,yellowDoor]消耗一把黄钥匙"
+        ]
+    },
     "autoEvent": {},
     "cannotMove": {},
     "cannotMoveIn": {},
     "map": [
     [  1,  1,  1,  1,  1,  1, 91,  1,  1,  1,  1,  1,  1],
-    [  1, 22,  0,  1, 22,  1, 23,  1,  0,  0, 23, 22,  1],
+    [  1, 22,  0,  1, 22,  1,  0,  1,  0,  0, 23, 22,  1],
     [  1, 21,  0,  1, 81,  1, 84,  1, 83,  1,  1,  1,  1],
     [  1, 82,  1,  1,  0,  0,  0, 81,  0, 83,  0, 24,  1],
     [  1,  0,  0, 82,  0,  1, 81,  1, 82,  1,  1,  1,  1],
@@ -49,7 +57,7 @@ main.floors.jiaocheng01=
     [ 27,  0, 28,  1,  0,  0, 82,  0, 22,  1, 31,  0, 32],
     [  0,  0,  0,  1, 21,  1,  1,  1,  0,  1,  0,  0,  0],
     [ 29,  0, 30,  1, 23,  1, 21,  1,  0,  1, 34,  0, 33],
-    [  1,  0,  1,  1,  1,  1,  0,  1, 81,  1,  1,  0,  1],
+    [  1,  1,  1,  1,  1,  1,  0,  1, 81,  1,  1,  1,  1],
     [129,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,129],
     [  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1]
 ],
@@ -61,19 +69,7 @@ main.floors.jiaocheng01=
 
 ],
     "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,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,10183,  0,  0,  0,  0,  0,  0]
 ],
     "fg2map": [
 

project/items.js

@@ -99,8 +99,9 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 			"type": 0,
 			"animate": "sword",
 			"value": {
-				"atk": 0
+				"speed": 20
-			}
+			},
+			"percentage": {}
 		},
 		"itemEffect": "core.status.hero.atk += 0",
 		"itemEffectTip": "，攻击+0",