Merge branch 'status-itcfangye' of https://gitea.mota.press/Dove/Eustia into status-itcfangye

_server/MotaAction.g4

@@ -1138,7 +1138,7 @@ return code;
 
 cgtext_s
     :    '背景' EvalString? '回忆滤镜' Bool? '移除对话框' Bool? '剧情库序列' Int '头像' EvalString?'坐标PX' Number'打字间隔' Int? BGNL? Newline
-     '自动等待时长' Int '音频文件(需在全塔属性——使用音效注册)'EvalString? BGNL? Newline
+     '自动等待时长' Int  BGNL? Newline
       textcgDrawingList+? Newline
     
 
@@ -1146,11 +1146,10 @@ cgtext_s
 tooltip : cgtext：显示一段包含cg的文字（剧情）
 helpUrl : /_docs/#/instruction
 allImages : ['EvalString_0','EvalString_1']
-allSounds : ['EvalString_2']
 default : ["bg_5043.webp",false,false,0,"face_050445.webp",-300,0,2000,"","这句话显示在对话框内",[{ "name":"tati_050145a.webp" , "px": 100,"filter":false }]]
 var head ='{ "name": "'+EvalString_1+'", "px": '+Number_0+' }'
 var list=',"bodyList": [\n'+textcgDrawingList_0.slice(0,-1)+'\n]'
-var code = '{"type": "cgtext", "bg":"'+EvalString_0+'","memory":'+Bool_0+',"WindowSkin":'+Bool_1+',"head":'+head+' ,"index":"'+Int_0+'","time":'+Int_1+',"wait":'+Int_2+',"sound":"'+EvalString_2+'"'+list+' },\n';
+var code = '{"type": "cgtext", "bg":"'+EvalString_0+'","memory":'+Bool_0+',"WindowSkin":'+Bool_1+',"head":'+head+' ,"index":"'+Int_0+'","time":'+Int_1+',"wait":'+Int_2+list+' },\n';
 return code;
 */;
 textcgDrawingList

_server/MotaActionParser.js

@@ -574,7 +574,6 @@ MotaActionParser = function () {
           data.head.px || -300,
           data.time,
           data.wait,
-          data.sound,
           buildcgDrawing(data.bodyList),
           this.next,
         ]);

_server/table/data.comment.js

@@ -269,7 +269,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 							"_type": "textarea",
 							"_data": "法强",
 						},
-						"spelldef": {
+						"mdef": {
 							"_leaf": true,
 							"_type": "textarea",
 							"_data": "法抗百分比",
@@ -280,7 +280,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 							"_data": "100为法强转化为等值魔攻",
 							"_docs": "魔攻比例"
 						},
-						"mdef": {
+						"mhp": {
 							"_leaf": true,
 							"_type": "textarea",
 							"_data": "100为法强转化为等值护盾",

project/data.js

@@ -437,18 +437,21 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"face_440110.webp",
 			"green.webp",
 			"hero.webp",
+			"jianji.webp",
 			"l.webp",
 			"lane1.webp",
 			"light.webp",
 			"lock.webp",
 			"lr.webp",
 			"maba.webp",
+			"miwu.webp",
 			"null.webp",
 			"other_0001.webp",
 			"other_0002.webp",
 			"other_0003.webp",
 			"other_0004.webp",
 			"r.webp",
+			"sound.webp",
 			"status.webp",
 			"suiji.webp",
 			"tati_020101.webp",
@@ -1116,7 +1119,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"atk": 100,
 			"def": 100,
 			"mdef": 0,
-			"speed": 0,
+			"speed": 10,
 			"money": 0,
 			"exp": 0,
 			"equipment": [],
@@ -1138,7 +1141,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"steps": 0,
 			"matk": 0,
 			"spell": 0,
-			"spelldef": 0
+			"spelldef": 0,
+			"mhp": 0
 		},
 		"startCanvas": [
 			{
@@ -1494,14 +1498,12 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		],
 		"startText": [
 			{
-				"type": "setValue",
+				"type": "function",
-				"name": "item:book",
+				"function": "function(){\ncore.getItem('book',1);core.getItem('fly',1)\n}"
-				"value": "1"
 			},
 			{
-				"type": "setValue",
+				"type": "insert",
-				"name": "item:fly",
+				"name": "战斗动画特效注册"
-				"value": "1"
 			},
 			{
 				"type": "insert",

project/enemys.js

@@ -4,7 +4,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"redSlime": {"name":"红头怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"value":10,"magic":false},
 	"blackSlime": {"name":"青头怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"slimelord": {"name":"怪王","hp":100,"atk":120,"def":0,"money":10,"exp":0,"point":0,"special":[1,9]},
-	"bat": {"name":"小蝙蝠","hp":100,"atk":120,"def":0,"money":2,"exp":0,"point":0,"special":[1],"mdef":0,"speed":10},
+	"bat": {"name":"小蝙蝠","hp":100,"atk":120,"def":0,"money":2,"exp":0,"point":0,"special":[1],"mdef":0,"speed":15},
 	"bigBat": {"name":"大蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"redBat": {"name":"红蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"vampire": {"name":"冥灵魔王","hp":888,"atk":888,"def":888,"money":888,"exp":888,"point":0,"special":[6],"n":8},

styles.css

@@ -544,9 +544,9 @@ p#name {
 }
 
 /* 注释下面这三行以开启抗锯齿 */
-.anti-aliasing {
+/* .anti-aliasing {
   image-rendering: pixelated;
-}
+} */
 
 .warning {
   transition: left cubic-bezier(0, 0.9, 1, 0.1) 2.5s;