packages-user/client-base/src/material/builder.ts

@@ -125,13 +125,12 @@ class TrackedAssetData
         }
         const origin = this.originSourceMap.get(index);
         const prev = this.sourceList.get(index);
-        if (origin && origin !== source) {
+        if (origin) {
             this.skipRef.delete(origin);
         }
         if (prev) {
             this.skipRef.delete(prev);
         }
-        this.originSourceMap.set(index, source);
         if (source instanceof ImageBitmap) {
             if (this.skipRef.has(source)) return;
             this.sourceList.set(index, source);
@@ -142,6 +141,7 @@ class TrackedAssetData
             this.skipRef.set(bitmap, index);
             // 要把源也加到映射中，因为这里的 bitmap 与外部源并不同引用
             this.skipRef.set(source, index);
+            this.originSourceMap.set(index, source);
         }
         this.dirty(index);
     }

packages-user/client-modules/src/render/commonIns.ts

@@ -5,4 +5,4 @@ import { materials } from '@user/client-base';
 /** 主地图渲染器，用于渲染游戏画面 */
 export const mainMapRenderer = new MapRenderer(materials, state.layer);
 /** 副地图渲染器，用于渲染缩略图、浏览地图等 */
-// export const expandMapRenderer = new MapRenderer(materials, state.layer);
+export const expandMapRenderer = new MapRenderer(materials, state.layer);

packages-user/client-modules/src/render/map/block.ts

@@ -158,7 +158,7 @@ export class BlockSplitter<T> implements IBlockSplitter<T> {
         const bx = Math.floor(x / this.blockWidth);
         const by = Math.floor(y / this.blockHeight);
         if (!this.checkLocRange(bx, by)) return null;
-        const index = by * this.width + bx;
+        const index = y * this.width + x;
         return this.blockMap.get(index) ?? null;
     }
 

packages-user/client-modules/src/render/map/renderer.ts

@@ -341,7 +341,6 @@ export class MapRenderer
     }
 
     setLayerState(layerState: ILayerState): void {
-        if (layerState === this.layerState) return;
         this.layerStateHook.unload();
         this.layerState = layerState;
         this.layerStateHook = layerState.addHook(
@@ -1231,12 +1230,8 @@ export class MapRenderer
 
         const area = this.viewport.getRenderArea();
         area.blockList.forEach(v => {
-            if (v.data.dirty) {
             this.vertex.updateBlockCache(v);
-            }
-            if (v.data.renderDirty) {
             v.data.render();
-            }
         });
 
         if (area.dirty.length > 0) {

packages-user/client-modules/src/render/map/vertex.ts

@@ -470,19 +470,17 @@ export class MapVertexGenerator
         if (!block) return;
         const vertex = block.data.getLayerData(layer);
         if (!vertex) return;
-        const bx = mx - block.dataX;
-        const by = my - block.dataY;
         const newIndex: BlockIndex = {
             layer,
             mapX: mx,
             mapY: my,
             mapIndex: my * this.mapWidth + mx,
-            blockX: bx,
+            blockX: block.x,
-            blockY: by,
+            blockY: block.y,
-            blockIndex: by * block.width + bx
+            blockIndex: block.y * block.width + block.x
         };
-        const tile = this.renderer.manager.getTile(mapArray[newIndex.mapIndex]);
+        const tile = this.renderer.manager.getTile(mapArray[index.mapIndex]);
-        if (!tile || tile.cls !== BlockCls.Autotile) return;
+        if (!tile) return;
         this.updateAutotile(
             mapArray,
             vertex,
@@ -592,7 +590,6 @@ export class MapVertexGenerator
             blockY: block.y,
             blockIndex: dIndex
         };
-
         // 需要检查周围一圈的自动元件
         this.checkAutotileConnectionAround(layer, array, index, -1, -1);
         this.checkAutotileConnectionAround(layer, array, index, 0, -1);
@@ -672,14 +669,7 @@ export class MapVertexGenerator
             this.checkUpdateCallPerformance('updateBlockList');
         }
         this.checkRebuild();
-
+        if (blocks.length > 50) {
-        if (blocks.length <= 50) {
-            blocks.forEach(({ block: num, x, y }) => {
-                this.updateBlockVertex(layer, num, x, y);
-            });
-            return;
-        }
-
             // 对于超出50个的更新操作使用懒更新
             blocks.forEach(v => {
                 const block = this.block.getBlockByDataLoc(v.x, v.y);
@@ -766,6 +756,11 @@ export class MapVertexGenerator
                     }
                 }
             });
+        } else {
+            blocks.forEach(({ block: num, x, y }) => {
+                this.updateBlockVertex(layer, num, x, y);
+            });
+        }
     }
 
     updateBlockCache(block: Readonly<IBlockData<IMapVertexBlock>>): void {
@@ -1041,9 +1036,6 @@ class MapVertexBlock implements IMapVertexBlock {
         this.dirty = false;
     }
 
-    /**
-     * 标记为需要更新渲染缓冲区
-     */
     markRenderDirty() {
         this.renderDirty = true;
     }

packages-user/client-modules/src/render/map/viewport.ts

@@ -128,7 +128,7 @@ export class MapViewport implements IMapViewportController {
         return {
             render: renderArea,
             dirty: updateArea,
-            blockList: blockList
+            blockList: blockList.filter(v => v.data.dirty)
         };
     }
 

packages-user/data-state/src/core.ts

@@ -26,7 +26,7 @@ export class CoreState implements ICoreState {
 
     loadState(data: IStateSaveData): void {
         this.hero.removeAllFollowers();
-        data?.followers.forEach(v => {
+        data.followers.forEach(v => {
             this.hero.addFollower(v.num, v.identifier);
         });
     }

packages-user/data-state/src/map/mapLayer.ts

@@ -7,8 +7,6 @@ import {
 } from './types';
 import { Hookable, HookController, logger } from '@motajs/common';
 
-// todo: 提供 core.setBlock 等方法的替代方法，同时添加 setBlockList，以及前景背景的接口
-
 export class MapLayer
     extends Hookable<IMapLayerHooks, IMapLayerHookController>
     implements IMapLayer

packages/render-assets/src/streamComposer.ts

@@ -140,7 +140,6 @@ export class TextureMaxRectsStreamComposer
 
     private nextCanvas() {
         this.nowCanvas = document.createElement('canvas');
-        this.nowCanvas.id = `${Math.random()}`;
         this.nowCtx = this.nowCanvas.getContext('2d')!;
         this.nowCanvas.width = this.maxWidth;
         this.nowCanvas.height = this.maxHeight;

public/libs/maps.js

@@ -3138,11 +3138,6 @@ maps.prototype.showBlock = function (x, y, floorId) {
             block?.id ?? 0,
             0
         );
-        if (floorId === core.status.floorId) {
-            const { layer } = Mota.require('@user/data-state').state;
-            const event = layer.getLayerByAlias('event');
-            event.setBlock(block.id, x, y);
-        }
         // 在本层，添加动画
         if (floorId == core.status.floorId) {
             if (block.event.cls == 'autotile') {
@@ -3175,11 +3170,6 @@ maps.prototype.hideBlock = function (x, y, floorId) {
         0,
         block?.id ?? 0
     );
-    if (floorId === core.status.floorId) {
-        const { layer } = Mota.require('@user/data-state').state;
-        const event = layer.getLayerByAlias('event');
-        event.setBlock(0, x, y);
-    }
 
     // 删除动画，清除地图
     this._removeBlockFromMap(floorId, block);
@@ -3203,11 +3193,6 @@ maps.prototype.hideBlockByIndex = function (index, floorId) {
         0,
         block?.id ?? 0
     );
-    if (floorId === core.status.floorId) {
-        const { layer } = Mota.require('@user/data-state').state;
-        const event = layer.getLayerByAlias('event');
-        event.setBlock(0, x, y);
-    }
 };
 
 ////// 一次性隐藏多个block //////
@@ -3280,11 +3265,6 @@ maps.prototype.removeBlockByIndex = function (index, floorId) {
         0,
         block?.id ?? 0
     );
-    if (floorId === core.status.floorId) {
-        const { layer } = Mota.require('@user/data-state').state;
-        const event = layer.getLayerByAlias('event');
-        event.setBlock(0, x, y);
-    }
 };
 
 ////// 一次性删除多个block //////
@@ -3439,11 +3419,6 @@ maps.prototype.setBlock = function (number, x, y, floorId, noredraw) {
         number,
         originBlock?.id ?? 0
     );
-    if (floorId === core.status.floorId) {
-        const { layer } = Mota.require('@user/data-state').state;
-        const event = layer.getLayerByAlias('event');
-        event.setBlock(number, x, y);
-    }
 };
 
 maps.prototype.animateSetBlock = function (
@@ -3645,11 +3620,6 @@ maps.prototype.replaceBlock = function (fromNumber, toNumber, floorId) {
                 fromNumber,
                 toNumber
             );
-            if (floorId === core.status.floorId) {
-                const { layer } = Mota.require('@user/data-state').state;
-                const event = layer.getLayerByAlias('event');
-                event.setBlock(toNumber, x, y);
-            }
         }
     }, this);
     if (floorId == core.status.floorId) core.redrawMap();
@@ -3699,11 +3669,6 @@ maps.prototype.setBgFgBlock = function (name, number, x, y, floorId) {
         y,
         floorId
     );
-    if (floorId === core.status.floorId) {
-        const { layer } = Mota.require('@user/data-state').state;
-        const mapLayer = layer.getLayerByAlias(name);
-        mapLayer.setBlock(block.id, x, y);
-    }
 };
 
 ////// 重置地图 //////