Revert " feat(gvg): 遗迹驻扎阵容优化"

This reverts commit 37a0aba5ea.
This commit is contained in:
luying
2023-06-27 15:40:29 +08:00
parent 46e5d1e648
commit d10eacde86
4 changed files with 3 additions and 22 deletions

View File

@@ -19,7 +19,7 @@ import { GVG } from "../../../pubUtils/dicParam";
import { RewardInter, pvpEndParamInter } from "../../../pubUtils/interface";
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, checkHeroChangeInVestige } from "../../../services/gvg/gvgFightService";
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, getGVGActive } from "../../../services/gvg/gvgPrepareService";
import { addVestigeBattleEndRec } from "../../../services/gvg/gvgRecService";
@@ -87,7 +87,7 @@ export class GVGProduceHandler {
}
// 编辑阵容
async saveLineup(msg: { vestigeId: number, lineup: { actorId: number, dataId: number, order: number, correspondingVar: number }[] }, session: BackendSession) {
async saveLineup(msg: { vestigeId: number, lineup: [{ actorId: number, dataId: number, order: number, correspondingVar: number }] }, session: BackendSession) {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
@@ -102,7 +102,6 @@ export class GVGProduceHandler {
let myVestigeRank = await getMyVestigeRank(configId, groupKey, vestigeId, roleId);
if(!myVestigeRank) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
if(heroes.length != 6) return resResult(STATUS.GVG_VESTIGE_DEFENSE_MEMBER_CNT);
for(let { actorId } of heroes) {
if(isHeroHidden(actorId)) return resResult(STATUS.HERO_IS_HIDDEN);
@@ -111,7 +110,6 @@ export class GVGProduceHandler {
if(!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
// 检查武将是否在其他遗迹中使用了
if(await checkHeroIsUsedInOtherVestige(roleId, vestigeId, heroes)) return resResult(STATUS.GVG_VESTIGE_HERO_USED);
if(await checkHeroChangeInVestige(roleId, vestigeId, heroes)) return resResult(STATUS.GVG_VESTIGE_LINEUP_CHANGE);
let lineup = heroes.map(hero => {
let curHero = dbHeroes.find(cur => cur.hid == hero.actorId);