From 669ad11c8213a0d1e485ca2342aac592c951a45b Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sun, 29 Oct 2023 22:13:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E7=9A=84ui=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/libs/control.js     |  4 +-
 public/libs/events.js      |  2 +-
 src/App.vue                | 89 ++++++++++++++++++++++++++++++++++++--
 src/App2.vue               |  8 ++--
 src/core/main/custom/ui.ts | 17 ++++++++
 src/core/main/game.ts      |  3 ++
 src/core/main/init/ui.ts   | 38 ++++++++++++++--
 src/main.ts                |  2 +-
 src/plugin/uiController.ts | 58 ++++++++++++-------------
 src/styles.less            | 20 +++------
 10 files changed, 182 insertions(+), 59 deletions(-)

diff --git a/public/libs/control.js b/public/libs/control.js
index 02cca5c..6e4f8e3 100644
--- a/public/libs/control.js
+++ b/public/libs/control.js
@@ -2317,7 +2317,7 @@ control.prototype._doSL_load = function (id, callback) {
             1
         )[0];
         if (!main.replayChecking) {
-            mota.plugin.ui.startOpened.value = false;
+            mota.ui.fixed.open('start');
         }
         if (core.isPlaying() && !core.status.gameOver) {
             core.control.autosave(0);
@@ -2334,7 +2334,7 @@ control.prototype._doSL_load = function (id, callback) {
             null,
             function (data) {
                 if (!main.replayChecking && data) {
-                    mota.plugin.ui.startOpened.value = false;
+                    mota.ui.fixed.closeByName('start');
                 }
                 if (id == 'autoSave' && data != null) {
                     core.saves.autosave.data = data;
diff --git a/public/libs/events.js b/public/libs/events.js
index 0299ef7..ca0051f 100644
--- a/public/libs/events.js
+++ b/public/libs/events.js
@@ -26,7 +26,7 @@ events.prototype.startGame = function (hard, seed, route, callback) {
     hard = hard || '';
     core.dom.gameGroup.style.display = 'block';
     if (!main.replayChecking) {
-        mota.plugin.ui.startOpened.value = false;
+        mota.ui.fixed.closeByName('start');
     }
 
     if (main.mode != 'play') return;
diff --git a/src/App.vue b/src/App.vue
index 7644a4c..3f5213a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,14 +1,43 @@
 <template>
-    <div id="ui">
+    <!-- <div id="ui">
         <template v-for="com of uiStack">
             <component :is="com"></component>
         </template>
+    </div> -->
+    <div id="ui-new">
+        <div id="ui-main">
+            <div id="ui-list">
+                <div class="ui-one" v-for="ui of mainUi.stack">
+                    <template>
+                        <component
+                            :is="ui.ui.component"
+                            v-on="ui.vOn ?? {}"
+                            v-bind="ui.vBind ?? {}"
+                        ></component>
+                    </template>
+                </div>
+            </div>
+        </div>
+        <div id="ui-fixed">
+            <template v-for="ui of fixedUi.stack">
+                <component
+                    :is="ui.ui.component"
+                    v-on="ui.vOn ?? {}"
+                    v-bind="ui.vBind ?? {}"
+                ></component>
+            </template>
+        </div>
     </div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import { uiStack } from './plugin/uiController';
+import { onMounted } from 'vue';
+import { mainUi, fixedUi } from './core/main/init/ui';
+import { hook } from '@/core/main/game';
+
+onMounted(() => {
+    hook.emit('mounted');
+});
 </script>
 
 <style lang="less" scoped>
@@ -20,10 +49,64 @@ import { uiStack } from './plugin/uiController';
     overflow: hidden;
 }
 
+#ui-new {
+    width: 0;
+    height: 0;
+    left: 0;
+    top: 0;
+    position: fixed;
+    overflow: visible;
+    display: block;
+}
+
+#ui-main {
+    width: 100vw;
+    height: 100vh;
+    display: none;
+    justify-content: center;
+    left: 0;
+    top: 0;
+    position: fixed;
+}
+
+#ui-list {
+    width: 90%;
+    height: 90%;
+    overflow: hidden;
+    position: relative;
+    left: 0;
+    top: 0;
+}
+
+.ui-one {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    display: flex;
+    justify-content: center;
+}
+
+#ui-fixed {
+    position: fixed;
+    width: 0;
+    height: 0;
+    overflow: visible;
+    left: 0;
+    top: 0;
+    display: none;
+}
+
 @media screen and (max-width: 600px) {
     #ui {
         width: 100%;
         height: 100%;
     }
+
+    #ui-list {
+        width: 100%;
+        height: 100%;
+    }
 }
 </style>
diff --git a/src/App2.vue b/src/App2.vue
index b47bcc1..094e64e 100644
--- a/src/App2.vue
+++ b/src/App2.vue
@@ -1,18 +1,18 @@
 <template>
-    <div id="non-ui">
+    <!-- <div id="non-ui">
         <Start v-if="startOpened"></Start>
         <StatusBar v-if="showStatusBar"></StatusBar>
         <MarkedEnemy v-if="showMarkedEnemy && showStatusBar"></MarkedEnemy>
-        <!-- <Studied
+        <Studied
             v-if="showStudiedSkill && showStatusBar && showStudied"
-        ></Studied> -->
+        ></Studied> 
         <Fixed v-if="showStatusBar && useFixed"></Fixed>
         <Chapter v-if="chapterShowed" :chapter="chapterContent"></Chapter>
         <CompleteAchievement
             v-if="showComplete"
             :complete="completeAchi"
         ></CompleteAchievement>
-    </div>
+    </div> -->
 </template>
 
 <script lang="ts" setup>
diff --git a/src/core/main/custom/ui.ts b/src/core/main/custom/ui.ts
index aa3037a..f7f3394 100644
--- a/src/core/main/custom/ui.ts
+++ b/src/core/main/custom/ui.ts
@@ -217,6 +217,23 @@ export class UiController extends Focus<IndexedGameUi> {
         this.spliceIndex(ui);
     }
 
+    /**
+     * 根据id关闭所有同id的ui，注意非平等模式下，会将第一个ui后的所有ui都关闭掉
+     * @param id 要关闭的ui的id
+     */
+    closeByName(id: string) {
+        console.log(id);
+        if (!this.equal) {
+            const ui = this.stack.findIndex(v => v.ui.id === id);
+            this.spliceIndex(ui);
+        } else {
+            let ui;
+            while ((ui = this.stack.findIndex(v => v.ui.id === id)) !== -1) {
+                this.spliceIndex(ui);
+            }
+        }
+    }
+
     /**
      * 打开一个新的ui
      * @param id 要打开的ui的id
diff --git a/src/core/main/game.ts b/src/core/main/game.ts
index af0b091..fc074e5 100644
--- a/src/core/main/game.ts
+++ b/src/core/main/game.ts
@@ -1,7 +1,10 @@
 import { EmitableEvent, EventEmitter } from '../common/eventEmitter';
 
 export interface GameEvent extends EmitableEvent {
+    /** Emitted in events.prototype.resetGame. */
     reset: () => void;
+    /** Emitted in src/App.vue setup. */
+    mounted: () => void;
 }
 
 export const hook = new EventEmitter<GameEvent>();
diff --git a/src/core/main/init/ui.ts b/src/core/main/init/ui.ts
index bdebcff..da68b95 100644
--- a/src/core/main/init/ui.ts
+++ b/src/core/main/init/ui.ts
@@ -19,6 +19,7 @@ import Start from '@ui/start.vue';
 import { GameUi, UiController } from '../custom/ui';
 import { Hotkey } from '../custom/hotkey';
 import { KeyCode } from '@/plugin/keyCodes';
+import { hook } from '../game';
 
 export const exitKey = new Hotkey('exitKey');
 exitKey
@@ -48,8 +49,7 @@ mainUi.register(
     new GameUi('fixedDetail', FixedDetail, exitKey),
     new GameUi('shop', Shop, exitKey),
     new GameUi('achievement', Achievement, exitKey),
-    new GameUi('bgm', Bgm, exitKey),
-    new GameUi('start', Start)
+    new GameUi('bgm', Bgm, exitKey)
     // todo: 把游戏主 div 加入到 mainUi 里面
 );
 
@@ -59,7 +59,37 @@ fixedUi.register(
     new GameUi('markedEnemy', Mark),
     new GameUi('fixed', Fixed),
     new GameUi('chapter', Chapter),
-    new GameUi('completeAchi', CompleteAchi)
+    new GameUi('completeAchi', CompleteAchi),
+    new GameUi('start', Start)
 );
 
-mainUi.focusByNum(mainUi.open('start'));
+hook.once('mounted', () => {
+    mainUi.on('start', () => {
+        const ui = document.getElementById('ui-main');
+        if (ui) {
+            ui.style.display = 'flex';
+        }
+    });
+    mainUi.on('end', () => {
+        const ui = document.getElementById('ui-main');
+        if (ui) {
+            ui.style.display = 'none';
+        }
+    });
+    fixedUi.on('start', () => {
+        console.log(1);
+        const ui = document.getElementById('ui-fixed');
+        if (ui) {
+            ui.style.display = 'block';
+        }
+    });
+    fixedUi.on('end', () => {
+        console.log(1);
+        const ui = document.getElementById('ui-fixed');
+        if (ui) {
+            ui.style.display = 'none';
+        }
+    });
+
+    mainUi.focusByNum(fixedUi.open('start'));
+});
diff --git a/src/main.ts b/src/main.ts
index e58bedd..f008abf 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,7 +6,7 @@ import 'ant-design-vue/dist/antd.dark.css';
 import './core/index';
 
 createApp(App).mount('#root');
-createApp(App2).mount('#root2');
+// createApp(App2).mount('#root2');
 
 main.init('play');
 main.listen();
diff --git a/src/plugin/uiController.ts b/src/plugin/uiController.ts
index 9472ad8..8896c2c 100644
--- a/src/plugin/uiController.ts
+++ b/src/plugin/uiController.ts
@@ -40,41 +40,41 @@ let app: HTMLDivElement;
 
 /** ui声明列表 */
 const UI_LIST: [Ref<boolean>, Component][] = [
-    [bookOpened, Book],
-    [toolOpened, Toolbox],
-    [equipOpened, Equipbox],
-    [settingsOpened, Settings],
-    [descOpened, Desc],
-    [skillOpened, Skill],
-    [skillTreeOpened, SkillTree],
-    [flyOpened, Fly],
-    [fixedDetailOpened, FixedDetail],
-    [shopOpened, Shop],
-    [achievementOpened, Achievement],
-    [bgmOpened, Bgm]
+    // [bookOpened, Book],
+    // [toolOpened, Toolbox],
+    // [equipOpened, Equipbox],
+    // [settingsOpened, Settings],
+    // [descOpened, Desc],
+    // [skillOpened, Skill],
+    // [skillTreeOpened, SkillTree],
+    // [flyOpened, Fly],
+    // [fixedDetailOpened, FixedDetail],
+    // [shopOpened, Shop],
+    // [achievementOpened, Achievement],
+    // [bgmOpened, Bgm]
 ];
 
 /** ui栈 */
 export const uiStack = shallowReactive<Component[]>([]);
 
 export default function init() {
-    app = document.getElementById('root') as HTMLDivElement;
-    UI_LIST.forEach(([ref, com]) => {
-        watch(ref, n => {
-            if (n === true) {
-                uiStack.push(markRaw(com));
-                showApp();
-            } else {
-                const index = uiStack.findIndex(v => v === com);
-                if (index === -1) return;
-                if (uiStack.length === 1) {
-                    hideApp(index);
-                } else {
-                    uiStack.splice(index, 1);
-                }
-            }
-        });
-    });
+    // app = document.getElementById('root') as HTMLDivElement;
+    // UI_LIST.forEach(([ref, com]) => {
+    //     watch(ref, n => {
+    //         if (n === true) {
+    //             uiStack.push(markRaw(com));
+    //             showApp();
+    //         } else {
+    //             const index = uiStack.findIndex(v => v === com);
+    //             if (index === -1) return;
+    //             if (uiStack.length === 1) {
+    //                 hideApp(index);
+    //             } else {
+    //                 uiStack.splice(index, 1);
+    //             }
+    //         }
+    //     });
+    // });
     return {
         uiStack,
         transition,
diff --git a/src/styles.less b/src/styles.less
index 2eb8437..a4d52fa 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -1,22 +1,12 @@
 // 部分全局css特效
 
 #root {
-    position: absolute;
-    display: none;
-    width: 100%;
-    height: 100%;
+    position: fixed;
+    display: block;
+    width: 0;
+    height: 0;
     z-index: 1000;
-    justify-content: center;
-    align-items: center;
-    overflow: hidden;
-    transition: all 0.6s linear;
-    opacity: 0;
-    background-color: #000d;
-    font-size: 16px;
-    backdrop-filter: blur(2px) grayscale(50%);
-}
-
-#root2 {
+    overflow: visible;
     font-size: 16px;
 }