diff --git a/game-server/app/servers/role/handler/itemHandler.ts b/game-server/app/servers/role/handler/itemHandler.ts index a3ce72368..fabdf9926 100644 --- a/game-server/app/servers/role/handler/itemHandler.ts +++ b/game-server/app/servers/role/handler/itemHandler.ts @@ -177,7 +177,7 @@ export class ItemHandler { if(!giftCode) { return resResult(STATUS.GIFT_CODE_NOT_FOUND); } - if(giftCode.type != GIFT_TYPE.GAME) return resResult(STATUS.GIFT_TYPE_ERR); + if(giftCode.type != GIFT_TYPE.GAME && giftCode.type != GIFT_TYPE.DEFAULT) return resResult(STATUS.GIFT_TYPE_ERR); if(giftCode.generateType == GIFT_GENERATE_TYPE.ONE_TO_ONE) { // 一人一条,单条不能被多人使用 if(giftCodeDetail.usedNum > 0) return resResult(STATUS.GIFT_CODE_USED_NUM_MAX); } diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts index c8cd5dda6..9b82c70f4 100644 --- a/shared/consts/constModules/sysConst.ts +++ b/shared/consts/constModules/sysConst.ts @@ -979,6 +979,7 @@ export enum GIFT_GENERATE_TYPE { } export enum GIFT_TYPE { + DEFAULT = 0, GAME = 1, // 游戏内码 WEB = 2, // 外链发送 } diff --git a/web-server/app/service/Sdk.ts b/web-server/app/service/Sdk.ts index 18ff7bc47..ee7ae9d7d 100644 --- a/web-server/app/service/Sdk.ts +++ b/web-server/app/service/Sdk.ts @@ -455,7 +455,7 @@ export default class Sdk extends Service { if(!giftCode) { return resResult(SDK_37_ACTIVITY_CODE.GIFT_NOT_FOUND); } - if(giftCode.type != GIFT_TYPE.WEB) return resResult(SDK_37_ACTIVITY_CODE.GIFT_TYPE_ERR); + if(giftCode.type != GIFT_TYPE.WEB && giftCode.type != GIFT_TYPE.DEFAULT) return resResult(SDK_37_ACTIVITY_CODE.GIFT_TYPE_ERR); if(giftCode.generateType == GIFT_GENERATE_TYPE.ONE_TO_ONE) { // 一人一条,单条不能被多人使用 if(giftCodeDetail.usedNum > 0) return resResult(SDK_37_ACTIVITY_CODE.GIFT_CODE_CANNOT_USE); }