完善装备栏和道具栏

src/ui/equipbox.vue

@@ -4,7 +4,9 @@
             <span class="button-text tools" @click="exit"
                 ><left-outlined /> 返回游戏</span
             >
-            <span class="button-text tools">道具栏 <right-outlined /></span>
+            <span class="button-text tools" @click="toTool"
+                >道具栏 <right-outlined
+            /></span>
         </div>
         <div id="equipbox-main">
             <div id="equip-list">
@@ -69,8 +71,9 @@
                 <div id="equip-status-main">
                     <div id="equip-now">
                         <Scroll
-                            style="width: 100%; height: 30vh"
+                            :style="{
-                            :type="isMobile ? 'horizontal' : 'vertical'"
+                                height: isMobile ? '10vh' : '30vh'
+                            }"
                         >
                             <div id="equip-now-div" @touchmove="dragout">
                                 <div
@@ -80,7 +83,6 @@
                                     :access="canDragin(i)"
                                     :selected="isCol && selected === i"
                                     @mouseenter="dragin($event, i)"
-                                    @touchmove="dragin($event, i)"
                                     @mouseleave="dragout"
                                     @click="select(i, true)"
                                 >
@@ -183,7 +185,7 @@ import { getAddStatus, getEquips, getNowStatus } from '../plugin/ui/equipbox';
 import BoxAnimate from '../components/boxAnimate.vue';
 import { has, type } from '../plugin/utils';
 import { cancelGlobalDrag, isMobile, useDrag } from '../plugin/use';
-import { hyper } from 'mutate-animate';
+import { hyper, sleep } from 'mutate-animate';
 import { message } from 'ant-design-vue';
 
 const equips = ref(getEquips());
@@ -392,7 +394,6 @@ function bind() {
             if (draged.value) {
                 draged.value = false;
                 loadEquip();
-                console.log(toEquipType.value);
             }
         },
         true
@@ -422,6 +423,15 @@ function dragout(e: Event) {
     toEquipType.value = -1;
 }
 
+async function toTool() {
+    const before = core.plugin.transition.value;
+    core.plugin.transition.value = false;
+    exit();
+    await sleep(50);
+    core.plugin.toolOpened.value = true;
+    core.plugin.transition.value = before;
+}
+
 watch(toShow, n => {
     bind();
 });
@@ -672,12 +682,25 @@ onUnmounted(() => {
     }
 
     #equipbox-main {
-        height: 100%;
+        height: 90vh;
         flex-direction: column-reverse;
     }
 
     #equip-now-div {
         flex-wrap: nowrap;
     }
+
+    #equip-status {
+        flex-direction: column;
+        flex-basis: auto;
+    }
+
+    #equip-list {
+        flex-basis: 50%;
+    }
+
+    .divider {
+        margin: 1% 0 1% 0;
+    }
 }
 </style>

src/ui/toolbox.vue

@@ -4,7 +4,7 @@
             <span class="button-text tools" @click="exit"
                 ><left-outlined /> 返回游戏</span
             >
-            <span class="button-text tools" @click="exit"
+            <span class="button-text tools" @click="toEquip"
                 >装备栏 <right-outlined
             /></span>
         </div>
@@ -173,11 +173,12 @@ async function use(id: ShowItemIds) {
     if (id === 'none') return;
     if (core.canUseItem(id)) {
         // 应该暂时把动画去掉
+        const before = core.plugin.transition.value;
         core.plugin.transition.value = false;
         exit();
         await sleep(50);
         core.useItem(id);
-        core.plugin.transition.value = true;
+        core.plugin.transition.value = before;
     } else {
         message.warn({
             content: '当前无法使用该道具！',
@@ -186,6 +187,15 @@ async function use(id: ShowItemIds) {
     }
 }
 
+async function toEquip() {
+    const before = core.plugin.transition.value;
+    core.plugin.transition.value = false;
+    exit();
+    await sleep(50);
+    core.plugin.equipOpened.value = true;
+    core.plugin.transition.value = before;
+}
+
 function keyup(e: KeyboardEvent) {
     const c = keycode(e.keyCode);
     if (c === KeyCode.Escape || c === KeyCode.KeyX) {