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

project/data.js

@@ -460,6 +460,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"r.webp",
 			"sound.webp",
 			"status.webp",
+			"statusBackground.webp",
 			"suiji.webp",
 			"tati_020101.webp",
 			"tati_020101a.webp",
@@ -1522,6 +1523,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"name": "Eustia",
 		"version": "鸽子窝造塔小队",
 		"floorId": "jiaocheng01",
+		"floorId": "jiaocheng01",
 		"hero": {
 			"image": "hero.webp",
 			"animate": false,
@@ -1533,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": [],
@@ -1547,6 +1552,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 				"direction": "up",
 				"x": 6,
 				"y": 12
+				"y": 12
 			},
 			"flags": {
 				"itemDetail": true,
@@ -1557,9 +1563,10 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"followers": [],
 			"steps": 0,
 			"matk": 0,
-			"spell": 20,
+			"spell": 10,
 			"spelldef": 0,
 			"mhp": 100
+			"mhp": 100
 		},
 		"startCanvas": [
 			{
@@ -1915,7 +1922,28 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		],
 		"startText": [
 			{
-				"type": "setText"
+				"type": "if",
+				"condition": "false",
+				"true": [
+					{
+						"type": "setText"
+					},
+					{
+						"type": "setHeroOpacity",
+						"opacity": 0
+					},
+					{
+						"type": "setCurtain",
+						"color": [
+							0,
+							0,
+							0,
+							1
+						],
+						"time": 500,
+						"keep": true
+					}
+				]
 			},
 			{
 				"type": "function",
@@ -1930,8 +1958,14 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 				"name": "强制横屏"
 			},
 			{
-				"type": "insert",
-				"name": "chapter0"
+				"type": "if",
+				"condition": "false",
+				"true": [
+					{
+						"type": "insert",
+						"name": "chapter0"
+					}
+				]
 			}
 		],
 		"shops": [
@@ -2107,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,
@@ -2116,6 +2151,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"statusCanvasRowsOnMobile": 3,
 		"floorChangeTime": 500,
 		"yellowGem": 2
+		"floorChangeTime": 500,
+		"yellowGem": 2
 	},
 	"flags": {
 		"statusBarItems": [

project/functions.js

@@ -308,14 +308,12 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	}
 	// 获得战斗伤害信息
 	var damageInfo = core.getDamageInfo(enemyId, null, x, y) || {};
-
 	if (!core.getFlag("noAnimate")) await core.attackAnimate(
 		enemyId,
 		damageInfo.start[0],
 		damageInfo.start[1],
 		damageInfo.start[2],
 		damageInfo.start[3],
-		damageInfo.start[4],
 		damageInfo.heroDiffList,
 		damageInfo.enemyDiffList,
 		damageInfo.heroanimateList,
@@ -792,7 +790,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	}
 
 	var guards = [];
-
 	// 光环和支援检查
 	if (!core.status.checkBlock) core.status.checkBlock = {};
 
@@ -1047,7 +1044,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		enemyinfo.now = oneTurn
 		enemyinfo.onAttack = true
 	}
-	const start = [core.clone(heroinfo), core.clone(enemyinfo), core.clone(equipInfo), oneTurn, onegcd] //记录开始战斗时的属性并转发
+	const start = [core.clone(heroinfo), core.clone(enemyinfo), core.clone(equipInfo), oneTurn] //记录开始战斗时的属性并转发
 	//---第三部分：递归开始---
 
 	const heroDiffList = [],
@@ -1064,7 +1061,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 			enemy_diff = {},
 			hero_animate = [],
 			enemy_animate = [];
-
 		if (enemyinfo.onAttack) { //怪物先攻的场合
 			//这里计算怪物攻击时发生的各种变化，同时计入enemy_diff
 			let mon_damage = 0
@@ -1097,6 +1093,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 			enemyinfo.onAttack = false
 			enemyinfo.now = 0
 			onattack = true
+
 		}
 		equipInfo.forEach(v => {
 			if (v.onAttack) {
@@ -1204,25 +1201,26 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 			}
 
 		})
+		if (onattack) {
+			//处理完毕后的数据处理
+			heroDiffList.push(hero_diff)
+			enemyDiffList.push(enemy_diff)
+			heroanimateList.push(hero_animate)
+			enemyanimateList.push(enemy_animate)
+			//处理属性变化
+			for (let v in hero_diff) {
+				heroinfo[v] += hero_diff[v]
+			}
+			for (let v in enemy_diff) {
+				enemyinfo[v] += enemy_diff[v]
+			}
 
-		//处理完毕后的数据处理
-		heroDiffList.push(hero_diff)
-		enemyDiffList.push(enemy_diff)
-		heroanimateList.push(hero_animate)
-		enemyanimateList.push(enemy_animate)
-		//处理属性变化
-		for (let v in hero_diff) {
-			heroinfo[v] += hero_diff[v]
-		}
-		for (let v in enemy_diff) {
-			enemyinfo[v] += enemy_diff[v]
-		}
+			//出手50回合怪物生命未降低直接判负，避免死循环
+			if (hero_turn === 50) {
 
-		//出手50回合怪物生命未降低直接判负，避免死循环
-		if (hero_turn === 50) {
-
-			if (enemyinfo.hp >= beforehp) {
-				return null
+				if (enemyinfo.hp >= beforehp) {
+					return null
+				}
 			}
 		}
 

project/items.js

@@ -565,11 +565,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"equipCls": "法杖",
 		"equip": {
 			"type": 0,
-			"animate": "sword",
-			"value": {
-				"mhp": -100,
-				"matk": 10
-			},
+			"value": {},
 			"percentage": {}
 		}
 	},