diff --git a/game-server/app/servers/guild/handler/gvgFightHandler.ts b/game-server/app/servers/guild/handler/gvgFightHandler.ts index 58e46f62b..58fd61fcf 100644 --- a/game-server/app/servers/guild/handler/gvgFightHandler.ts +++ b/game-server/app/servers/guild/handler/gvgFightHandler.ts @@ -21,7 +21,7 @@ import { parseGoodStr, resResult } from "../../../pubUtils/util"; import { isHeroHidden } from "../../../services/dataService"; import { calBreakGoods, checkHeroIsUsedInOtherVestige, checkVestige, checkVestigeOppStatus, checkVestigeRank, generateAttackHeroInfo, generateAttackInfo, generateDefenseInfo, getDayKeyInfo, getMyVestigeRank, getOppDetailData, getOppPlayerByRanks, getVestigeRecStatus, getVestigeRank, getVestigeUsedHeroes, isRobot, refreshVestigeOppRanks, saveScoreToRank, updateMyVestigeRank, saveVestigeRankSchedule, calVestigeLeagueBoxRewards, checkFightTime, savePlayerRank } from "../../../services/gvg/gvgFightService"; import { addGVGReward, combinePushItem, handleGVGCost } from "../../../services/gvg/gvgItemService"; -import { addGVGActive } from "../../../services/gvg/gvgPrepareService"; +import { addGVGActive, getGVGActive } from "../../../services/gvg/gvgPrepareService"; import { addVestigeBattleEndRec } from "../../../services/gvg/gvgRecService"; import { getGroupKey, getGVGPeriodData } from "../../../services/gvg/gvgService"; import { checkBattleHeroesByHid } from "../../../services/normalBattleService"; @@ -248,9 +248,9 @@ export class GVGProduceHandler { } let userDailyData = await GVGUserDailyDataModel.incCostGoldCnt(configId, myLeague.leagueCode, roleId, costGold); // 获取征战令对应奖励 - const leagueGoods = await addGVGReward(roleId, roleName, myLeague.leagueCode, sid, dicRank.battleLeagueReward, dicRank.battleReward, ITEM_CHANGE_REASON.GVG_VESTIGE_START); + const leagueGoods = costGold? []: await addGVGReward(roleId, roleName, myLeague.leagueCode, sid, dicRank.battleLeagueReward, dicRank.battleReward, ITEM_CHANGE_REASON.GVG_VESTIGE_START); // 消耗征战令的获得活跃 - let active = await addGVGActive(myLeague.leagueCode, roleId, GVG_ACTIVE_TYPE.COST_FIGHT_COIN); + let active = costGold? await getGVGActive(myLeague.leagueCode, roleId): await addGVGActive(myLeague.leagueCode, roleId, GVG_ACTIVE_TYPE.COST_FIGHT_COIN); // 创建rec const attackInfo = await generateAttackInfo(roleId, myLeague, myRank); const defenseInfo = await generateDefenseInfo(targetRoleId, vestigeId, rank); diff --git a/game-server/app/services/gvg/gvgPrepareService.ts b/game-server/app/services/gvg/gvgPrepareService.ts index 0eb7976cb..ce33c14a8 100644 --- a/game-server/app/services/gvg/gvgPrepareService.ts +++ b/game-server/app/services/gvg/gvgPrepareService.ts @@ -58,6 +58,12 @@ export function calFighterContribute(obj: { score: number }) { return obj?.score||0 } +export async function getGVGActive(leagueCode: string, roleId: string) { + let { configId } = getGVGConfig(); + let result = await GVGUserDataModel.findByRole(configId, leagueCode, roleId); + return result?.active||0; +} + /** * 获得活跃 * @param leagueCode