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

_server/MotaAction.g4

@@ -4596,8 +4596,8 @@ EnemyPoint_List
     /*EnemyPoint_List ['hp','atk','def','money','exp','point','name']*/;
 
 Equip_List
-    :   '力量'|'敏捷'|'智力'|'体质'|'生命'|'生命上限'|'攻击'|'物理防御'|'魔法防御'|'魔力'|'魔力上限'|'速度'
+    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔力'|'魔力上限'|'速度'
-    /*Equip_List ['str','agi','int','con','hp','hpmax','atk','def','mdef','mana','manamax','speed']*/;
+    /*Equip_List ['hp','hpmax','atk','def','mdef','mana','manamax','speed']*/;
 
 Key_List
     :   '黄钥匙'|'蓝钥匙'|'红钥匙'|'绿钥匙'|'铁门钥匙'

_server/table/comment.js

@@ -187,24 +187,18 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 				"def": {
 					"_leaf": true,
 					"_type": "textarea",
-					"_data": "物理防御力"
+					"_data": "防御力"
 				},
 				"mdef": {
 					"_leaf": true,
 					"_type": "textarea",
-					"_data": "魔法防御力"
+					"_data": "法抗(写为小数)"
 				},
 				"speed": {
 					"_leaf": true,
 					"_type": "textarea",
 					"_data": "速度"
 				},
-				"magic": {
-					"_leaf": true,
-					"_type": "checkbox",
-					"_docs": "是否为魔法攻击",
-					"_data": "勾选以魔法攻击计算，不勾选以物理攻击计算"
-				},
 				"money": {
 					"_leaf": true,
 					"_type": "textarea",

_server/table/data.comment.js

@@ -262,44 +262,19 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 						"def": {
 							"_leaf": true,
 							"_type": "textarea",
-							"_data": "物理防御"
+							"_data": "防御"
 						},
 						"mdef": {
 							"_leaf": true,
 							"_type": "textarea",
-							"_data": "魔法防御"
+							"_data": "法强"
 						},
 						"speed": {
 							"_leaf": true,
 							"_type": "textarea",
-							"_data": "攻击速度"
+							"_data": "速度"
-						},
-						"str": {
-							"_leaf": true,
-							"_type": "textarea",
-							"_data": "力量"
-						},
-						"agi": {
-							"_leaf": true,
-							"_type": "textarea",
-							"_data": "敏捷"
-						},
-						"int": {
-							"_leaf": true,
-							"_type": "textarea",
-							"_data": "智力"
-						},
-						"con": {
-							"_leaf": true,
-							"_type": "textarea",
-							"_data": "体质"
-						},
-						"magic": {
-							"_leaf": true,
-							"_type": "checkbox",
-							"_docs": "攻击类型",
-							"_data": "攻击类型是否是魔法"
 						},
+
 						"money": {
 							"_leaf": true,
 							"_type": "textarea",

project/functions.js

@@ -1088,26 +1088,27 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 
 },
         "getStatusLabel": function (name) {
-			// 返回某个状态英文名的对应中文标签，如atk -> 攻击，def -> 防御等。
+	// 返回某个状态英文名的对应中文标签，如atk -> 攻击，def -> 防御等。
-			// 请注意此项仅影响 libs/ 下的内容（如绘制怪物手册、数据统计等）
+	// 请注意此项仅影响 libs/ 下的内容（如绘制怪物手册、数据统计等）
-			// 自行定义的（比如获得道具效果）中用到的“攻击+3”等需要自己去对应地方修改
+	// 自行定义的（比如获得道具效果）中用到的“攻击+3”等需要自己去对应地方修改
 
-			return {
+	return {
-				name: "名称",
+		name: "名称",
-				lv: "等级",
+		lv: "等级",
-				hpmax: "生命上限",
+		hpmax: "生命上限",
-				hp: "生命",
+		hp: "生命",
-				manamax: "魔力上限",
+		manamax: "魔力上限",
-				mana: "魔力",
+		mana: "魔力",
-				atk: "攻击",
+		atk: "攻击",
-				def: "防御",
+		def: "防御",
-				mdef: "护盾",
+		mdef: "法强",
-				money: "金币",
+		speed: "速度",
-				exp: "经验",
+		money: "金币",
-				point: "加点",
+		exp: "经验",
-				steps: "步数",
+		point: "加点",
-			}[name] || name;
+		steps: "步数",
-		},
+	} [name] || name;
+},
         "triggerDebuff": function (action, type) {
 			// 毒衰咒效果的获得与解除
 			// action：获得还是解除；'get'表示获得，'remove'表示解除
@@ -1166,8 +1167,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 			}
 		},
         "updateStatusBar": function () {
-	//更新属性映射
-	core.updateStatus()
 	// 更新状态栏
 	core.ui.statusBar.update();
 	// 更新阻激夹域的伤害值

project/items.js

@@ -146,12 +146,12 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 	"sword1": {
 		"cls": "equips",
 		"name": "铁剑",
-		"text": "一把很普通的铁剑",
+		"text": "一把普通的铁剑",
 		"equip": {
 			"type": 0,
 			"animate": "sword",
 			"value": {
-				"str": 10
+				"atk": 10
 			},
 			"percentage": {}
 		},
@@ -230,11 +230,11 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"equip": {
 			"type": 2,
 			"value": {
-				"str": 10,
+				"mdef": -5,
-				"agi": -5
+				"def": 10
 			},
 			"percentage": {
-				"str": 10
+				"def": 10
 			}
 		},
 		"itemEffect": "core.status.hero.def += 0",