diff --git a/game-server/app/servers/guild/handler/gateActivityHandler.ts b/game-server/app/servers/guild/handler/gateActivityHandler.ts index 2e95ecc3f..f9c0b19ba 100644 --- a/game-server/app/servers/guild/handler/gateActivityHandler.ts +++ b/game-server/app/servers/guild/handler/gateActivityHandler.ts @@ -109,13 +109,13 @@ export class GateActivityHandler { } // 上报玩家获得军功 - async action(msg: { code: string, record: { round: number, dataId: number }[] }, session: BackendSession) { + async action(msg: { code: string, round: number, record: { round: number, dataId: number }[] }, session: BackendSession) { let roleId = session.get('roleId'); let roleName = session.get('roleName'); let guildCode = session.get('guildCode'); let serverId = session.get('serverId'); - let { code, record } = msg; + let { code, round, record } = msg; let obj = getGateActivityObj(); let statusResult = getGuildActivityStatus(this.aid); @@ -128,7 +128,7 @@ export class GateActivityHandler { // 计算record内得分 let memberRecord = obj.getMemberRecord(code, roleId); - let scoreResult = getRecordScore(this.aid, record, memberRecord); + let scoreResult = getRecordScore(this.aid, round, record, memberRecord); if(!scoreResult) return resResult(STATUS.DIC_DATA_NOT_FOUND); let { score, newRecords, memberRecord: newMemberRecord } = scoreResult; obj.setMemberRecord(code, newMemberRecord); diff --git a/game-server/app/services/guildActivityService.ts b/game-server/app/services/guildActivityService.ts index c12e1c05e..18d708d72 100644 --- a/game-server/app/services/guildActivityService.ts +++ b/game-server/app/services/guildActivityService.ts @@ -113,7 +113,7 @@ export function getGuildActivityByDic(dicGuildActivity: DicGuildActivity) { * @param record * @param memberRecord */ -export function getRecordScore(aid: number, record: { round: number, dataId: number }[], memberRecord: GateMembersRec) { +export function getRecordScore(aid: number, round: number, record: { round: number, dataId: number }[], memberRecord: GateMembersRec) { let dicGuildActivity = gameData.guildActivity.get(aid); if(!dicGuildActivity) return false; @@ -131,16 +131,16 @@ export function getRecordScore(aid: number, record: { round: number, dataId: num newRecords.push({ round, dataId, score, enemyType}); sum += score; console.log('*******', sum, score, enemyType); - if(round > curRound) { // 每回合开始得10分 - sum += gameData.gateActivityPoint.get(GET_POINT_WAYS.ROUND_START); - curRound = round; - console.log('********', sum); - } historyEnemies.push(dataId); } } + for(let i = curRound; i <= round; i++) { + sum += gameData.gateActivityPoint.get(GET_POINT_WAYS.ROUND_START); + memberRecord.round = i; + console.log('********', sum, i); + } return { score: sum, newRecords, memberRecord } }