xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat(gvg): 动态

Browse Source
This commit is contained in:
luying
2023-02-17 10:58:06 +08:00
parent 72a25640aa
commit aab08f7ed5
14 changed files with 191 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/guild/handler/gvgHandler.ts
+10 -4
View File
@@ -1,5 +1,5 @@
import { Application, BackendSession, ChannelService, HandlerService, pinus } from "pinus";
import { GVG_ITEM, DATA_NAME, GVG_ACTIVE_TYPE, GVG_PERIOD, GVG_SERVER_TYPE, ITEM_CHANGE_REASON, LEAGUE_JOB, LEAGUE_MANAGE_TYPE, STATUS } from "../../../consts";
import { GVG_ITEM, DATA_NAME, GVG_ACTIVE_TYPE, GVG_PERIOD, GVG_SERVER_TYPE, ITEM_CHANGE_REASON, LEAGUE_JOB, LEAGUE_MANAGE_TYPE, STATUS, GVG_REC_TYPE } from "../../../consts";
import { GVGLeagueModel } from "../../../db/GVGLeague";
import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
import { GVGMainData, LeagueDistributeInfo, LeagueMemberDistributeInfo, LeagueMemberListInfo } from "../../../domain/gvgField/returnData";
@@ -19,6 +19,7 @@ import { lockLeagueData } from "../../../services/redLockService";
import { addGVGReward, handleGVGCost } from "../../../services/gvg/gvgItemService";
import { RewardInter } from "../../../pubUtils/interface";
import { getGVGCities } from "../../../services/gvg/gvgBattleService";
import { GVGRecModel } from "../../../db/GVGRec";
export default function (app: Application) {
new HandlerService(app, {});
@@ -73,10 +74,15 @@ export class GVGHandler {
return resResult(STATUS.SUCCESS, data)
}
// TODO 获取动态
// 获取动态
async getRec(msg: {}, session: BackendSession) {
const roleId = session.get('roleId');
return resResult(STATUS.SUCCESS, { recs: [] });
const guildCode = session.get('guildCode');
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
const recs = await GVGRecModel.findByLeague(myLeague.leagueCode, GVG_REC_TYPE.PREPARE);
return resResult(STATUS.SUCCESS, { recs });
}
// 选择职能
game-server/app/servers/guild/handler/gvgManageHandler.ts
+5 -2
View File
@@ -17,6 +17,7 @@ import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
import { createGroupMsg, pushGroupMsgToRoom } from "../../../services/chatService";
import { sendMailToGuildByContent } from "../../../services/mailService";
import { getGVGCities } from "../../../services/gvg/gvgBattleService";
import { guildQuitLeagueRecord } from "../../../services/gvg/gvgRecService";
export default function (app: Application) {
new HandlerService(app, {});
@@ -408,7 +409,8 @@ export class GVGManageHandler {
myLeague = await GVGLeagueModel.quitGuild(myLeague.leagueCode, guild);
// 发送消息
await sendMessageToGuildWithSuc(targetGuildCode, PUSH_ROUTE.LEAGUE_KICK, { leagueCode: myLeague.leagueCode })
await sendMessageToGuildWithSuc(targetGuildCode, PUSH_ROUTE.LEAGUE_KICK, { leagueCode: myLeague.leagueCode });
guildQuitLeagueRecord(myLeague.leagueCode, guild.name);
// 返回
return resResult(STATUS.SUCCESS, {
@@ -447,7 +449,8 @@ export class GVGManageHandler {
// 更新联军信息
myLeague = await GVGLeagueModel.quitGuild(myLeague.leagueCode, guild);
// 发送消息
await sendMessageToGuildWithSuc(targetGuildCode, PUSH_ROUTE.LEAGUE_KICK, { leagueCode: myLeague.leagueCode })
await sendMessageToGuildWithSuc(targetGuildCode, PUSH_ROUTE.LEAGUE_KICK, { leagueCode: myLeague.leagueCode });
guildQuitLeagueRecord(myLeague.leagueCode, guild.name);
// 返回
return resResult(STATUS.SUCCESS, {
game-server/app/servers/guild/handler/gvgProduceHandler.ts
+9 -7
View File
@@ -135,6 +135,7 @@ export class GVGProduceHandler {
// 小游戏界面
async getMyFarm(msg: { farmId: number }, session: BackendSession) {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const guildCode = session.get('guildCode');
const { farmId } = msg;
@@ -145,7 +146,7 @@ export class GVGProduceHandler {
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
await lockField(myLeague.leagueCode, roleId, farmId);
await lockField(myLeague.leagueCode, roleId, roleName, farmId);
const myRank = await getmyDistributeRank(myLeague.leagueCode, myLeague.members, roleId);
return resResult(STATUS.SUCCESS, {
@@ -220,13 +221,13 @@ export class GVGProduceHandler {
// 计算产量
const { foodSum, rewardSum, leagueRewardSum, activeSum } = await sumOutputByResults(myResultFields);
// 资源
let resourceResult = await addResource(myLeague.leagueCode, roleId, GVG_RESOURCE_TYPE.FOOD, foodSum)||{};
let resourceResult = await addResource(myLeague.leagueCode, roleId, roleName, GVG_RESOURCE_TYPE.FOOD, foodSum)||{};
// 相关物品
let leagueGoods = await addGVGReward(roleId, roleName, myLeague.leagueCode, sid, leagueRewardSum, rewardSum, ITEM_CHANGE_REASON.HARVEST)
// 活跃
const active = await addGVGActive(myLeague.leagueCode, roleId, GVG_ACTIVE_TYPE.COST_PRODUCE_COIN, activeSum);
// 收获后再次预锁定一批田
await lockField(myLeague.leagueCode, roleId, farmId);
await lockField(myLeague.leagueCode, roleId, roleName, farmId);
await GVGLeagueFarmRecModel.updateRecs(myResultFields, roleId);
return resResult(STATUS.SUCCESS, {
@@ -276,7 +277,7 @@ export class GVGProduceHandler {
// 计算产量
const { foodSum, rewardSum, leagueRewardSum, activeSum } = await sumOutputByResults([resultField]);
// 资源
await addResource(myLeague.leagueCode, targetRoleId, GVG_RESOURCE_TYPE.FOOD, foodSum)||{};
await addResource(myLeague.leagueCode, targetRoleId, resultField.lockRoleName, GVG_RESOURCE_TYPE.FOOD, foodSum)||{};
await sendMailByContent(MAIL_TYPE.HELP_HARVEST, targetRoleId, { sendName: roleName, goods: rewardSum });
// 相关物品
await addGVGReward(targetRoleId, roleName, myLeague.leagueCode, targetOnlineInfo.sid, leagueRewardSum, [], ITEM_CHANGE_REASON.HARVEST)
@@ -361,7 +362,7 @@ export class GVGProduceHandler {
let { reward, leagueReward, leagueConsume } = dicGVGItem;
let produceCoin = getProduceCoinCnt(leagueConsume);
// 资源
let resourceResult = await addResource(myLeague.leagueCode, roleId, GVG_RESOURCE_TYPE.MINERAL, output)||{};
let resourceResult = await addResource(myLeague.leagueCode, roleId, roleName, GVG_RESOURCE_TYPE.MINERAL, output)||{};
// 相关物品
let leagueGoods = await addGVGReward(roleId, roleName, myLeague.leagueCode, sid, leagueReward, reward, ITEM_CHANGE_REASON.HARVEST)
// 活跃
@@ -480,7 +481,7 @@ export class GVGProduceHandler {
let { reward, leagueReward, leagueConsume } = dicGVGItem;
let produceCoin = getProduceCoinCnt(leagueConsume);
// 资源
let resourceResult = await addResource(myLeague.leagueCode, roleId, GVG_RESOURCE_TYPE.WOOD, output)||{};
let resourceResult = await addResource(myLeague.leagueCode, roleId, roleName, GVG_RESOURCE_TYPE.WOOD, output)||{};
// 相关物品
let leagueGoods = await addGVGReward(roleId, roleName, myLeague.leagueCode, sid, leagueReward, reward, ITEM_CHANGE_REASON.HARVEST)
// 活跃
@@ -497,13 +498,14 @@ export class GVGProduceHandler {
// 获取资源
async debugAddResource(msg: { type: number, count: number }, session: BackendSession) {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const guildCode = session.get('guildCode');
const { type, count } = msg;
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
let resourceResult = await addResource(myLeague.leagueCode, roleId, type, count);
let resourceResult = await addResource(myLeague.leagueCode, roleId, roleName, type, count);
if(!resourceResult) return resResult(STATUS.WRONG_PARMS);
return resResult(STATUS.SUCCESS, resourceResult);
game-server/app/services/gvg/gvgPrepareService.ts
+24 -9
View File
@@ -15,6 +15,7 @@ import { addGVGReward } from "./gvgItemService";
import { getGVGConfig } from "./gvgService";
import { getProduceCoinCnt } from "./gvgItemService";
import { GVGLeagueFarmRecModel } from "../../db/GVGLeagueFarmRec";
import { addResourceRecord } from "./gvgRecService";
export function checkPreTech(techId: number, activeQueue: number[], techQueue: Tech[]) {
const dicTech = gameData.gvgTech.get(techId);
@@ -106,7 +107,7 @@ export function getMyDistribute(userDailyData: GVGUserDailyDataType) {
* @param count 数量
* @returns
*/
export async function addResource(leagueCode: string, roleId: string, resourceType: GVG_RESOURCE_TYPE, count: number) {
export async function addResource(leagueCode: string, roleId: string, roleName: string, resourceType: GVG_RESOURCE_TYPE, count: number) {
let { configId } = getGVGConfig();
let resources = getResourceCnt(resourceType, count);
if(!resources) return false;
@@ -123,6 +124,7 @@ export async function addResource(leagueCode: string, roleId: string, resourceTy
let userDailyData = await GVGUserDailyDataModel.addResource(configId, leagueCode, roleId, food, mineral, wood);
let myDistribute = getMyDistribute(userDailyData);
addResourceRecord(roleId, roleName, leagueCode, resourceType, count);
return { resource: league.resources, lv: league.lv, myDistribute }
}
@@ -138,7 +140,7 @@ function getResourceCnt(resourceType: GVG_RESOURCE_TYPE, count: number) {
}
}
export async function lockField(leagueCode: string, roleId: string, farmId: number) {
export async function lockField(leagueCode: string, roleId: string, roleName: string, farmId: number) {
let { configId } = getGVGConfig();
const produceCoinCnt = await getLockFieldCnt(leagueCode, roleId);
if(produceCoinCnt == 0) return
@@ -162,7 +164,7 @@ export async function lockField(leagueCode: string, roleId: string, farmId: numb
lands.push({ fieldId, addType });
}
// 更新田
await GVGLeagueFarmModel.lockFields(configId, leagueCode, farmId, roleId, lands);
await GVGLeagueFarmModel.lockFields(configId, leagueCode, farmId, roleId, roleName, lands);
return await GVGLeagueFarmModel.findByFarmIdAndRoleId(configId, leagueCode, farmId, roleId);
}
@@ -321,7 +323,7 @@ export function calFarmOutput(seedType: number, addType: number, farmId: number,
let { value: foodBase } = dicGVGItem;
let addRatio = seedType == addType? GVG.GVG_SP_FIELD_ADD: 0;
let farmRatio = dicFarm.fieldAdd;
let cityRatio = getCitiesAdd(cities);
let cityRatio = getCitiesAdd(cities, GVG_RESOURCE_TYPE.FOOD);
let techRatio = getTechAdd(activeTech);
return {
@@ -371,7 +373,7 @@ export function calMineOutput(farmId: number, result: [{ type: number, count: nu
output += dic.output * count;
addStrArr.push(`${dic.output}*${count}`);
}
let cityRatio = getCitiesAdd(cities);
let cityRatio = getCitiesAdd(cities, GVG_RESOURCE_TYPE.MINERAL);
let techRatio = getTechAdd(activeTech);
return {
output: Math.floor(output * (1 + (cityRatio + techRatio)/100)),
@@ -392,7 +394,7 @@ export function calForestryOutput(farmId: number, result: number, cities: number
let dicForestry = gameData.gvgResource.get(farmId);
if(!dicForestry) return { output: 0, outputStr: '' };
let base = dicForestry.woodOutput;
let cityRatio = getCitiesAdd(cities);
let cityRatio = getCitiesAdd(cities, GVG_RESOURCE_TYPE.WOOD);
let techRatio = getTechAdd(activeTech);
return {
output: Math.floor( base * (1 + (cityRatio + techRatio)/100) * result),
@@ -401,9 +403,22 @@ export function calForestryOutput(farmId: number, result: number, cities: number
}
// TODO 城池加成，多城池取最大加成
function getCitiesAdd(cities: number[]) {
return 0
// 城池加成，多城池取最大加成
function getCitiesAdd(cities: number[], resourceType: number) {
let outputAdds: number[] = [0];
for(let cityId of cities) {
let dicCity = gameData.gvgCity.get(cityId);
let dicCityAdd = gameData.gvgCityAdd.get(dicCity?.cityType);
if(!dicCity || !dicCityAdd) continue;
if(resourceType == GVG_RESOURCE_TYPE.FOOD) {
outputAdds.push(dicCityAdd.foodAdd);
} else if (resourceType == GVG_RESOURCE_TYPE.MINERAL) {
outputAdds.push(dicCityAdd.mineralAdd);
} else if (resourceType == GVG_RESOURCE_TYPE.WOOD) {
outputAdds.push(dicCityAdd.woodAdd);
}
}
return Math.max(...outputAdds);
}
// 科技树加成 叠加
game-server/app/services/gvg/gvgRecService.ts
+37
View File
@@ -0,0 +1,37 @@
// 动态
import { GVG_REC_ID, GVG_REC_TYPE, GVG_RESOURCE_TYPE } from "../../consts";
import { GVGRecModel } from "../../db/GVGRec";
import { nowSeconds } from "../../pubUtils/timeUtil";
import { getGVGConfig } from "./gvgService";
// 加入军团
export async function guildJoinLeagueRecord(leagueCode: string, guildName: string) {
await leagueJoinOrQuitGuild(leagueCode, guildName, GVG_REC_ID.LEAGUE_JOIN_GUILD);
}
// 退出军团
export async function guildQuitLeagueRecord(leagueCode: string, guildName: string) {
await leagueJoinOrQuitGuild(leagueCode, guildName, GVG_REC_ID.LEAGUE_QUIT_GUILD);
}
async function leagueJoinOrQuitGuild(leagueCode: string, guildName: string, recId: GVG_REC_ID.LEAGUE_JOIN_GUILD|GVG_REC_ID.LEAGUE_QUIT_GUILD) {
let { configId } = getGVGConfig();
let params = [guildName];
await GVGRecModel.addRec({ leagueCode, configId, type: GVG_REC_TYPE.PREPARE, recId, createTime: nowSeconds(), params })
}
// 获得资源
export async function addResourceRecord(roleId: string, roleName: string, leagueCode: string, resourceType: GVG_RESOURCE_TYPE, output: number) {
let { configId } = getGVGConfig();
let params = [roleName, getResourceNameByType(resourceType), `${output}`];
await GVGRecModel.addRec({ roleId, leagueCode, configId, type: GVG_REC_TYPE.PREPARE, recId: GVG_REC_ID.ADD_RESOURCE, createTime: nowSeconds(), params })
}
function getResourceNameByType(resourceType: GVG_RESOURCE_TYPE) {
switch(resourceType) {
case GVG_RESOURCE_TYPE.FOOD: return '粮食';
case GVG_RESOURCE_TYPE.MINERAL: return '矿物';
case GVG_RESOURCE_TYPE.WOOD: return '木堆';
}
}
game-server/app/services/gvg/gvgService.ts
+1 -1
View File
@@ -196,4 +196,4 @@ export async function calLeagueCe(league: GVGLeagueType) {
const guildCodes = league?.guildCodes||[];
const guilds = await GuildModel.findByCodes(guildCodes);
return guilds.reduce((pre, guild) => pre + guild.guildCe, 0);
}
}
game-server/app/services/gvg/gvgTeamService.ts
+2
View File
@@ -12,6 +12,7 @@ import { GVG } from "../../pubUtils/dicParam";
import { getZeroPointD } from "../../pubUtils/timeUtil";
import { resResult } from "../../pubUtils/util";
import { sendMessageToUserWithSuc } from "../pushService";
import { guildJoinLeagueRecord } from "./gvgRecService";
import { calLeagueCe, getCurPeriod, getGVGConfig, getGVGPeriodData, getGVGServerType } from "./gvgService";
/**
@@ -136,6 +137,7 @@ export async function joinGuildToLeague(league: GVGLeagueType, targetGuildCode:
league = await GVGLeagueModel.joinGuild(league.leagueCode, targetGuild);
await GuildModel.joinLeague(targetGuildCode, league.leagueCode);
guildJoinLeagueRecord(league.leagueCode, targetGuild.name);
return resResult(STATUS.SUCCESS, league);
}