diff --git a/src/assets/images/canvas/xiangao.png b/src/assets/images/canvas/xiangao.png index 89774ded..330e0b1e 100644 Binary files a/src/assets/images/canvas/xiangao.png and b/src/assets/images/canvas/xiangao.png differ diff --git a/src/assets/images/canvas/xiangaofenge.png b/src/assets/images/canvas/xiangaofenge.png index a7c53528..02d9a49b 100644 Binary files a/src/assets/images/canvas/xiangaofenge.png and b/src/assets/images/canvas/xiangaofenge.png differ diff --git a/src/component/Canvas/CanvasEditor/commands/FillRepeatCommand.js b/src/component/Canvas/CanvasEditor/commands/FillRepeatCommand.js index a866c299..7104d0ec 100644 --- a/src/component/Canvas/CanvasEditor/commands/FillRepeatCommand.js +++ b/src/component/Canvas/CanvasEditor/commands/FillRepeatCommand.js @@ -116,13 +116,15 @@ export class FillRepeatCommand extends Command { flipY: object.flipY, }); } else { + let scaleX = bgObject.scaleX || 1; + let scaleY = bgObject.scaleY || 1; rect.set({ width: bgObject.width, height: bgObject.height, - top: bgObject.top, - left: bgObject.left, - originX: bgObject.originX, - originY: bgObject.originY, + top: bgObject.top - bgObject.height * scaleY / 2, + left: bgObject.left - bgObject.width * scaleX / 2, + scaleX, + scaleY, }); layer.locked = true; } diff --git a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue index 5bab1e49..e2d574e7 100644 --- a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue +++ b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue @@ -287,7 +287,7 @@ const canDeleteComputed = computed(() => { :is-child="isChild" :is-active="layer.id === activeLayerId" :is-selected="isLayerSelected(layer.id)" - :is-multi-select-mode="isMultiSelectMode" + :is-multi-select-mode="isMultiSelectMode && !layer.specialType" :is-editing="editingLayerId === layer.id" :editing-name="editingLayerName" :can-delete=" @@ -296,7 +296,7 @@ const canDeleteComputed = computed(() => { :expanded-group-ids="expandedGroupIds" @click="(...args) => forwardEvent('layer-click', ...args)" @double-click="(...args) => forwardEvent('layer-double-click', ...args)" - @context-menu="(...args) => forwardEvent('context-menu', ...args)" + @context-menu="(...args) => !layer.specialType && forwardEvent('context-menu', ...args)" @checkbox-change="(...args) => forwardEvent('checkbox-change', ...args)" @toggle-visibility="(...args) => forwardEvent('toggle-visibility', ...args)" @toggle-lock="(...args) => forwardEvent('toggle-lock', ...args)" @@ -337,7 +337,7 @@ const canDeleteComputed = computed(() => { :expanded-group-ids="expandedGroupIds" :isChild="true" :parentLayerId="layer.id" - :group-name="groupName" + :group-name="layer.specialType || groupName" @layer-click="(...args) => forwardEvent('layer-click', ...args)" @layer-double-click="(...args) => forwardEvent('layer-double-click', ...args)" @context-menu="(...args) => forwardEvent('context-menu', ...args)" @@ -385,17 +385,10 @@ const canDeleteComputed = computed(() => {