Merge branch 'map' into story

project/data.js

@@ -52,6 +52,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"HPGaugeEnemy_A.webp",
 			"HPGaugeEnemy_B.webp",
 			"LOGO.webp",
+			"aiy00010_06.webp",
 			"background.webp",
 			"backgroundvertical.webp",
 			"bg_0000.png",

project/events.js

@@ -2235,8 +2235,42 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
 				"style": "场景切换"
 			},
 			{
-				"type": "comment",
+				"type": "animationDrawable",
-				"text": "这个神官草莓说是特效不是立绘，标记！"
+				"allFarme": 30,
+				"color": [
+					0,
+					0,
+					0
+				],
+				"imageList": [
+					{
+						"image": "bg_3021.webp",
+						"beforefarme": 0,
+						"afterfarme": 30
+					},
+					{
+						"image": "aiy00010_06.webp",
+						"beforefarme": 0,
+						"globalAlpha": 0,
+						"x": 1204,
+						"y": 0,
+						"w": 624,
+						"h": 1248,
+						"afterfarme": 30,
+						"aglobalAlpha": 100,
+						"ax": 1204,
+						"ay": 0,
+						"aw": 624,
+						"ah": 1248
+					}
+				],
+				"soundList": [
+					{
+						"sound": "",
+						"startfarme": 0,
+						"stopbefore": false
+					}
+				]
 			},
 			{
 				"type": "cgtext",
@@ -2250,7 +2284,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
 				"wait": 1000,
 				"bodyList": [
 					{
-						"name": "tati_440101.webp",
+						"name": "",
 						"px": 200,
 						"filter": false
 					}
@@ -2269,7 +2303,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
 				"bodyList": [
 					{
 						"name": "tati_440101.webp",
-						"px": 200,
+						"px": 600,
 						"filter": false
 					}
 				]
@@ -2287,7 +2321,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
 				"bodyList": [
 					{
 						"name": "tati_440101.webp",
-						"px": 200,
+						"px": 600,
 						"filter": false
 					}
 				]
@@ -2310,6 +2344,49 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
 					}
 				]
 			},
+			{
+				"type": "animationDrawable",
+				"allFarme": 30,
+				"color": [
+					0,
+					0,
+					0
+				],
+				"imageList": [
+					{
+						"image": "bg_3021.webp",
+						"beforefarme": 0,
+						"afterfarme": 30
+					},
+					{
+						"image": "aiy00010_06.webp",
+						"beforefarme": 0,
+						"globalAlpha": 100,
+						"x": 1204,
+						"y": 0,
+						"w": 624,
+						"h": 1248,
+						"afterfarme": 30,
+						"aglobalAlpha": 0,
+						"ax": 1204,
+						"ay": 0,
+						"aw": 624,
+						"ah": 1248
+					}
+				],
+				"soundList": [
+					{
+						"sound": "",
+						"startfarme": 0,
+						"stopbefore": false
+					}
+				]
+			},
+			{
+				"type": "drawbackground",
+				"image": "bg_3021.webp",
+				"memory": false
+			},
 			{
 				"type": "cgtext",
 				"WindowSkin": false,

project/floors/jiaocheng01.js

@@ -261,6 +261,12 @@ main.floors.jiaocheng01=
                     }
                 ]
             }
+        ],
+        "2,11": [
+            {
+                "type": "insert",
+                "name": "chapter02"
+            }
         ]
     },
     "changeFloor": {

project/plugins.js

@@ -21571,7 +21571,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		["梅尔特", "「我忘记了」", "aiy120000340.ogg"], //老板娘33
 		["吉克", "「骗人」", "aiy340000190.ogg"], //吉克19
 		["梅尔特", "「我说真的」", "aiy120000350.ogg"], //老板娘34
-		["梅尔特", "「嘛，如果想起来了的话，就算是卸载艺术上我也会公诸于众的」", "aiy120000360.ogg"], //老板娘35
+		["梅尔特", "「嘛，如果想起来了的话，就算是写在遗书上我也会公诸于众的」", "aiy120000360.ogg"], //老板娘35
 		["吉克", "「喔唷」", "aiy340000200.ogg"], //吉克20
 		["吉克", "「那么，我就不能比你先死了啊」", "aiy340000210.ogg"], //吉克21
 		["梅尔特", "「蒙你费心」", "aiy120000370.ogg"], //老板娘36