From efb827a52c2bf3cc3ca6adcb70c42fe3844eea87 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 26 Jul 2022 15:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=BA=97=EF=BC=9A=E9=98=85=E8=AF=BB?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/shopService.ts | 3 +-- shared/domain/roleField/shop.ts | 1 - shared/resource/jsons/dic_zyz_activityType.json | 6 ++++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/game-server/app/services/shopService.ts b/game-server/app/services/shopService.ts index 17c1a3d50..2caf9f3d8 100644 --- a/game-server/app/services/shopService.ts +++ b/game-server/app/services/shopService.ts @@ -42,9 +42,8 @@ async function getShopListByData(shop: number, type: number, userShopRecs: UserS let dicShopType = getShopType(shop, type); if(dicShopType && dicShopType.isLimit) { if(activity) result.setDicByActivity(activity); - if(readRecord) result.setReadRecord(readRecord); + result.setReadRecord(readRecord); } - console.log('###### getShopListByData', userShopRecs) for(let userShop of userShopRecs) { result.addUserRecords(userShop); } diff --git a/shared/domain/roleField/shop.ts b/shared/domain/roleField/shop.ts index 2980598d6..055ac7452 100644 --- a/shared/domain/roleField/shop.ts +++ b/shared/domain/roleField/shop.ts @@ -141,7 +141,6 @@ export class ShopReturnData { public addUserRecords(record: UserShopType) { if(!record || record.shop != this.shop || record.type != this.type) return; let dic = this.dic.find(cur => cur.id == record.itemId); - console.log('######### addUserRecords', dic?.createTime, record?.createTime) if(!dic || (dic.createTime && dic.createTime != record.createTime)) return; let recordResult = new ShopReturnRecordData(record); if(recordResult && recordResult.shopItemId) this.records.push(recordResult) diff --git a/shared/resource/jsons/dic_zyz_activityType.json b/shared/resource/jsons/dic_zyz_activityType.json index 7a373a143..b4c28196f 100644 --- a/shared/resource/jsons/dic_zyz_activityType.json +++ b/shared/resource/jsons/dic_zyz_activityType.json @@ -232,5 +232,11 @@ "activityType": 43, "name": "GUILD_PAY", "string": "军团限时付费" + }, + { + "id": 44, + "activityType": 44, + "name": "SHOP", + "string": "限时商店" } ] \ No newline at end of file