Merge 2fed2b1d7e into 820dc5bf4c

packages-user/client-modules/src/render/components/textbox.tsx

@@ -21,6 +21,7 @@ import {
 } from 'vue';
 import { logger } from '@motajs/common';
 import { isNil } from 'lodash-es';
+import { SetupComponentOptions } from './types';
 import EventEmitter from 'eventemitter3';
 import {
     ITextContentConfig,
@@ -30,7 +31,6 @@ import {
     WordBreak,
     TextAlign
 } from './textboxTyper';
-import { SetupComponentOptions } from '@motajs/system-ui';
 
 export interface TextContentProps
     extends DefaultProps,

packages-user/client-modules/src/render/components/tip.tsx

@@ -1,11 +1,11 @@
 import { DefaultProps, ElementLocator, Font } from '@motajs/render';
 import { logger } from '@motajs/common';
 import { computed, defineComponent, onUnmounted, ref } from 'vue';
+import { SetupComponentOptions } from './types';
 import { transitioned } from '../use';
 import { hyper } from 'mutate-animate';
 import { debounce } from 'lodash-es';
 import { texture } from '../elements';
-import { SetupComponentOptions } from '@motajs/system-ui';
 
 export interface TipProps extends DefaultProps {
     loc: ElementLocator;

packages-user/client-modules/src/render/ui/settings.tsx

@@ -19,7 +19,6 @@ import { generateKeyboardEvent } from '@motajs/system-action';
 import { getVitualKeyOnce } from '@motajs/legacy-ui';
 import { getAllSavesData, getSaveData, syncFromServer } from '../../utils';
 import { getInput } from '../components/input';
-import { openStatistics } from './statistics';
 
 export interface SettingsProps extends Partial<ChoicesProps>, UIComponentProps {
     loc: ElementLocator;
@@ -212,7 +211,7 @@ export const GameInfo = defineComponent<SettingsProps>(props => {
     const choose = async (key: ChoiceKey) => {
         switch (key) {
             case GameInfoChoice.Statistics: {
-                openStatistics(props.controller);
+                // todo
                 break;
             }
             case GameInfoChoice.Project: {

packages-user/client-modules/src/render/ui/statusBar.tsx

@@ -1,6 +1,6 @@
-import { GameUI, SetupComponentOptions } from '@motajs/system-ui';
+import { GameUI } from '@motajs/system-ui';
 import { computed, defineComponent, ref, watch } from 'vue';
-import { TextContent } from '../components';
+import { SetupComponentOptions, TextContent } from '../components';
 import {
     DefaultProps,
     ElementLocator,

packages-user/client-modules/src/render/ui/toolbar.tsx

@@ -1,5 +1,6 @@
 import { DefaultProps, ElementLocator, Font } from '@motajs/render';
 import { computed, defineComponent, ref } from 'vue';
+import { SetupComponentOptions } from '../components';
 import {
     DanmakuIcon,
     DoubleArrow,
@@ -20,7 +21,6 @@ import { linear } from 'mutate-animate';
 import { KeyCode } from '@motajs/client-base';
 import { Progress } from '../components/misc';
 import { generateBinary } from '@motajs/legacy-common';
-import { SetupComponentOptions } from '@motajs/system-ui';
 
 interface ToolbarProps extends DefaultProps {
     loc?: ElementLocator;
@@ -82,7 +82,7 @@ export const PlayingToolbar = defineComponent<
     const iconFont = new Font('Verdana', 12);
 
     const book = () => core.openBook(true);
-    const tool = () => core.openToolbox(true);
+    const tool = () => core.openEquipbox(true);
     const fly = () => core.useFly(true);
     const save = () => core.save(true);
     const load = () => core.load(true);

packages-user/data-base/src/game.ts

@@ -74,9 +74,6 @@ let clientRegistered = false;
 let dataRegistered = false;
 
 function checkRegistered() {
-    if (main.replayChecking || main.mode === 'editor') {
-        clientRegistered = true;
-    }
     if (clientRegistered && dataRegistered) {
         loading.emit('registered');
     }

packages-user/entry-data/src/create.ts

@@ -18,5 +18,5 @@ export function create() {
 }
 
 function createModule() {
-    LegacyPluginData.createLegacy();
+    LegacyPluginData.create();
 }

packages-user/legacy-plugin-data/src/index.ts

@@ -5,7 +5,7 @@ import { createHook } from './hook';
 import { initReplay } from './replay';
 import { initUI } from './ui';
 
-export function createLegacy() {
+export function create() {
     initFallback();
     loading.once('coreInit', () => {
         initFiveLayer();

public/editor.html

@@ -384,10 +384,10 @@
                 </span>
                 <br />
                 <span style="font-size: 12px">
-                    <input type="radio" id="layerMod2" name="layerMod" value="bgmap" />背
+                    <input type="radio" id="layerMod2" name="layerMod" value="bgmap" />背景层
                     <input type="radio" id="layerMod" name="layerMod" value="map" checked="checked"
-                        style="margin-left: 5px" />事
+                        style="margin-left: 5px" />事件层
-                    <input type="radio" id="layerMod3" name="layerMod" value="fgmap" style="margin-left: 5px" />前
+                    <input type="radio" id="layerMod3" name="layerMod" value="fgmap" style="margin-left: 5px" />前景层
                 </span>
                 <br>
                 <div id="viewportButtons" style="margin-bottom: 7px">
@@ -512,7 +512,7 @@
             editor.mode_listen();
             editor.mobile_listen();
         });
-        //main.listen();
+    //main.listen();
     </script>
 
     <!-- hightlight textarea -->