Deploying to gh-pages from @ 14486f970f 🚀

project/data.js

@@ -30,7 +30,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"tower4",
 			"tower5",
 			"tower6",
-			"tower7"
+			"tower7",
+			"MT22"
 		],
 		"floorPartitions": [
 			[
@@ -45,23 +46,16 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"IQ.png",
 			"arrow.png",
 			"atk.png",
-			"beforeBoss.jpg",
 			"bg.jpg",
 			"boom.png",
 			"botton.png",
-			"cave.jpg",
-			"cave1.jpg",
 			"cave2.jpg",
 			"def.png",
-			"escape.jpg",
 			"exp.png",
-			"grass.jpg",
 			"hero1.png",
 			"hero2.png",
 			"hp.png",
 			"money.png",
-			"mount.jpg",
-			"plot1.jpg",
 			"skill.png",
 			"skill0.png",
 			"skill1.png",
@@ -73,11 +67,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"skill7.png",
 			"title.jpg",
 			"tower.jpg",
-			"tower6.jpeg",
 			"tower7.jpeg",
-			"towerBoss.jpg",
-			"towerBoss2.jpg",
-			"towerBoss3.jpg",
 			"winskin.png",
 			"winskin2.png",
 			"winskin3.png"
@@ -116,16 +106,21 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		],
 		"bgms": [
 			"beforeBoss.mp3",
+			"beforeNight.mp3",
 			"cave.mp3",
 			"escape.mp3",
 			"grass.mp3",
 			"mount.mp3",
+			"night.mp3",
+			"palace.mp3",
 			"plot1.mp3",
+			"road.mp3",
 			"title.mp3",
 			"tower.mp3",
 			"towerBoss.mp3",
 			"towerBoss2.mp3",
-			"towerBoss3.mp3"
+			"towerBoss3.mp3",
+			"winter.mp3"
 		],
 		"sounds": [
 			"008-System08.ogg",
@@ -167,8 +162,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"zone.mp3"
 		],
 		"fonts": [
-			"normal",
+			"normal"
-			"scroll"
 		],
 		"nameMap": {
 			"确定": "confirm.mp3",
@@ -464,7 +458,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			{
 				"type": "setGlobalAttribute",
 				"name": "font",
-				"value": "scroll"
+				"value": "normal"
 			},
 			{
 				"type": "playSound",
@@ -554,11 +548,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			},
 			{
 				"type": "showStatusBar"
-			},
-			{
-				"type": "setGlobalAttribute",
-				"name": "font",
-				"value": "normal"
 			}
 		],
 		"shops": [],

project/floors/MT14.js

@@ -151,11 +151,6 @@ main.floors.MT14=
                                     ],
                                     "background": "winskin3.png"
                                 },
-                                {
-                                    "type": "setGlobalAttribute",
-                                    "name": "font",
-                                    "value": "scroll"
-                                },
                                 "人类简史——起源篇",
                                 {
                                     "type": "playSound",
@@ -196,11 +191,6 @@ main.floors.MT14=
                                     ],
                                     "background": "winskin2.png"
                                 },
-                                {
-                                    "type": "setGlobalAttribute",
-                                    "name": "font",
-                                    "value": "normal"
-                                },
                                 {
                                     "type": "changeFloor",
                                     "floorId": "MT17",

project/floors/MT20.js

@@ -19,6 +19,10 @@ main.floors.MT20=
             "type": "setGlobalValue",
             "name": "animateSpeed",
             "value": 333.3333
+        },
+        {
+            "type": "function",
+            "function": "function(){\ncore.deleteAllCanvas()\n}"
         }
     ],
     "parallelDo": "",

project/floors/MT21.js

@@ -18,11 +18,133 @@ main.floors.MT21=
     "parallelDo": "",
     "events": {
         "14,8": [
-            "感谢游玩该塔，目前塔只完成了40%，请期待后续更新",
-            "分数计算公式：血量+5000*黄钥匙+15000+蓝钥匙",
             {
-                "type": "win",
+                "type": "if",
-                "reason": "智慧之始"
+                "condition": "(flag:chapter===1)",
+                "true": [
+                    {
+                        "type": "setCurtain",
+                        "color": [
+                            0,
+                            0,
+                            0,
+                            1
+                        ],
+                        "time": 1500,
+                        "keep": true
+                    },
+                    {
+                        "type": "setText",
+                        "text": [
+                            0,
+                            0,
+                            0,
+                            1
+                        ],
+                        "background": "winskin3.png"
+                    },
+                    "人类简史——起源篇",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "他踏出了寻找智慧的第一步。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "他所练就的勇气，也成为他寻找智慧路上的一大利器。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "人类简史——起源篇，完。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    {
+                        "type": "setValue",
+                        "name": "flag:chapter",
+                        "value": "2"
+                    },
+                    {
+                        "type": "sleep",
+                        "time": 1000
+                    },
+                    "人类简史——进化篇",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "或许，他真的不理解智慧。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "或许，他已经理解了一些。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "但这不重要。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "他的轨迹已经注定了他对未来的影响。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "这个世界，甚至这个宇宙，都因为他的存在而改变。",
+                    {
+                        "type": "playSound",
+                        "name": "paper.mp3"
+                    },
+                    "在这里，智慧小径，将是他智慧的飞跃点。",
+                    {
+                        "type": "changeFloor",
+                        "floorId": "MT22",
+                        "loc": [
+                            0,
+                            8
+                        ]
+                    },
+                    {
+                        "type": "setCurtain",
+                        "time": 1000
+                    },
+                    {
+                        "type": "setText",
+                        "text": [
+                            255,
+                            255,
+                            255,
+                            1
+                        ],
+                        "background": "winskin2.png"
+                    },
+                    "\t[初级智人]\b[up,hero]智慧吗...",
+                    "\t[初级智人]\b[up,hero]智慧又是什么呢？",
+                    "\t[初级智人]\b[up,hero]智慧之神说它可以掌控万物，真的这么神奇吗...",
+                    "\t[初级智人]\b[up,hero]完全摸不到头脑。",
+                    "\t[初级智人]\b[up,hero]或许智慧结晶会告诉我答案吧。"
+                ],
+                "false": [
+                    {
+                        "type": "changeFloor",
+                        "floorId": "MT22",
+                        "loc": [
+                            0,
+                            8
+                        ]
+                    }
+                ]
             }
         ]
     },

project/floors/MT22.js

@@ -0,0 +1,82 @@
+main.floors.MT22=
+{
+    "floorId": "MT22",
+    "title": "智慧小径",
+    "name": "智慧小径",
+    "width": 15,
+    "height": 15,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "cannotViewMap": false,
+    "images": [],
+    "ratio": 2,
+    "defaultGround": "grass",
+    "bgm": "road.mp3",
+    "firstArrive": [],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {
+        "0,8": [
+            {
+                "type": "changeFloor",
+                "floorId": "MT21",
+                "loc": [
+                    14,
+                    8
+                ]
+            }
+        ]
+    },
+    "changeFloor": {},
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [142,142,142,142,142,142,142,142,142, 91,143,143,143,143,143],
+    [142,142,142,142,142,142,142,142,142,  0,143,143,143,143,143],
+    [142,142,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [142,142,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [142,142,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94],
+    [142,142,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [142,142,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [142,142,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [ 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [143,143,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [143,143,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [143,143,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [143,143,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143,143],
+    [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143],
+    [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143]
+],
+    "bgmap": [
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,144,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,144,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,144,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,144,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,144,144,144,144,144,144,144,144],
+    [  0,  0,  0,  0,  0,  0,  0,144,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,144,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,144,  0,  0,  0,  0,  0,  0,  0],
+    [144,144,144,144,144,144,144,144,  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,  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,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}

project/floors/MT5.js

@@ -38,11 +38,6 @@ main.floors.MT5=
                     }
                 ],
                 "false": [
-                    {
-                        "type": "setGlobalAttribute",
-                        "name": "font",
-                        "value": "scroll"
-                    },
                     {
                         "type": "setCurtain",
                         "color": [
@@ -99,11 +94,6 @@ main.floors.MT5=
                         "textfont": 20,
                         "time": 25
                     },
-                    {
-                        "type": "setGlobalAttribute",
-                        "name": "font",
-                        "value": "normal"
-                    },
                     {
                         "type": "changeFloor",
                         "floorId": "MT6",

project/floors/tower7.js

@@ -14,6 +14,10 @@ main.floors.tower7=
     "defaultGround": "T526",
     "bgm": "tower.mp3",
     "firstArrive": [
+        {
+            "type": "hideStatusBar",
+            "toolbox": true
+        },
         {
             "type": "loadBgm",
             "name": "beforeBoss.mp3"

project/plugins.js

@@ -2001,11 +2001,13 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
             var interval = window.setInterval(() => {
                 if (stage == 1) {
                     if (seconds == 8)
-                        core.skipWord('智慧之神：你和之前来的人不一样');
+                        core.skipWord('智慧之神：果然，你和别人不一样。');
                     if (seconds == 12)
-                        core.skipWord('智慧之神：他们只会一股脑地向前冲');
+                        core.skipWord('智慧之神：你知道去躲避那些攻击。');
                     if (seconds == 16)
-                        core.skipWord('智慧之神：而你却会躲避这些攻击');
+                        core.skipWord(
+                            '智慧之神：之前的那些人总会一头撞上我的攻击，悲剧收场。'
+                        );
                     if (seconds == 20)
                         core.skipWord('提示：踩在红圈上可以对智慧之神造成伤害');
                     if (seconds > 10) core.attackBoss();
@@ -2021,9 +2023,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                     core.pauseBgm();
                 }
                 if (stage == 2) {
-                    if (seconds == 4) core.skipWord('智慧之神：你很有潜力');
+                    if (seconds == 4)
+                        core.skipWord('智慧之神：你的确拥有智慧。');
                     if (seconds == 8)
-                        core.skipWord('智慧之神：看来你很可能成为改变历史的人');
+                        core.skipWord('智慧之神：或许你就是那个未来的救星。');
                     if (seconds == 12)
                         core.skipWord('智慧之神：不过，这场战斗才刚刚开始');
                     if (seconds == 25)
@@ -2045,7 +2048,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                 }
                 if (stage >= 3) {
                     if (seconds == 4)
-                        core.skipWord('智慧之神：我越来越欣赏你了');
+                        core.skipWord('智慧之神：拥有智慧就是不一样。');
                     if (seconds == 8)
                         core.skipWord('智慧之神：不过，你还得再过我一关！');
                     if (seconds == 12) core.startStage3();
@@ -2084,19 +2087,21 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                     delete flags.__bgm__;
                     core.pauseBgm();
                     core.insertAction([
-                        '\t[智慧之神,E557]\b[down,7,4]不错不错，你确实可以成为改变历史的人',
+                        '\t[智慧之神,E557]\b[down,7,4]看来你真的会成为那个拯救未来的人。',
-                        '\t[智慧之神,E557]\b[down,7,4]我的职责就到此结束了',
+                        '\t[智慧之神,E557]\b[down,7,4]记住，拥有智慧便可以掌控万物。',
-                        '\t[智慧之神,E557]\b[down,7,4]之后还是要看你自己了，千万不要让我失望！',
+                        '\t[低级智人]\b[up,hero]智慧？智慧到底是什么？',
-                        '\t[智慧之神,E557]\b[down,7,4]东边的机关门我已经替你打开了',
+                        '\t[智慧之神,E557]\b[down,7,4]最终，你会知道答案的。',
+                        '\t[智慧之神,E557]\b[down,7,4]继续向东前进吧，那里能找到你想要的答案。',
                         { type: 'openDoor', loc: [13, 6], floorId: 'MT19' },
-                        '\t[智慧之神,E557]\b[down,7,4]我这就把你传送出去',
+                        '\t[智慧之神,E557]\b[down,7,4]我这就把你送出去',
                         { type: 'setValue', name: 'flag:boss1', value: 'true' },
                         { type: 'changeFloor', floorId: 'MT20', loc: [7, 9] },
+                        { type: 'forbidSave' },
+                        { type: 'showStatusBar' },
                         {
                             type: 'function',
                             function: '() => {\ncore.deleteAllCanvas();\n}'
-                        },
+                        }
-                        { type: 'forbidSave' }
                     ]);
                 }
                 seconds++;
@@ -2222,7 +2227,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                                 damaged[loc + direction] = true;
                                 core.drawHeroAnimate('hand');
                                 core.status.hero.hp -= 1000;
-                                core.popupDamage(1000, x, y, false);
+                                core.addPop(x * 32 + 16, y * 32 + 16, 1000);
                                 core.updateStatusBar();
                                 if (core.status.hero.hp < 0) {
                                     clearInterval(skill1);
@@ -2240,7 +2245,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                                 damaged[loc + direction] = true;
                                 core.drawHeroAnimate('hand');
                                 core.status.hero.hp -= 1000;
-                                core.popupDamage(1000, x, y, false);
+                                core.addPop(x * 32 + 16, y * 32 + 16, 1000);
                                 core.updateStatusBar();
                                 if (core.status.hero.hp < 0) {
                                     clearInterval(skill1);
@@ -2371,7 +2376,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                     if (x == locs[index][0] && y == locs[index][1]) {
                         core.drawHeroAnimate('hand');
                         core.status.hero.hp -= 5000;
-                        core.popupDamage(5000, x, y, false);
+                        core.addPop(x * 32 + 16, y * 32 + 16, 5000);
                         core.updateStatusBar();
                         if (core.status.hero.hp < 0) {
                             core.status.hero.hp = 0;
@@ -2547,7 +2552,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                 hy = core.status.hero.loc.y;
             if (Math.abs(hx - x) <= 1 && Math.abs(hy - y) <= 1) {
                 core.status.hero.hp -= 3000 * power;
-                core.popupDamage(3000 * power, x, y, false);
+                core.addPop(x * 32 + 16, y * 32 + 16, 3000 * power);
                 core.updateStatusBar();
                 if (core.status.hero.hp < 0) {
                     core.status.hero.hp = 0;
@@ -2715,7 +2720,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                                 ) {
                                     damaged[i] = true;
                                     core.status.hero.hp -= 3000;
-                                    core.popupDamage(3000, x, y, false);
+                                    core.addPop(x * 32 + 16, y * 32 + 16, 3000);
                                     core.updateStatusBar();
                                     core.playSound('electron.mp3');
                                     if (core.status.hero.hp < 0) {
@@ -3286,7 +3291,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                             hy = core.status.hero.loc.y;
                         if (loc[0] == hx && loc[1] == hy) {
                             core.status.hero.hp -= 3000;
-                            core.popupDamage(3000, hx, hy, false);
+                            core.addPop(x * 32 + 16, y * 32 + 16, 3000);
                             core.updateStatusBar();
                             if (core.status.hero.hp < 0) {
                                 core.status.hero.hp = 0;
@@ -3331,7 +3336,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                             loc2[1];
                     if (n1 * n2 <= 0) {
                         core.status.hero.hp -= damage;
-                        core.popupDamage(damage, x, y, false);
+                        core.addPop(x * 32 + 16, y * 32 + 16, damage);
                         core.updateStatusBar();
                         core.playSound('electron.mp3');
                         if (core.status.hero.hp < 0) {
@@ -3357,7 +3362,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                             loc2[1];
                     if (n1 * n2 <= 0) {
                         core.status.hero.hp -= damage;
-                        core.popupDamage(damage, x, y, false);
+                        core.addPop(x * 32 + 16, y * 32 + 16, damage);
                         core.updateStatusBar();
                         core.playSound('electron.mp3');
                         if (core.status.hero.hp < 0) {