refactor: rename append to appendTo

packages-user/client-modules/src/action/hotkey.ts

@@ -1,18 +1,16 @@
 import { KeyCode } from '@motajs/client-base';
 import { gameKey, HotkeyJSON } from '@motajs/system-action';
-import { hovered } from './fixed';
+import { hovered, mainUi, tip, openDanmakuPoster } from '@motajs/legacy-ui';
-import { mainUi } from './uiIns';
 import { GameStorage } from '@motajs/legacy-system';
-// import { hasMarkedEnemy, markEnemy, unmarkEnemy } from '../mark';
+import { openStatistics } from '../render/ui/statistics';
-import { openDanmakuPoster } from '../uiUtils';
+import { mainUIController } from '../render';
-import { tip } from '../use';
 
 export const mainScope = Symbol.for('@key_main');
 
 // todo: 读取上一个手动存档，存档至下一个存档栏
 // ----- Register
 gameKey
-    // --------------------
+    //#region 游戏按键
     .group('game', '游戏按键')
     .register({
         id: 'moveUp',
@@ -34,7 +32,7 @@ gameKey
         name: '右移',
         defaults: KeyCode.RightArrow
     })
-    // --------------------
+    //#region ui界面
     .group('ui', 'ui界面')
     .register({
         id: 'book',
@@ -106,7 +104,7 @@ gameKey
         name: '百科全书',
         defaults: KeyCode.KeyH
     })
-    // --------------------
+    //#region 功能按键
     .group('function', '功能按键')
     .register({
         id: 'undo_1',
@@ -224,7 +222,7 @@ gameKey
         defaults: KeyCode.Digit0,
         alt: true
     })
-    // --------------------
+    //#region 技能按键
     .group('skill', '技能按键')
     .register({
         id: 'skill1',
@@ -241,7 +239,7 @@ gameKey
         name: '铸剑为盾',
         defaults: KeyCode.Digit3
     })
-    // --------------------
+    //#region 系统按键
     .group('system', '系统按键')
     .register({
         id: 'restart',
@@ -258,7 +256,7 @@ gameKey
         name: '调试模式',
         defaults: KeyCode.F8
     })
-    // --------------------
+    //#region 通用按键
     .group('general', '通用按键')
     .register({
         id: 'exit_1',
@@ -285,7 +283,7 @@ gameKey
         name: '确认_3',
         defaults: KeyCode.KeyC
     })
-    // --------------------
+    //#region 开始界面
     .group('@ui_start', '开始界面')
     .register({
         id: '@start_up',
@@ -297,7 +295,7 @@ gameKey
         name: '下移光标',
         defaults: KeyCode.DownArrow
     })
-    // --------------------
+    //#region 怪物手册
     .group('@ui_book', '怪物手册')
     .register({
         id: '@book_up',
@@ -329,7 +327,7 @@ gameKey
         name: '上移5个怪物_2',
         defaults: KeyCode.PageUp
     })
-    // --------------------
+    //#region 道具栏
     .group('@ui_toolbox', '道具栏')
     .register({
         id: '@toolbox_right',
@@ -351,7 +349,7 @@ gameKey
         name: '光标下移',
         defaults: KeyCode.DownArrow
     })
-    // --------------------
+    //#region 商店
     .group('@ui_shop', '商店')
     .register({
         id: '@shop_up',
@@ -373,7 +371,7 @@ gameKey
         name: '减少购买量',
         defaults: KeyCode.LeftArrow
     })
-    // --------------------
+    //#region 楼层传送
     .group('@ui_fly', '楼层传送')
     .register({
         id: '@fly_left',
@@ -405,7 +403,7 @@ gameKey
         name: '下一张地图',
         defaults: KeyCode.PageUp
     })
-    // --------------------
+    //#region 传统楼传
     .group('@ui_fly_tradition', '楼层传送-传统按键')
     .register({
         id: '@fly_down_t',
@@ -441,7 +439,7 @@ gameKey
 gameKey.enable();
 gameKey.use(mainScope);
 
-// ----- Realization
+//#region 按键实现
 
 gameKey
     .when(
@@ -476,7 +474,7 @@ gameKey
         core.openQuickShop(true);
     })
     .realize('statistics', () => {
-        core.ui._drawStatistics();
+        openStatistics(mainUIController);
     })
     .realize('viewMap', () => {
         core.ui._drawViewMaps();

packages-user/client-modules/src/action/index.ts

@@ -1 +1,2 @@
 export * from './move';
+export * from './hotkey';

packages-user/client-modules/src/weather/rain.ts

@@ -120,7 +120,7 @@ export class RainWeather implements IWeather {
         const draw = render?.getElementById('map-draw') as Container;
         if (!draw) return;
         const shader = this.shader;
-        shader.append(draw);
+        shader.appendTo(draw);
 
         const gl = shader.gl;
         const program = this.program;

packages-user/client-modules/src/weather/snow.ts

@@ -146,7 +146,7 @@ export class SnowWeather implements IWeather {
         const draw = render?.getElementById('map-draw') as Container;
         if (!draw) return;
         const shader = SnowWeather.shader;
-        shader.append(draw);
+        shader.appendTo(draw);
 
         const gl = shader.gl;
         const program = SnowShader.snowProgram;
@@ -175,7 +175,7 @@ export class SnowWeather implements IWeather {
         const draw = render?.getElementById('map-draw') as Container;
         if (!layer || !draw) return;
         const shader = SnowWeather.shader;
-        layer.append(draw);
+        layer.appendTo(draw);
         shader.remove();
     }
 }

packages-user/legacy-plugin-client/src/boss/palaceBoss.ts

@@ -75,8 +75,8 @@ export class PalaceBoss extends BarrageBoss {
     override start(): void {
         super.start();
 
-        PalaceBoss.shader.append(this.mapDraw);
+        PalaceBoss.shader.appendTo(this.mapDraw);
-        this.main.append(this.group);
+        this.main.appendTo(this.group);
 
         // const event = this.group.getLayer('event');
         // const hero = event?.getExtends('floor-hero') as HeroRenderer;

packages-user/legacy-plugin-client/src/boss/towerBoss.ts

@@ -157,10 +157,10 @@ export class TowerBoss extends BarrageBoss {
     override start() {
         super.start();
 
-        TowerBoss.shader.append(this.mapDraw);
+        TowerBoss.shader.appendTo(this.mapDraw);
-        this.healthBar.append(this.group);
+        this.healthBar.appendTo(this.group);
-        this.word.append(this.group);
+        this.word.appendTo(this.group);
-        this.main.append(this.group);
+        this.main.appendTo(this.group);
 
         const event = this.group.getLayer('event');
         const hero = event?.getExtends('floor-hero') as HeroRenderer;

packages-user/legacy-plugin-client/src/chase/chase.ts

@@ -329,7 +329,7 @@ export class Chase extends EventEmitter<ChaseEvent> {
         this.onTimeListener.sort((a, b) => a.time - b.time);
         const render = MotaRenderer.get('render-main')!;
         const mapDraw = render.getElementById('map-draw') as Container;
-        Chase.shader.append(mapDraw);
+        Chase.shader.appendTo(mapDraw);
         this.emit('start');
     }
 

packages-user/legacy-plugin-client/src/chase/chase1.ts

@@ -333,7 +333,7 @@ function drawBack(chase: Chase, ani: Animation) {
         back.setZIndex(100);
         back.size(480, 480);
         back.pos(0, 0);
-        back.append(layer);
+        back.appendTo(layer);
         back.setRenderFn(canvas => {
             const ctx = canvas.ctx;
             ctx.fillStyle = '#000';

packages/render-core/src/container.ts

@@ -58,7 +58,7 @@ export class Container<E extends EContainerEvent = EContainerEvent>
      */
     appendChild(...children: RenderItem<any>[]) {
         children.forEach(v => {
-            v.append(this);
+            v.appendTo(this);
         });
         this.requestSort();
         this.update(this);
@@ -77,8 +77,8 @@ export class Container<E extends EContainerEvent = EContainerEvent>
         this.update(this);
     }
 
-    append(parent: RenderItem): void {
+    appendTo(parent: RenderItem): void {
-        super.append(parent);
+        super.appendTo(parent);
         if (this.root) {
             const root = this.root;
             this.forEachChild(ele => {

packages/render-core/src/item.ts

@@ -728,7 +728,7 @@ export abstract class RenderItem<E extends ERenderItemEvent = ERenderItemEvent>
      * 将这个渲染元素添加到其他父元素上
      * @param parent 父元素
      */
-    append(parent: RenderItem) {
+    appendTo(parent: RenderItem) {
         this.remove();
         parent.children.add(this);
         this._parent = parent;

packages/render-elements/src/layer.ts

@@ -1493,8 +1493,8 @@ export class Layer extends Container<ELayerEvent> {
         }
     }
 
-    append(parent: RenderItem): void {
+    appendTo(parent: RenderItem): void {
-        super.append(parent);
+        super.appendTo(parent);
         if (parent instanceof LayerGroup) {
             this.addToGroup(parent);
         }