Merge branch 'status-itcfangye' into map

libs/ui.js

@@ -1270,6 +1270,7 @@ ui.prototype._drawTextContent_drawChar = function (tempCtx, content, config, ch)
     // 输出
     var left = config.offsetX, top = config.offsetY + config.topMargin;
     core.fillText(tempCtx, ch, left, top);
+    tempCtx.strokeText(ch, left, top);
     config.blocks.push({
         left: config.offsetX, top: config.offsetY,
         width: charwidth, height: config.currfont + config.lineMargin,

project/data.js

@@ -1946,10 +1946,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			{
 				"type": "insert",
 				"name": "强制横屏"
-			},
-			{
-				"type": "insert",
-				"name": "chapter0"
 			}
 		],
 		"shops": [

project/floors/chushi.js

@@ -1,7 +1,7 @@
 main.floors.chushi=
 {
     "floorId": "chushi",
-    "title": "抉择",
+    "title": "开场剧情",
     "name": "1",
     "width": 13,
     "height": 13,
@@ -12,6 +12,10 @@ main.floors.chushi=
     "ratio": 1,
     "defaultGround": "T400",
     "firstArrive": [
+        {
+            "type": "insert",
+            "name": "chapter0"
+        },
         {
             "type": "confirm",
             "text": "要进行教程内容吗",
@@ -63,7 +67,7 @@ main.floors.chushi=
     [  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]
 ],
-    "areas": "抉择",
+    "areas": "开场剧情",
     "bgmap": [
 
 ],

project/floors/jiaocheng03.js

@@ -22,6 +22,10 @@ main.floors.jiaocheng03=
             "法杖：魔攻比例10%，魔防比例0%"
         ],
         "6,0": [
+            {
+                "type": "setHeroOpacity",
+                "opacity": 0
+            },
             {
                 "type": "changeFloor",
                 "floorId": "guangchang",

project/functions.js

@@ -1565,7 +1565,27 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		if (!core.same(core.values[key], core.data.values[key]))
 			values[key] = core.clone(core.values[key]);
 	}
-
+	let cg = {}
+	if (core.getFlag("_cgText")) {
+		cg.index = core.ui.cgText.index
+		cg.head = core.ui.cgText.head
+		cg.name = core.ui.cgText.name
+		cg.text = core.ui.cgText.text
+		cg.bodyList = core.clone(core.ui.cgText.bodyList)
+		cg.nobg = core.ui.cgText.nobg
+		cg.image = core.ui.cgText.image
+		cg.time = core.ui.cgText.time
+		cg.WindowSkin = core.ui.cgText.WindowSkin
+		cg.sound = core.ui.cgText.sound
+		cg.beforeSound = core.ui.cgText.beforeSound
+		cg.wait = core.ui.cgText.wait
+		cg.memory = core.ui.cgText.memory
+		cg.textList = core.ui.cgText.textList
+		cg.page = core.ui.cgText.page
+		cg.overpage = core.ui.cgText.overpage
+		cg.log = core.ui.cgText.log
+		cg.index = core.ui.cgText.index
+	}
 	// 要存档的内容
 	var data = {
 		floorId: core.status.floorId,
@@ -1577,10 +1597,10 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		version: core.firstData.version,
 		guid: core.getGuid(),
 		time: new Date().getTime(),
-		'material': core.clone(core.material.enemys)
+		cg: cg
 	};
 	return data;
-    },
+},
         "loadData": function (data, callback) {
 	// 读档操作；从存储中读取了内容后的行为
 	const play = core.status.played;
@@ -1592,8 +1612,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		core.maps.loadMap(data.maps, null, data.hero.flags),
 		data.values
 	);
-	  	//如果作者造塔想随时修改怪物属性平衡数值，请注释下面这行。该行作用为保存怪物当前属性，用以储存临时修改的怪物属性。
-	core.material.enemys = data.material ?? core.material.enemys;
 	core.status.route = core.decodeRoute(data.route);
 	core.control._bindRoutePush();
 	// 文字属性，全局属性
@@ -1626,6 +1644,14 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	// TODO：增加自己的一些读档处理
 	core.ui.statusBar.clearItemInfo();
 	core.ui.statusBar.update();
+	if (core.getFlag("_cgText")) {
+		core.setFlag("_cgText", false)
+		for (let v in data.cg) {
+
+			core.ui.cgText[v] = data.cg[v]
+		}
+		core.drawbackground(core.ui.cgText.image, core.ui.cgText.memory)
+	}
 	core.plugin.playing.clear();
 	// 切换到对应的楼层
 	core.changeFloor(data.floorId, null, data.hero.loc, 0, function () {
@@ -1640,7 +1666,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		if (callback) callback();
 	});
 	if (play) core.doAction();
-    },
+},
         "getStatusLabel": function (name) {
 	// 返回某个状态英文名的对应中文标签，如atk -> 攻击，def -> 防御等。
 	// 请注意此项仅影响 libs/ 下的内容（如绘制怪物手册、数据统计等）