活动:寻宝骑兵活动固定关卡id
This commit is contained in:
@@ -10,6 +10,7 @@ import { RewardParam } from '../../../domain/activityField/rewardField';
|
||||
import { ActivityTreasureHuntTreasureShopModel } from '../../../db/ActivityTreasureHuntTreasureShop';
|
||||
import { ActivityTreasureHuntFirstPageModel } from '../../../db/ActivityTreasureHuntFirstPage';
|
||||
import { CheckMeterial } from '../../../services/role/checkMaterial';
|
||||
import { ActivityTreasureHuntChallengeModel } from '../../../db/ActivityTreasureHuntChallenge';
|
||||
|
||||
|
||||
export default function (app: Application) {
|
||||
@@ -218,7 +219,11 @@ export class TreasureHuntHandler {
|
||||
let isEnough = await check.decrease(consume);
|
||||
if (!isEnough) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
|
||||
|
||||
let warId = playerData.challenge.randomGK();
|
||||
let warId = playerData.challenge.resultWarId;
|
||||
if(!warId) {
|
||||
warId = playerData.challenge.randomGK();
|
||||
await ActivityTreasureHuntChallengeModel.setWarId(serverId, activityId, roleId, huntRoundIndex, warId);
|
||||
}
|
||||
|
||||
return resResult(STATUS.SUCCESS, Object.assign({ warId }, {
|
||||
param: { activityId },
|
||||
|
||||
@@ -15,6 +15,7 @@ import { RoleModel } from '../../db/Role';
|
||||
import { getActivitiesByType, getActivityById } from './activityService';
|
||||
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
|
||||
import { handleCost } from '../role/rewardService';
|
||||
import { ActivityTreasureHuntChallengeModel } from '../../db/ActivityTreasureHuntChallenge';
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
@@ -170,6 +171,9 @@ export async function getPlayerTreasureHuntChallengeData(activityId: number, ser
|
||||
playerData.todayIndex = deltaDays(moment(huntBeginTime).startOf('d').toDate(), new Date) + 1;;
|
||||
playerData.roundIndex = huntRoundIndex;
|
||||
|
||||
let playerRecord = await ActivityTreasureHuntChallengeModel.findData(serverId, activityId, roleId, huntRoundIndex);
|
||||
playerData.challenge.setChallengeRecord(playerRecord)
|
||||
|
||||
return playerData;
|
||||
}
|
||||
|
||||
@@ -373,5 +377,9 @@ export async function treasureHuntChallengeConsume(serverId: number, roleId: str
|
||||
let consume = stringToConsumeParam(consumeStr)
|
||||
let resourceResult = await handleCost(roleId, sid, consume, ITEM_CHANGE_REASON.TREASURE_HUNT_CHALLENGE);
|
||||
if (!resourceResult) return false;
|
||||
|
||||
let warId = playerData.challenge.randomGK();
|
||||
await ActivityTreasureHuntChallengeModel.setWarId(serverId, huntActivityId, roleId, huntRoundIndex, warId);
|
||||
|
||||
return true
|
||||
}
|
||||
Reference in New Issue
Block a user