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

军团活动：诸侯混战城门血量

Browse Source
This commit is contained in:
luying
2022-03-01 10:10:11 +08:00
parent 478bfd5ddd
commit c5e5ca4b51
19 changed files with 231 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/chat/remote/guildRemote.ts
+3 -2
View File
@@ -311,11 +311,12 @@ export class GuildRemote {
* @param cityId 城池
* @param gateHp 血条
*/
public async pushCityGateHp(cityId: number, gateHp: number) {
public async pushCityGateHp(cityId: number, gateHp: number, maxHp: number) {
try {
this.pushMessageToCity(cityId, this.GUILD_CITY_ACT_HP, {
cityId,
gateHp
gateHp,
maxHp
});
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
game-server/app/servers/guild/handler/cityActivityHandler.ts
+14 -12
View File
@@ -1,7 +1,7 @@
import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus";
import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, GUILD_POINT_WAYS, CITY_STATUS, TASK_TYPE, ITEM_CHANGE_REASON } from "../../../consts";
import { resResult } from "../../../pubUtils/util";
import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, getMedianCe } from "../../../services/guildActivity/guildActivityService";
import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, getPreDayActiveData } from "../../../services/guildActivity/guildActivityService";
import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
import { gameData } from "../../../pubUtils/data";
import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
@@ -17,6 +17,7 @@ import { Rank } from "../../../services/rankService";
import { checkActivityTask, checkTask } from "../../../services/taskService";
import { guildInter } from "../../../pubUtils/interface";
import { dispatch } from "../../../pubUtils/dispatcher";
import { ServerRecordModel } from "../../../db/ServerRecords";
export default function (app: Application) {
new HandlerService(app, {});
@@ -68,7 +69,7 @@ export class CityActivityHandler {
let dicCity = gameData.cityActivity.get(cityId);
if (!dicCity) return resResult(STATUS.DIC_DATA_NOT_FOUND);
let obj = getCityActivityObj();
let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
let {gateHp, maxHp} = await obj.getGateHpAndInc(serverId, cityId);
let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
if (!guildActivityRec) return resResult(STATUS.WRONG_PARMS);
@@ -99,7 +100,7 @@ export class CityActivityHandler {
cityId,
...statusResult,
cityStatus,
gateHp,
gateHp, maxHp,
challengeTime,
...ranks
});
@@ -112,8 +113,6 @@ export class CityActivityHandler {
const serverId = session.get('serverId');
const guildCode = session.get('guildCode');
//TODO 权限校验&时间校验
let { cityId } = msg;
let dicCity = gameData.cityActivity.get(cityId);
if (dicCity.preCity.length > 0) return resResult(STATUS.CAN_NOT_DECLARE);
@@ -158,7 +157,7 @@ export class CityActivityHandler {
const dicCity = gameData.cityActivity.get(cityId);
let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
let { gateHp, maxHp } = await obj.getGateHpAndInc(serverId, cityId);
if (gateHp <= 0) return resResult(STATUS.GATE_HP_IS_ZERO);
let statusResult = getGuildActivityStatus(this.aid);
@@ -188,6 +187,8 @@ export class CityActivityHandler {
const dbCities = await GuildActivityCityModel.getAllCities(serverId);
let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity, dbCities);
// 全服活跃统计
await ServerRecordModel.addActiveGuild(serverId, guildCode);
// 任务
await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
@@ -195,14 +196,14 @@ export class CityActivityHandler {
await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
// 前一天中位数战力
let medianCe = await getMedianCe(serverId);
let medianCe = await getPreDayActiveData(serverId);
return resResult(STATUS.SUCCESS, {
code,
cityId,
cityStatus,
...statusResult,
gateHp,
gateHp, maxHp,
guildScore,
myScore: 0,
medianCe
@@ -252,7 +253,7 @@ export class CityActivityHandler {
const dicCity = gameData.cityActivity.get(cityId);
let obj = getCityActivityObj();
let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
let { gateHp, maxHp } = await obj.getGateHpAndInc(serverId, cityId);
if (gateHp <= 0) return resResult(STATUS.GATE_HP_IS_ZERO);
let statusResult = getGuildActivityStatus(this.aid);
@@ -272,14 +273,14 @@ export class CityActivityHandler {
let guildScore = await r.setRankWithGuildInfo(guildCode, damage, Date.now(), null, true);
await r.setExpire(tomorrow);
gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp, -1 * damage);
({gateHp, maxHp} = await obj.getGateHpAndInc(serverId, cityId, -1 * damage));
if (gateHp <= 0) {
// 推送 停止活动并结算奖励
await sendSingleCityActEndMsg(cityId, serverId);
}
// 推送 城门血量
let chatSid = await getCityChannelSid(cityId);
pinus.app.rpc.chat.guildRemote.pushCityGateHp.toServer(chatSid, cityId, gateHp);
pinus.app.rpc.chat.guildRemote.pushCityGateHp.toServer(chatSid, cityId, gateHp, maxHp);
await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.broadcast(this.aid);
return resResult(STATUS.SUCCESS, {
@@ -326,7 +327,7 @@ export class CityActivityHandler {
let myScore = await myR.getMyScore({ roleId });
let r = new Rank(REDIS_KEY.CITY_ACTIVITY, { serverId, cityId }, true);
let guildScore = await r.getMyScore({ guildCode });
let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
let { gateHp, maxHp } = await obj.getGateHpAndInc(serverId, cityId);
return resResult(STATUS.SUCCESS, {
isSuccess,
@@ -335,6 +336,7 @@ export class CityActivityHandler {
guildScore,
myScore,
gateHp,
maxHp,
challengeTime: myGuildActivityRec.challengeTime
});
}
game-server/app/servers/guild/handler/gateActivityHandler.ts
+4 -5
View File
@@ -1,5 +1,5 @@
import { Application, BackendSession, ChannelService, pinus, HandlerService, } from "pinus";
import { getMedianCe, getGuildActivityStatus, getRecordScore, getGateActivityObj, participants, getGateActivityRank, getCityActivityObj } from "../../../services/guildActivity/guildActivityService";
import { getGuildActivityStatus, getRecordScore, getGateActivityObj, participants, getGateActivityRank, getCityActivityObj } from "../../../services/guildActivity/guildActivityService";
import { resResult } from "../../../pubUtils/util";
import { STATUS, GUILD_ACTIVITY_TYPE, GUILD_POINT_WAYS, ENEMIES_TYPE, GET_POINT_WAYS, TASK_TYPE } from "../../../consts";
import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
@@ -16,6 +16,7 @@ import { Rank } from "../../../services/rankService";
import { getTimeFun, getZeroPointD } from "../../../pubUtils/timeUtil";
import { checkActivityTask, checkTask } from "../../../services/taskService";
import { guildInter } from "../../../pubUtils/interface";
import { ServerRecordModel } from "../../../db/ServerRecords";
export default function (app: Application) {
new HandlerService(app, {});
@@ -92,9 +93,8 @@ export class GateActivityHandler {
// 返回当前军团总军功
let r = new Rank(REDIS_KEY.GATE_ACTIVITY, { serverId }, true);
let guildScore = await r.getMyScore({ guildCode });
// 前一天中位数战力
let medianCe = await getMedianCe(serverId);
// 全服活跃统计
await ServerRecordModel.addActiveGuild(serverId, guildCode);
// 任务
await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
@@ -107,7 +107,6 @@ export class GateActivityHandler {
guildScore: guildScore || 0,
myScore: 0,
challengeCnt: GUILDACTIVITY.GATEACTIVITY_CHALLENGE_TIMES - challengeCnt,
medianCe
});
}
game-server/app/servers/guild/handler/guildBossHandler.ts
+4 -3
View File
@@ -22,7 +22,7 @@ import { getGoldObject } from '../../../pubUtils/itemUtils';
import { RoleModel } from '../../../db/Role';
import { sendMailToGuildByContent } from '../../../services/mailService';
import { genAuction } from '../../../services/auctionService';
import { getMedianCe } from '../../../services/guildActivity/guildActivityService';
import { getPreDayActiveData } from '../../../services/guildActivity/guildActivityService';
export default function (app: Application) {
new HandlerService(app, {});
@@ -63,8 +63,9 @@ export class GuildHandler {
}
let bossBase = getBossByLv(curStructure.lv);
let { bossHp: minBossHp, warId } = getRandSingleEelm(bossBase.wars);
let medianCe = await getMedianCe(serverId);
let bossHp = Math.ceil(medianCe * bossBase.ratio);
let medianCe = await getPreDayActiveData(serverId);
// let bossHp = Math.ceil(medianCe * bossBase.ratio);
let bossHp = 10000;
console.log('******* openBossInstance', medianCe, bossHp, minBossHp)
if(bossHp < minBossHp) bossHp = minBossHp;
game-server/app/servers/guild/handler/raceActivityHandler.ts
+3 -1
View File
@@ -10,6 +10,7 @@ import { Rank } from "../../../services/rankService";
import { checkActivityTask, checkTask } from "../../../services/taskService";
import { guildInter } from "../../../pubUtils/interface";
import { getGuildChannelSid } from "../../../services/chatService";
import { ServerRecordModel } from "../../../db/ServerRecords";
export default function (app: Application) {
new HandlerService(app, {});
@@ -89,7 +90,8 @@ export class RaceActivityHandler {
let events = obj.getEvents(guildCode, woodenHorse.distance);
let chatSid = await getGuildChannelSid(guildCode);
this.app.rpc.chat.guildRemote.pushRaceHorseJoin.toServer(chatSid, guildCode, woodenHorse);
// 全服活跃统计
await ServerRecordModel.addActiveGuild(serverId, guildCode);
// 任务
await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
//成长任务
game-server/app/services/connectorService.ts
+7 -3
View File
@@ -31,7 +31,7 @@ import { getEvent } from './eventSercive';
import { getBattleListOfMain } from './normalBattleService';
import { GuildType } from '../db/Guild';
import UserGuild, { UserGuildType } from '../db/UserGuild';
import { setMedianCe, getAllGuildActivityStatus } from './guildActivity/guildActivityService';
import { setPreDayActiveData, getAllGuildActivityStatus } from './guildActivity/guildActivityService';
import { getAllOnlineRoles } from './redisService';
import Item from '../db/Item';
import { PvpDefenseModel } from '../db/PvpDefense';
@@ -236,6 +236,11 @@ async function getGuildEntryData(role: RoleType, sid: string, session: FrontendO
}
export async function everydayRefresh() {
pushRefreshTime();
setPreDayActiveData();
}
async function pushRefreshTime() {
let allOnlineUsers = await getAllOnlineRoles();
let todayZeroPoint = getZeroPoint();
let n = Math.ceil(allOnlineUsers.length / PUSH_BATCH); // 一共多少批
@@ -252,8 +257,7 @@ export async function everydayRefresh() {
} else {
clearInterval(interval);
}
}, PUSH_INTERVAL)
setMedianCe();
}, PUSH_INTERVAL);
}
export async function kickUser(app: Application, uid: string, message = STATUS.LOGIN_ERR) {
game-server/app/services/guildActivity/cityActivityObj.ts
+8 -3
View File
@@ -1,10 +1,12 @@
// 军团活动蛮夷入侵城门血量等数据存储
import { Member } from "../../domain/battleField/guildActivity";
import { getCityActivityGateHp } from "./guildActivityService";
// 军团诸侯混战等数据
export class CityActivityObject {
private gateHp: Map<string, number> = new Map(); // 城门血条，每个cityId有一条血条 serverId&cityId => gateHp
private maxHp: Map<string, number> = new Map(); // 城门血条，每个cityId最大城门血量 serverId&cityId => gateHp
private members: Map<string, Array<Member>> = new Map(); // 每个军团参与的成员 guildCode => [{roleId, job}]
private cities: Map<string, string[]> = new Map(); // 各个城池参与的军团 serverId&cityId => [guildCode]
private guilds: Map<string, number> = new Map(); // 军团所在的城池 guildCode => cityId
@@ -27,6 +29,7 @@ export class CityActivityObject {
let key = this.getKey(serverId, cityId);
return {
gateHp: this.gateHp.get(key),
maxHp: this.maxHp.get(key),
members: this.members.get(guildCode),
city: this.cities.get(key),
guild: this.guilds.get(guildCode)
@@ -55,18 +58,20 @@ export class CityActivityObject {
return this.members.get(guildCode)||[];
}
public getGateHpAndInc(serverId: number, cityId: number, maxHp: number, inc: number = 0) {
public async getGateHpAndInc(serverId: number, cityId: number, inc: number = 0) {
let key = this.getKey(serverId, cityId);
let gateHp = this.gateHp.get(key);
if(!this.gateHp.has(key)) {
gateHp = maxHp;
gateHp = await getCityActivityGateHp(serverId, cityId);
this.gateHp.set(key, gateHp);
this.maxHp.set(key, gateHp);
}
if(inc != 0) {
gateHp += inc;
this.gateHp.set(key, gateHp);
}
if(gateHp <= 0) gateHp = 0;
return gateHp
return { gateHp, maxHp: this.maxHp.get(key)||0 }
}
public getHistoryCity(roleId: string) {
game-server/app/services/guildActivity/guildActivityService.ts
+57 -20
View File
@@ -4,7 +4,7 @@ import { reduceCe } from "../../pubUtils/util";
import { GUILDACTIVITY } from "../../pubUtils/dicParam";
import { gameData, getGuildAuctionRewards, getCityActivityRewards } from "../../pubUtils/data";
import { getCurDay, nowSeconds, getTimeFun } from "../../pubUtils/timeUtil";
import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY, AUCTION_SOURCE, MAIL_TYPE, CITY_STATUS, DEBUG_MAGIC_WORD, GUILD_POINT_WAYS, TASK_TYPE, AUCTION_TIME } from "../../consts";
import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY, AUCTION_SOURCE, MAIL_TYPE, CITY_STATUS, DEBUG_MAGIC_WORD, GUILD_POINT_WAYS, TASK_TYPE, AUCTION_TIME, CITY_ACTIVITY_DOOR, ABI_TYPE } from "../../consts";
import { Record, UserGuildActivityRecModel } from "../../db/UserGuildActivityRec";
import { GateMembersRec, CityParam, Member, WoodenHorse } from "../../domain/battleField/guildActivity";
import { DicGuildActivity } from "../../pubUtils/dictionary/DicGuildActivity";
@@ -27,6 +27,8 @@ import { UserGuildModel } from "../../db/UserGuild";
import { raceActivityEnd } from "../timeTaskService";
import { addActive } from "../guildService";
import { checkTask, checkActivityTask } from "../taskService";
import { ActivePlayer, ServerRecordModel } from "../../db/ServerRecords";
import { Attack } from "../../domain/battleField/pvp";
let gateActivityObj: GateActivityObject;
let cityActivityObj: CityActivityObject;
@@ -55,19 +57,19 @@ export function getRaceActivityObj() {
/**
* 定时任务，获得前一天的活跃玩家中位数武将战力
*/
export async function setMedianCe() {
export async function setPreDayActiveData() {
let servers = await ServerlistModel.findByEnv(pinus.app.get('env'));
for (let server of servers) {
let medianRole = await RoleModel.getMedianRole(server.id);
if (!medianRole) {
await ServerlistModel.updateByServerId(server.id, { medianCe: GUILDACTIVITY.GATEACTIVITY_ENEMYCE });
} else {
let { topLineup } = medianRole;
let topHero = topLineup.sort((a, b) => b.ce - a.ce);
let medianCe = reduceCe(topHero[0].ce);
await ServerlistModel.updateByServerId(server.id, { medianCe });
}
let roles = await RoleModel.getActivePlayers(server.id);
let activePlayerCnt = roles.length;
let activePlayerCe = 0, activePlayers: ActivePlayer[] = []
for(let i = 0; i < 10; i++) {
if(!roles[i]) break;
activePlayerCe += roles[i].topLineupCe;
activePlayers.push(new ActivePlayer(roles[i]));
}
await ServerRecordModel.updateData(server.id, { activePlayerCnt, activePlayerCe: reduceCe(activePlayerCe), activePlayers });
}
return servers;
}
@@ -77,12 +79,9 @@ export async function setMedianCe() {
* 获得本服前一天活跃玩家中位数玩家的最强武将战力
* @param serverId
*/
export async function getMedianCe(serverId: number) {
let server = await ServerlistModel.findByServerId(serverId);
if (server) {
return server.medianCe;
}
return GUILDACTIVITY.GATEACTIVITY_ENEMYCE;
export async function getPreDayActiveData(serverId: number) {
let record = await ServerRecordModel.findTodayData(serverId);
return record;
}
/**
@@ -303,9 +302,7 @@ export async function sendGuildActEndMsg(aid: number) {
if (aid == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
let obj = getGateActivityObj();
console.log('******** gateActivity', obj);
let guilds = obj.getGuilds();
console.log('******** guilds', guilds);
for (let [serverId, guildCodes] of guilds) {
// console.log('***** serverId', serverId, 'guildCodes', guildCodes);
for (let guildCode of guildCodes) {
@@ -447,7 +444,7 @@ export async function cityActivitySettleReward(cityId: number, serverId: number)
let dicCity = gameData.cityActivity.get(cityId);
if (!dicCity) return;
let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp);
let {gateHp} = await obj.getGateHpAndInc(serverId, cityId);
let isSuccess = gateHp <= 0; // 血条未击破则没有占领军团
let r = new Rank(REDIS_KEY.CITY_ACTIVITY, { serverId, cityId }, true);
@@ -791,4 +788,44 @@ export async function setDicAuctionTime(startTime: number, endActivity: number,
function formatTime(date: Date) {
return { hour: date.getHours(), minute: date.getMinutes(), seconds: date.getSeconds() }
}
export async function getCityActivityGateHp(serverId: number, cityId: number) {
console.log(`getCityActivityGateHp: serverId ${serverId}, cityId ${cityId}`);
let dicCityActivity = gameData.cityActivity.get(cityId);
let serverRecord = await ServerRecordModel.findTodayData(serverId);
if(!serverRecord) return dicCityActivity.hp;
let activePlayerCnt = 1, activePlayerCe = 0, activeTopPlayerCnt = 1, activeGuildCnt = 1;
if(serverRecord) {
if(serverRecord.activePlayerCnt > 0) activePlayerCnt = serverRecord.activePlayerCnt;
if(serverRecord.activePlayerCe > 0) activePlayerCe = serverRecord.activePlayerCe;
if(serverRecord.activePlayers?.length > 0) activeTopPlayerCnt = serverRecord.activePlayers?.length;
if(serverRecord.activeGuildCodes?.length > 0) activeGuildCnt = serverRecord.activeGuildCodes?.length;
}
console.log(`getCityActivityGateHp: activePlayerCnt ${activePlayerCnt}, activePlayerCe ${activePlayerCe}, activeTopPlayerCnt ${activeTopPlayerCnt} activeGuildCnt ${activeGuildCnt}`);
let dicWarJson = gameData.warJson.get(dicCityActivity.warid);
let dicDoor = dicWarJson.find(cur => cur.actorId == CITY_ACTIVITY_DOOR);
let attribute = dicDoor.attribute.find(cur => cur.id == ABI_TYPE.ABI_ATK);
let atk = attribute? attribute.val: 0;
console.log(`getCityActivityGateHp: atk ${atk}`);
let A = activePlayerCe/activeTopPlayerCnt/6/GUILDACTIVITY.GATEACTIVITY_ENEMYCE;
if(A < 1) A = 1;
console.log(`getCityActivityGateHp: A ${A}`);
let gateHpBase = A * atk;
let N = dicCityActivity.hpN;
console.log(`getCityActivityGateHp: gateHpBase ${gateHpBase}, N ${N}`);
let gateHp = Math.floor(gateHpBase * (activePlayerCnt/activeGuildCnt) * N);
console.log(`getCityActivityGateHp: gateHp ${gateHp}`);
if(gateHp == 0) {
gateHp = dicCityActivity.hp;
}
return gateHp;
}