From d28443e2de1731b88b4623925060a35e18bfefba Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 9 Aug 2021 14:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E6=B6=88=E8=80=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/role/handler/equipHandler.ts | 2 +- shared/db/Maintenance.ts | 4 ++-- shared/db/Serverlist.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/game-server/app/servers/role/handler/equipHandler.ts b/game-server/app/servers/role/handler/equipHandler.ts index 1704ec907..f07cf1b0a 100644 --- a/game-server/app/servers/role/handler/equipHandler.ts +++ b/game-server/app/servers/role/handler/equipHandler.ts @@ -550,7 +550,7 @@ export class EquipHandler { jewels.push({ id: jewel, count: 1 }); } goods = goods.concat(goodInfo.decomposeItem); - cost.push({ seqId: equip.seqId }); + cost.push({ seqId: equip.seqId, id: equip.id, count: 1 }); } let costResult = await handleCost(roleId, sid, cost); // 删掉装备 if(!costResult) return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH); diff --git a/shared/db/Maintenance.ts b/shared/db/Maintenance.ts index 833e61749..389e2b156 100644 --- a/shared/db/Maintenance.ts +++ b/shared/db/Maintenance.ts @@ -75,7 +75,7 @@ export default class Maintenance extends BaseModel { public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, form: { isOpen?: boolean } = {}) { - let searchObj = MaintenanceModel.getSearchObj(form); + let searchObj = this.getSearchObj(form); let sort = {}; if (sortField && sortOrder) { if (sortOrder == 'ascend') { @@ -93,7 +93,7 @@ export default class Maintenance extends BaseModel { public static async countByCondition(form: { isOpen?: boolean } = {}) { - let searchObj = MaintenanceModel.getSearchObj(form); + let searchObj = this.getSearchObj(form); const result = await MaintenanceModel.count(searchObj); return result; } diff --git a/shared/db/Serverlist.ts b/shared/db/Serverlist.ts index a17c774eb..04e96fc16 100644 --- a/shared/db/Serverlist.ts +++ b/shared/db/Serverlist.ts @@ -140,7 +140,7 @@ export default class Serverlist extends BaseModel { public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, form: { id?: number, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string } = {}) { - let searchObj = ServerlistModel.getSearchObj(form); + let searchObj = this.getSearchObj(form); let sort = {}; if(sortField && sortOrder) { if(sortOrder == 'ascend') { @@ -156,7 +156,7 @@ export default class Serverlist extends BaseModel { public static async countByCondition(form: { id?: number, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string } = {}) { - let searchObj = ServerlistModel.getSearchObj(form); + let searchObj = this.getSearchObj(form); const result = await ServerlistModel.count(searchObj); return result; }