🐞 fix(gvg): 守城对备战期的加成逻辑修改

This commit is contained in:
luying
2023-02-28 11:04:16 +08:00
parent 9d369ee0a9
commit ad122098a5

View File

@@ -1,9 +1,9 @@
import { BackendSession } from "pinus"; import { BackendSession } from "pinus";
import { GVG_ACTIVE_TYPE, GVG_ITEM, GVG_RESOURCE_TYPE, GVG_SEED_TYPE, GVG_TECH_TYPE, ITEM_CHANGE_REASON, LEAGUE_JOB, PUSH_ROUTE } from "../../consts"; import { GVG_ACTIVE_TYPE, GVG_ITEM, GVG_RESOURCE_TYPE, GVG_SEED_TYPE, GVG_TECH_TYPE, ITEM_CHANGE_REASON, LEAGUE_JOB, PUSH_ROUTE } from "../../consts";
import { GVGLeagueFarmModel, GVGLeagueFarmType } from "../../db/GVGLeagueFarm"; import { GVGLeagueFarmModel, GVGLeagueFarmType } from "../../db/GVGLeagueFarm";
import { GVGLeaguePrepareModel, GVGLeaguePrepareType, Tech } from "../../db/GVGLeaguePrepare"; import { GVGLeaguePrepareModel, Tech } from "../../db/GVGLeaguePrepare";
import { GVGUserDailyDataModel, GVGUserDailyDataType } from "../../db/GVGUserDailyData"; import { GVGUserDailyDataModel, GVGUserDailyDataType } from "../../db/GVGUserDailyData";
import { GVGUserDataModel, GVGUserDataType } from "../../db/GVGUserData"; import { GVGUserDataModel } from "../../db/GVGUserData";
import { GVGUserItemModel } from "../../db/GVGUserItem"; import { GVGUserItemModel } from "../../db/GVGUserItem";
import { LeagueField } from "../../domain/gvgField/returnData"; import { LeagueField } from "../../domain/gvgField/returnData";
import { calLeagueLv, gameData, getFieldMaxAddType } from "../../pubUtils/data"; import { calLeagueLv, gameData, getFieldMaxAddType } from "../../pubUtils/data";
@@ -406,20 +406,20 @@ export function calForestryOutput(farmId: number, result: number, cities: number
// 城池加成,多城池取最大加成 // 城池加成,多城池取最大加成
function getCitiesAdd(cities: number[], resourceType: number) { function getCitiesAdd(cities: number[], resourceType: number) {
let outputAdds: number[] = [0]; let outputAdd: number = 0;
for(let cityId of cities) { for(let cityId of cities) {
let dicCity = gameData.gvgCity.get(cityId); let dicCity = gameData.gvgCity.get(cityId);
let dicCityAdd = gameData.gvgCityAdd.get(dicCity?.cityType); let dicCityAdd = gameData.gvgCityAdd.get(dicCity?.cityType);
if(!dicCity || !dicCityAdd) continue; if(!dicCity || !dicCityAdd) continue;
if(resourceType == GVG_RESOURCE_TYPE.FOOD) { if(resourceType == GVG_RESOURCE_TYPE.FOOD) {
outputAdds.push(dicCityAdd.foodAdd); outputAdd += dicCityAdd.foodAdd;
} else if (resourceType == GVG_RESOURCE_TYPE.MINERAL) { } else if (resourceType == GVG_RESOURCE_TYPE.MINERAL) {
outputAdds.push(dicCityAdd.mineralAdd); outputAdd += dicCityAdd.mineralAdd;
} else if (resourceType == GVG_RESOURCE_TYPE.WOOD) { } else if (resourceType == GVG_RESOURCE_TYPE.WOOD) {
outputAdds.push(dicCityAdd.woodAdd); outputAdd += dicCityAdd.woodAdd;
} }
} }
return Math.max(...outputAdds); return outputAdd;
} }
// 科技树加成 叠加 // 科技树加成 叠加