_saves/Eustia_autoSave

@@ -1 +1 @@
-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
+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=

_server/MotaAction.g4

@@ -4628,8 +4628,8 @@ EnemyPoint_List
     /*EnemyPoint_List ['hp','atk','def','money','exp','point','name']*/;
 
 Equip_List
-    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔力'|'魔力上限'|'速度'
-    /*Equip_List ['hp','hpmax','atk','def','mdef','mana','manamax','speed']*/;
+    :   '生命'|'生命上限'|'攻击'|'防御'|'护盾'|'魔力'|'魔力上限'
+    /*Equip_List ['hp','hpmax','atk','def','mdef','mana','manamax']*/;
 
 Key_List
     :   '黄钥匙'|'蓝钥匙'|'红钥匙'|'绿钥匙'|'铁门钥匙'

_server/table/comment.js

@@ -187,18 +187,24 @@ 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,19 +262,44 @@ 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/floors/street01.js

@@ -29,7 +29,7 @@ main.floors.street01=
         "6,11": [
             {
                 "type": "insert",
-                "name": "chapter04"
+                "name": "chapter01"
             }
         ],
         "4,11": [
@@ -118,7 +118,7 @@ main.floors.street01=
     [110118,110118,200096,110116,110020,  0,200014,  0,  0,  0,  0,  0,110125],
     [ 92,  0,  0,110124,  0,201,  0,  0,110125,110122,110122,110122,110122],
     [  0,  0,  0,110118,110118,202,110118,110118,110122,  0,  0,  0, 94],
-    [130170,  0,  0,  0, 71, 35,  0,  0,  0,  0,  0,  0,  0],
+    [130170,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [130178,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130168,130169],
     [130225,130169,130169,130169,130169,130170,110122,110122,130168,130169,130169,130224,130177]
 ],

project/floors/yiqu8.js

@@ -1,29 +1,29 @@
 main.floors.yiqu8=
 {
-    "floorId": "yiqu8",
-    "title": "主塔 8 层",
-    "name": "8",
-    "width": 13,
-    "height": 13,
-    "canFlyTo": true,
-    "canFlyFrom": true,
-    "canUseQuickShop": true,
-    "images": [],
-    "ratio": 1,
-    "defaultGround": "grass2",
-    "firstArrive": [],
-    "eachArrive": [],
-    "parallelDo": "",
-    "events": {},
-    "changeFloor": {},
-    "beforeBattle": {},
-    "afterBattle": {},
-    "afterGetItem": {},
-    "afterOpenDoor": {},
-    "autoEvent": {},
-    "cannotMove": {},
-    "cannotMoveIn": {},
-    "map": [
+"floorId": "yiqu8",
+"title": "主塔 8 层",
+"name": "8",
+"width": 13,
+"height": 13,
+"canFlyTo": true,
+"canFlyFrom": true,
+"canUseQuickShop": true,
+"images": [],
+"ratio": 1,
+"defaultGround": "grass2",
+"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,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
@@ -38,16 +38,4 @@ main.floors.yiqu8=
     [  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]
 ],
-    "bgmap": [
-
-],
-    "fgmap": [
-
-],
-    "bg2map": [
-
-],
-    "fg2map": [
-
-]
 }

project/functions.js

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