diff --git a/public/libs/control.js b/public/libs/control.js
index a70acbd..06d878d 100644
--- a/public/libs/control.js
+++ b/public/libs/control.js
@@ -3416,6 +3416,7 @@ control.prototype.setDisplayScale = function (delta) {
////// 清空状态栏 //////
control.prototype.clearStatusBar = function () {
+ if (main.mode === 'editor') return;
Object.keys(core.statusBar).forEach(function (e) {
if (core.statusBar[e].innerHTML != null) {
core.statusBar[e].innerHTML = ' ';
diff --git a/public/project/floors/MT20.js b/public/project/floors/MT20.js
index 15bc70a..a8442e5 100644
--- a/public/project/floors/MT20.js
+++ b/public/project/floors/MT20.js
@@ -32,6 +32,25 @@ main.floors.MT20=
],
"8,9": [
"千丈，勇气贯星海"
+ ],
+ "7,8": [
+ {
+ "type": "if",
+ "condition": "flag:boss1",
+ "true": [
+ "\t[智人]\b[up,hero]没必要再进去了"
+ ],
+ "false": [
+ {
+ "type": "changeFloor",
+ "floorId": "tower1",
+ "loc": [
+ 7,
+ 14
+ ]
+ }
+ ]
+ }
]
},
"changeFloor": {
@@ -41,13 +60,6 @@ main.floors.MT20=
7,
0
]
- },
- "7,8": {
- "floorId": "tower1",
- "loc": [
- 7,
- 14
- ]
}
},
"afterBattle": {},
diff --git a/public/project/floors/MT50.js b/public/project/floors/MT50.js
index d1716a4..fab539a 100644
--- a/public/project/floors/MT50.js
+++ b/public/project/floors/MT50.js
@@ -37,20 +37,14 @@ main.floors.MT50=
],
"5,13": [
"欢迎来到苍蓝之殿，这是本塔第二章里面最大的一个区，也是最复杂的一个区。整个苍蓝之殿分为无个部分：左下角、右下角、左上角、右上角和中心，每个部分都有不一样的玩法，多多动脑哦。",
- "本区域极大，建议打开小地图游玩。如果打开小地图后打怪出现卡顿，可以尝试在 设置->ui设置 里面打开小地图懒更新设置",
- "此区域建议多多使用定点查看功能，鼠标移动到怪物上按C或E即可打开（如果你没有设置自己的快捷键的话）。手机端暂时无法定点查看"
- ],
- "9,13": [
"在你刚进入苍蓝之殿时，你只能先前往左下角部分（本地图的左面），右下角暂时不能前往。注意往上走往左依然可以进入左下角，不要只盯着这个地图的左边不放。",
- "注意火炬可通行，而且跳跃时会跳过火炬，不会跳到火炬上。以及由于不可抗力，修改游戏缩放后需要刷新页面才能使光照正常。"
- ],
- "9,1": [
+ "本区域极大，建议打开小地图游玩。如果打开小地图后打怪出现卡顿，可以尝试在 设置->ui设置 里面打开小地图懒更新设置",
+ "此区域建议多多使用定点查看功能，鼠标移动到怪物上按C或E即可打开（如果你没有设置自己的快捷键的话）。手机端暂时无法定点查看",
+ "打完左下角和右下角的boss之后，开四个机关门",
+ "注意不要忘记购买装备，到了下一章之后本章的商店将不能到达，快捷商店也会消失。这些装备在下一章都会有向上合成",
"建议优先点出学习技能，对于特定场景将会非常有帮助",
"本区域可以使用跳跃技能，不要忘记了。",
- "注意不要忘记购买装备，到了下一章之后本章的商店将不能到达，快捷商店也会消失。这些装备在下一章都会有向上合成"
- ],
- "5,1": [
- "打完左下角和右下角的boss之后，开四个机关门"
+ "注意火炬可通行，而且跳跃时会跳过火炬，不会跳到火炬上。以及由于不可抗力，修改游戏缩放后需要刷新页面才能使光照正常。"
]
},
"changeFloor": {
@@ -85,7 +79,7 @@ main.floors.MT50=
"cannotMoveIn": {},
"map": [
[648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
- [648, 27, 0, 28, 0,129, 0, 0, 0,129, 0, 28, 0, 27,648],
+ [648, 27, 0, 28, 0,648, 0, 0, 0,648, 0, 28, 0, 27,648],
[648, 0,381, 0,482,648, 0, 0, 0,648,482, 0,381, 0,648],
[648, 28, 0, 27, 0,648, 0, 0, 0,648, 0, 27, 0, 28,648],
[648, 0,482, 0,103,648, 0, 0, 0,648,103, 0,482, 0,648],
@@ -97,7 +91,7 @@ main.floors.MT50=
[648, 0,482, 0,103,648, 0, 0, 0,648,103, 0,482, 0,648],
[648, 28, 0, 27, 0,648, 0, 0, 0,648, 0, 27, 0, 28,648],
[648, 0,381, 0,482,648, 0, 0, 0,648,482, 0,381, 0,648],
- [648, 27, 0, 28, 0,129, 0, 0, 0,129, 0, 28, 0, 27,648],
+ [648, 27, 0, 28, 0,129, 92, 0, 0,648, 0, 28, 0, 27,648],
[648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
],
"bgmap": [
diff --git a/public/project/floors/MT72.js b/public/project/floors/MT72.js
index 553b6ae..273c0af 100644
--- a/public/project/floors/MT72.js
+++ b/public/project/floors/MT72.js
@@ -16,7 +16,11 @@ main.floors.MT72=
"firstArrive": [],
"eachArrive": [],
"parallelDo": "",
- "events": {},
+ "events": {
+ "4,10": [
+ "打败四个区域的boss后开机关门"
+ ]
+ },
"changeFloor": {
"7,14": {
"floorId": "MT61",
@@ -24,6 +28,13 @@ main.floors.MT72=
7,
0
]
+ },
+ "7,0": {
+ "floorId": "MT73",
+ "loc": [
+ 7,
+ 14
+ ]
}
},
"beforeBattle": {},
@@ -44,7 +55,7 @@ main.floors.MT72=
[648, 0,103, 0, 85, 0, 0, 87, 0, 0, 85, 0,103, 0,648],
[648, 0, 0, 0,648, 0, 0, 0, 0, 0,648, 0, 0, 0,648],
[648, 0, 0, 0,648, 0, 0, 0, 0, 0,648, 0, 0, 0,648],
- [648, 0, 0, 0,648,648,648, 85,648,648,648, 0, 0, 0,648],
+ [648, 0, 0, 0,129,648,648, 85,648,648,648, 0, 0, 0,648],
[648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,648],
[648, 0,487, 0, 0, 0, 0,103, 0, 0, 0, 0,487, 0,648],
[648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,648],
diff --git a/public/project/floors/MT73.js b/public/project/floors/MT73.js
index 3ed497a..678fbdf 100644
--- a/public/project/floors/MT73.js
+++ b/public/project/floors/MT73.js
@@ -1,45 +1,84 @@
main.floors.MT73=
{
-"floorId": "MT73",
-"title": "苍蓝之殿-中",
-"name": "73",
-"width": 15,
-"height": 15,
-"canFlyTo": true,
-"canFlyFrom": true,
-"canUseQuickShop": true,
-"cannotViewMap": false,
-"images": [],
-"ratio": 8,
-"defaultGround": "T650",
-"bgm": "palaceNorth.mp3",
-"firstArrive": [],
-"eachArrive": [],
-"parallelDo": "",
-"events": {},
-"changeFloor": {},
-"beforeBattle": {},
-"afterBattle": {},
-"afterGetItem": {},
-"afterOpenDoor": {},
-"autoEvent": {},
-"cannotMove": {},
-"cannotMoveIn": {},
-"map": [
- [ 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],
+ "floorId": "MT73",
+ "title": "苍蓝之殿-中",
+ "name": "73",
+ "width": 15,
+ "height": 15,
+ "canFlyTo": true,
+ "canFlyFrom": true,
+ "canUseQuickShop": true,
+ "cannotViewMap": false,
+ "images": [],
+ "ratio": 8,
+ "defaultGround": "T650",
+ "bgm": "palaceNorth.mp3",
+ "firstArrive": [],
+ "eachArrive": [],
+ "parallelDo": "",
+ "events": {
+ "6,12": [
+ "这里是苍蓝之殿的上方两区域，两区域都可以去，不再像下方一样需要打开开关另一个区域才会开。",
+ "这里打完之后就可以到第二章的最终区域了，最终区域在苍蓝之殿的正中心，也就是这里向下走一个地图。"
+ ]
+ },
+ "changeFloor": {
+ "7,14": {
+ "floorId": "MT72",
+ "loc": [
+ 7,
+ 0
+ ]
+ }
+ },
+ "beforeBattle": {},
+ "afterBattle": {},
+ "afterGetItem": {},
+ "afterOpenDoor": {},
+ "autoEvent": {},
+ "cannotMove": {},
+ "cannotMoveIn": {},
+ "map": [
+ [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
+ [648,494,482,482,492,484,492, 0,492,484,492,482,482,494,648],
+ [648,491,648,648,648,648,648, 0,648,648,648,648,648,491,648],
+ [648,497,648, 0, 0, 0, 0, 0, 0, 0, 0, 0,648,497,648],
+ [648,487,648, 0, 0, 0, 0, 0, 0, 0, 0, 0,648,487,648],
+ [648,487,648, 0, 0,103, 0, 0, 0,103, 0, 0,648,487,648],
+ [648,648,648, 0, 0, 0, 0, 0, 0, 0, 0, 0,648,648,648],
+ [ 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94],
+ [648,648,648, 0, 0, 0, 0, 0, 0, 0, 0, 0,648,648,648],
+ [648,487,648, 0, 0,103, 0, 0, 0,103, 0, 0,648,487,648],
+ [648,487,648, 0, 0, 0, 0, 0, 0, 0, 0, 0,648,487,648],
+ [648,497,648, 0, 0, 0, 0, 0, 0, 0, 0, 0,648,497,648],
+ [648,491,648,648,648,648,129, 0,648,648,648,648,648,491,648],
+ [648,494,482,482,492,484,492, 0,492,484,492,482,482,494,648],
+ [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
+],
+ "bgmap": [
[ 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,50448,50449,50450,50451,50452, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0,50456,50457,50458,50459,50460, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0,50464,50465,50466,50467,50468, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0,50472,50473,50474,50475,50476, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0,50480,50481,50482,50483,50484, 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": [
+
+]
}
\ No newline at end of file
diff --git a/public/project/floors/MT74.js b/public/project/floors/MT74.js
index 74410fc..7b896fe 100644
--- a/public/project/floors/MT74.js
+++ b/public/project/floors/MT74.js
@@ -1,40 +1,57 @@
main.floors.MT74=
{
-"floorId": "MT74",
-"title": "苍蓝之殿-中",
-"name": "74",
-"width": 15,
-"height": 15,
-"canFlyTo": true,
-"canFlyFrom": true,
-"canUseQuickShop": true,
-"cannotViewMap": false,
-"images": [],
-"ratio": 8,
-"defaultGround": "T650",
-"bgm": "palaceNorth.mp3",
-"firstArrive": [],
-"eachArrive": [],
-"parallelDo": "",
-"events": {},
-"changeFloor": {},
-"beforeBattle": {},
-"afterBattle": {},
-"afterGetItem": {},
-"afterOpenDoor": {},
-"autoEvent": {},
-"cannotMove": {},
-"cannotMoveIn": {},
-"map": [
- [ 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],
+ "floorId": "MT74",
+ "title": "苍蓝之殿-中",
+ "name": "74",
+ "width": 15,
+ "height": 15,
+ "canFlyTo": true,
+ "canFlyFrom": true,
+ "canUseQuickShop": true,
+ "cannotViewMap": false,
+ "images": [],
+ "ratio": 8,
+ "defaultGround": "T650",
+ "bgm": "palaceNorth.mp3",
+ "firstArrive": [],
+ "eachArrive": [],
+ "parallelDo": "",
+ "events": {},
+ "changeFloor": {},
+ "beforeBattle": {},
+ "afterBattle": {},
+ "afterGetItem": {},
+ "afterOpenDoor": {},
+ "autoEvent": {},
+ "cannotMove": {},
+ "cannotMoveIn": {},
+ "map": [
+ [ 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,103, 0, 0, 0,103, 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,103, 0, 0, 0,103, 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]
+],
+ "bgmap": [
[ 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,50400,50401,50402, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0, 0,50408,50409,50410, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0, 0,50416,50417,50418, 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],
@@ -42,4 +59,13 @@ main.floors.MT74=
[ 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": [
+
+]
}
\ No newline at end of file
diff --git a/public/project/floors/MT75.js b/public/project/floors/MT75.js
index c7a719f..423cf71 100644
--- a/public/project/floors/MT75.js
+++ b/public/project/floors/MT75.js
@@ -1,31 +1,31 @@
main.floors.MT75=
{
-"floorId": "MT75",
-"title": "苍蓝之殿-中",
-"name": "75",
-"width": 15,
-"height": 15,
-"canFlyTo": true,
-"canFlyFrom": true,
-"canUseQuickShop": true,
-"cannotViewMap": false,
-"images": [],
-"ratio": 8,
-"defaultGround": "T650",
-"bgm": "palaceNorth.mp3",
-"firstArrive": [],
-"eachArrive": [],
-"parallelDo": "",
-"events": {},
-"changeFloor": {},
-"beforeBattle": {},
-"afterBattle": {},
-"afterGetItem": {},
-"afterOpenDoor": {},
-"autoEvent": {},
-"cannotMove": {},
-"cannotMoveIn": {},
-"map": [
+ "floorId": "MT75",
+ "title": "苍蓝之殿-中",
+ "name": "75",
+ "width": 15,
+ "height": 15,
+ "canFlyTo": true,
+ "canFlyFrom": true,
+ "canUseQuickShop": true,
+ "cannotViewMap": false,
+ "images": [],
+ "ratio": 8,
+ "defaultGround": "T650",
+ "bgm": "palaceNorth.mp3",
+ "firstArrive": [],
+ "eachArrive": [],
+ "parallelDo": "",
+ "events": {},
+ "changeFloor": {},
+ "beforeBattle": {},
+ "afterBattle": {},
+ "afterGetItem": {},
+ "afterOpenDoor": {},
+ "autoEvent": {},
+ "cannotMove": {},
+ "cannotMoveIn": {},
+ "map": [
[ 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],
@@ -42,4 +42,30 @@ main.floors.MT75=
[ 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]
],
+ "bgmap": [
+ [ 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,50403,50404,50405, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0, 0,50411,50412,50413, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0, 0,50419,50420,50421, 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": [
+
+]
}
\ No newline at end of file
diff --git a/src/core/main/custom/toolbar.ts b/src/core/main/custom/toolbar.ts
index 502d7ab..14ac0e9 100644
--- a/src/core/main/custom/toolbar.ts
+++ b/src/core/main/custom/toolbar.ts
@@ -400,15 +400,15 @@ Mota.require('var', 'hook').once('reset', () => {
'fly',
'save',
'load',
- 'undo',
- 'redo',
- 'danmaku',
- 'minimap',
'toolbox',
'equipbox',
'shop',
'virtualKey',
- 'setting'
+ 'setting',
+ 'undo',
+ 'redo',
+ 'danmaku',
+ 'minimap'
]
});
// 计算位置
diff --git a/src/core/main/init/hotkey.ts b/src/core/main/init/hotkey.ts
index 584f2fe..07b5735 100644
--- a/src/core/main/init/hotkey.ts
+++ b/src/core/main/init/hotkey.ts
@@ -537,6 +537,7 @@ gameKey
core.playSound('光标移动');
if (flags.blade) flags.blade = false;
else flags.blade = true;
+ core.status.route.push('skill:1');
core.updateStatusBar();
})
.realize('skill2', () => {
@@ -546,6 +547,7 @@ gameKey
flags.skill2
) {
Mota.Plugin.require('skill_g').jumpSkill();
+ core.status.route.push('skill:2');
} else {
if (core.hasItem('pickaxe')) {
core.useItem('pickaxe');
@@ -561,6 +563,7 @@ gameKey
core.playSound('光标移动');
if (flags.shield) flags.shield = false;
else flags.shield = true;
+ core.status.route.push('skill:3');
core.updateStatusBar();
})
.realize('debug', () => {
diff --git a/src/core/main/init/toolbar.tsx b/src/core/main/init/toolbar.tsx
index ded4867..31047ff 100644
--- a/src/core/main/init/toolbar.tsx
+++ b/src/core/main/init/toolbar.tsx
@@ -5,8 +5,7 @@ import { checkAssist, unwarpBinary } from '../custom/hotkey';
import {
flipBinary,
getVitualKeyOnce,
- openDanmakuPoster,
- parseCss
+ openDanmakuPoster
} from '@/plugin/utils';
import { cloneDeep } from 'lodash-es';
import {
@@ -22,7 +21,15 @@ import { gameKey } from './hotkey';
import { FunctionalComponent, StyleValue, h } from 'vue';
import { mainUi } from './ui';
import { isMobile } from '@/plugin/use';
-import { EllipsisOutlined } from '@ant-design/icons-vue';
+import {
+ BackwardOutlined,
+ EllipsisOutlined,
+ FolderOpenOutlined,
+ LayoutOutlined,
+ MessageOutlined,
+ SwapOutlined
+} from '@ant-design/icons-vue';
+import { generateKeyboardEvent } from '../custom/keyboard';
// todo: 新增更改设置的ToolItem
@@ -267,7 +274,7 @@ function MiscTool(props: CustomToolbarProps<'misc'>) {
onClick={triggerFold}
style={toolStyle}
>
- 折叠
+
{item.items.map(v => {
const info = CustomToolbar.misc.info[v];
@@ -754,7 +761,7 @@ Mota.require('var', 'hook').once('reset', () => {
'danmaku',
'发弹幕',
openDanmakuPoster,
- h('span', '发弹幕')
+ h(MessageOutlined)
);
CustomToolbar.misc.register(
'book',
@@ -816,7 +823,14 @@ Mota.require('var', 'hook').once('reset', () => {
'virtualKey',
'虚拟键盘',
() => {
- getVitualKeyOnce();
+ getVitualKeyOnce().then(value => {
+ gameKey.emitKey(
+ value.key,
+ value.assist,
+ 'up',
+ generateKeyboardEvent(value.key, value.assist)
+ );
+ });
},
{
() => {
core.doSL('autoSave', 'load');
},
- h('span', '回退')
+ h(BackwardOutlined)
);
CustomToolbar.misc.register(
'redo',
@@ -882,7 +896,7 @@ Mota.require('var', 'hook').once('reset', () => {
() => {
core.doSL('autoSave', 'reload');
},
- h('span', '恢复')
+ h(SwapOutlined)
);
CustomToolbar.misc.register(
'setting',
@@ -940,7 +954,7 @@ Mota.require('var', 'hook').once('reset', () => {
}
tool.refresh();
},
- h('span', '小地图')
+ h(LayoutOutlined)
);
// CustomToolbar.misc.register(
// 'drag',