修改字体、天气

_server/MotaAction.g4

@@ -3000,7 +3000,7 @@ return code;
 */;
 
 setWeather_s
-    :   '更改天气' Weather_List '强度' Int '持续到下个本事件' Bool Newline
+    :   '更改天气' Weather_List '强度' Int  Newline
     
 
 /* setWeather_s
@@ -3009,8 +3009,8 @@ helpUrl : /_docs/#/instruction
 default : [null,1,true]
 colour : this.soundColor
 if(Int_0<1 || Int_0>10) throw new Error('天气的强度等级, 在1-10之间');
-Bool_0 = Bool_0 ? ', "keep": true' : ''
-var code = '{"type": "setWeather", "name": "'+Weather_List_0+'", "level": '+Int_0+Bool_0+'},\n';
+
+var code = '{"type": "setWeather", "name": "'+Weather_List_0+'", "level": '+Int_0+'},\n';
 if(Weather_List_0===''||Weather_List_0==='null'||Weather_List_0==null)code = '{"type": "setWeather"},\n';
 return code;
 */;

_server/MotaActionParser.js

@@ -1494,7 +1494,6 @@ MotaActionParser = function () {
         this.next = MotaActionBlocks["setWeather_s"].xmlText([
           data.name,
           data.level || 1,
-          data.keep || false,
           this.next,
         ]);
         break;

project/data.js

@@ -1452,8 +1452,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"HATTEN",
 			"Verdana",
 			"number",
-			"pala",
-			"simhei"
+			"pala"
 		],
 		"nameMap": {
 			"确定": "confirm.opus",

project/plugins.js

@@ -3114,6 +3114,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				"mhp",
 				"speed",
 				"money",
+				"exp"
 			]; //属性列表，图标在函数复写core.statusBar.icons中声明，数字为project\materials\icons.png中的图标序号（可使用便捷ps追加，第一个序号为0）
 			const drawStatusList = (baseX, baseY) => {
 				let curh = baseY;
@@ -3138,7 +3139,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						curh - 4 * 3,
 						TEXT_COLOR,
 						"#000000",
-						6
+						3
 					);
 					core.setFont("outerUI", "bold 36px Verdana");
 					// 四舍五入
@@ -3161,8 +3162,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						curh,
 						TEXT_COLOR,
 						"#000000",
-						6
-					);
+						3
+					)
 
 					curh += 24 * 3;
 					if (curh > 130 * 3 && core.domStyle.isVertical) {
@@ -3183,7 +3184,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						22 * 3,
 						TEXT_COLOR,
 						"#000000",
-						6
+						3
 					);
 				}
 				drawStatusList(96 * 3, 46 * 3);
@@ -3200,7 +3201,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						41 * 3,
 						TEXT_COLOR,
 						"#000000",
-						6
+						3
 					);
 				}
 				drawStatusList(110 * 3, 93 * 3);
@@ -21112,6 +21113,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
     "天气叠加": function () {
 	//使用方法：使用core.setWeather(天气，等级)来增加天气，使用core.setWeather()来清空天气
 	// 天气叠加功能
+
 	////// 更改天气效果 //////
 	control.prototype.setWeather = function (type, level) {
 		// 非雨雪
@@ -21182,37 +21184,33 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			break;
 		case "fog":
 			if (core.animateFrame.weather.fog) {
-            core.animateFrame.weather.nodes[type] = [
-              {
+				core.animateFrame.weather.nodes[type] = [{
 					level: number,
 					x: 0,
 					y: -core.__PIXELS__ / 2,
 					dx: -Math.random() * 1.5,
 					dy: Math.random(),
 					delta: 0.001,
-              },
-            ];
+				}, ];
 			}
 			break;
 		case "cloud":
 			if (core.animateFrame.weather.cloud) {
-            core.animateFrame.weather.nodes[type] = [
-              {
+				core.animateFrame.weather.nodes[type] = [{
 					level: number,
 					x: 0,
 					y: -core.__PIXELS__ / 2,
 					dx: -Math.random() * 1.5,
 					dy: Math.random(),
 					delta: 0.001,
-              },
-            ];
+				}, ];
 			}
 			break;
 		case "sun":
 			if (core.animateFrame.weather.sun) {
 				// 直接绘制
 				core.clearMap("weather" + type);
-            core.setAlpha("weather" + type, level / 10);
+
 				core.drawImage(
 					"weather" + type,
 					core.animateFrame.weather.sun,
@@ -21225,7 +21223,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 					core.__PIXELS__,
 					core.__PIXELS__
 				);
-            core.setAlpha("weather" + type, 1);
+				core.setAlpha("weather" + type, level / 10);
+				core.animateFrame.weather.nodes.sun = [{ level: level, opacity: level / 10, delta: 0.01 }]
 			}
 			break;
 		}
@@ -21243,6 +21242,18 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			weather.time[one] = timestamp;
 		});
 	});
+	// 晴
+	control.prototype._animationFrame_weather_sun = function () {
+
+		var node = core.animateFrame.weather.nodes.sun[0]
+		var opacity = node.opacity + node.delta;
+
+		if (opacity > node.level / 11 + 0.3 || opacity < node.level / 11 - 0.3)
+			node.delta = -node.delta;
+		node.opacity = opacity;
+		core.setOpacity("weathersun", core.clamp(opacity, 0, 1));
+
+	};
 	// 雨
 	control.prototype._animationFrame_weather_rain = function () {
 		var ctx = core.dymCanvas.weatherrain,
@@ -21359,7 +21370,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			core.animateFrame.weather.cloud,
 			"cloud"
 		);
-    };
+	}
+
 },
     "回合战斗动画": function () {
 	// 在此增加新插件