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

军团表逻辑

Browse Source
This commit is contained in:
mamengke01
2021-01-23 17:04:25 +08:00
parent b5d84c03e4
commit 3e6ec77d56
30 changed files with 4838 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/guildBossService.ts
+21 -20
View File
@@ -1,4 +1,4 @@
import { BossScriptType, BossScriptModel } from '../db/BossScript';
import { BossInstanceType, BossInstanceModel } from '../db/BossInstance';
import { getTodayZeroPoint, nowSeconds } from '../pubUtils/timeUtil';
import { lockData } from '../services/redLockService';
import { findIndex, indexBy, values } from 'underscore';
@@ -10,22 +10,22 @@ import { deepCopy, resResult } from '../pubUtils/util';
import { BattleRecordModel } from '../db/BattleRecord';
/**
*
* @param bossScript
* @param bossInstance
* @param roleId
*/
export async function getBossScriptInfo(bossScript: BossScriptType, roleId:string) {
let { warId, ranks, bossHp, winWarId, winTime, roleIdRecords, guildCode } = bossScript;
export async function getBossInstanceInfo(bossInstance: BossInstanceType, roleId:string) {
let { warId, ranks, bossHp, winWarId, winTime, roleIdRecords, guildCode } = bossInstance;
ranks.sort(function(a, b) {
return b.score - a.score + a.time - b.time;
});
let result:any = {};
//1：等待团长开启，2：今日已开启，且boss通关，3：开启中
if ( bossScript.bossHp <= 0 ) {
if ( bossInstance.bossHp <= 0 ) {
if (!!winWarId && winTime > getTodayZeroPoint() && roleIdRecords.indexOf(roleId) == -1) {
result = { winWarId };
await BossScriptModel.recordRoleIdWhenCheck(guildCode, roleId);
await BossInstanceModel.recordRoleIdWhenCheck(guildCode, roleId);
}
if (bossScript.time < getTodayZeroPoint()) {
if (bossInstance.startTime < getTodayZeroPoint()) {
result.type = 1;
return result;
} else {
@@ -36,7 +36,7 @@ export async function getBossScriptInfo(bossScript: BossScriptType, roleId:strin
let isBattled = false;
let myRank = {};
ranks.forEach(({roleId: battleRoleId, score, time}, index) => {
let lastRanks = ranks.map(({roleId: battleRoleId, score, time}, index) => {
if (roleId == battleRoleId) {
myRank = {roleId, score, rankLv: index + 1};
if (time >= getTodayZeroPoint())
@@ -44,22 +44,22 @@ export async function getBossScriptInfo(bossScript: BossScriptType, roleId:strin
}
return {roleId, score, rankLv: index + 1};
});
return {warId, ranks, myRank, bossHp, type: 3, isBattled};
return {warId, ranks: lastRanks, myRank, bossHp, type: 3, isBattled};
}
/**
* 战斗结束返回
* @param bossScript
* @param bossInstance
* @param roleId
* @param battleNum
*/
export async function getBossScriptWhenEnd(bossScript: BossScriptType, roleId:string, battleNum:number) {
let { warId, ranks, bossHp, winWarId, guildCode, recordRanks, winNum } = bossScript;
export async function getBossInstanceWhenEnd(bossInstance: BossInstanceType, roleId:string, battleNum:number) {
let { warId, ranks, bossHp, winWarId, guildCode, recordRanks, winNum } = bossInstance;
let pushRanks;
let result:any = {};
if (battleNum == winNum) {
pushRanks = deepCopy(recordRanks);
result = {warId: winWarId, bossHp: 0, type: 3};
await BossScriptModel.recordRoleIdWhenCheck(guildCode, roleId);
await BossInstanceModel.recordRoleIdWhenCheck(guildCode, roleId);
} else {
pushRanks = deepCopy(ranks);
result = {warId, bossHp, type: 3};
@@ -94,10 +94,10 @@ export async function bossResult(code: string, serverId: string, dataName: strin
let res:any = await lockData(serverId, dataName, code);//加锁
if (!!res.err)
return true;
let {winSettled, ranks, num, warId, bossHp} = await BossScriptModel.findBossScript(code);//锁定关卡信息
let {winSettled, ranks, num, warId, bossHp} = await BossInstanceModel.findBossInstance(code);//锁定关卡信息
if (winSettled) {
res.releaseCallback();//解锁
await BossScriptModel.recordRoleIdWhenCheck(code, roleId);
await BossInstanceModel.recordRoleIdWhenCheck(code, roleId);
return true;
}
let index = findIndex(ranks, {roleId});
@@ -110,7 +110,7 @@ export async function bossResult(code: string, serverId: string, dataName: strin
res.releaseCallback();//解锁
return true;
}
let { recordRanks } = await BossScriptModel.updateBossScript(code, { bossHp: 0, winSettled: true, ranks, recordRanks: ranks, winNum: num, winWarId: warId, roleIdRecords:[roleId]}, );
let { recordRanks } = await BossInstanceModel.updateBossInstance(code, { bossHp: 0, winSettled: true, ranks, recordRanks: ranks, winNum: num, winWarId: warId, roleIdRecords:[roleId]}, );
await pushBossHpMessage(code, serverId, 0, true);
res.releaseCallback();//数据修改解锁
recordRanks.sort(function(a, b) {
@@ -137,7 +137,7 @@ export async function bossResult(code: string, serverId: string, dataName: strin
return true;
}
export async function addBossScript(code: string, serverId:string, roleId: string) {
export async function addBossInstance(code: string, serverId:string, roleId: string) {
let loginKey = 'login_roleId_' + roleId;
let sid = await getRedis(loginKey);
let key = 'serverId_' + serverId + 'guildCode_' + code;
@@ -148,12 +148,13 @@ export async function addBossScript(code: string, serverId:string, roleId: strin
export async function pushBossHpMessage(code: string, serverId:string, bossHp:number, isDelKey?: boolean ) {
let key = 'serverId_' + serverId + 'guildCode_' + code;
let members = await smembersAsync(key);
members.forEach(member=>{
let uids = members.map(member=>{
let arr = member.split('|');
let uid = arr[0];
let sid = arr[1];
pinus.app.channelService.pushMessageByUids('onBossHpUpdate', resResult(STATUS.SUCCESS, {bossHp}), [{uid, sid}]);
return {uid, sid};
});
pinus.app.channelService.pushMessageByUids('onBossHpUpdate', resResult(STATUS.SUCCESS, {bossHp}), uids);
if (isDelKey) {
delAsync(key);
}
@@ -170,7 +171,7 @@ export async function checkMemberExists(code: string, serverId:string, roleId: s
if(!battleRecord || battleRecord.status != 0 || roleId != battleRecord.roleId) {
return false;
}
addBossScript(code, serverId, roleId);
addBossInstance(code, serverId, roleId);
flag = true;
}
return flag;
game-server/app/services/guildTrainService.ts
+49 -12
View File
@@ -3,6 +3,7 @@ import { getJobInfoById } from '../pubUtils/gamedata';
import { getTodayZeroPoint, nowSeconds } from '../pubUtils/timeUtil';
import { GUILD_REPORT_NUM } from '../consts/constModules/guildConst';
import { GuildTrainType, GuildTrainModel } from '../db/GuildTrain';
import { GuildModel } from '../db/Guild';
import { findWhere } from 'underscore';
export async function getUserGuild(roleId: string, code: string) {
let userGuild = await UserGuildModel.getMyGuild(roleId,'trainCount trainTime trainRewards');
@@ -28,31 +29,64 @@ export async function recordUserGuild(roleId: string, code: string) {
return userGuild;
}
export function getGuildTrain (guildTrains, trainCount:number, trainRewards: Array<number>) {
let list = [];
list = guildTrains.map(({trainId, isComplete})=>{
return ({trainId, isComplete, });
});
return { list, trainCount, trainRewards};
}
export function getGuildTrainInfo (guildTrains: Array<GuildTrainType>, roleId: string, trainCount:number, trainRewards: Array<number>) {
guildTrains.forEach(({trainId, isComplete, trainScripts, ranks, reports})=>{
export function getGuildTrainRewards (guildTrain) {
let trainBoxs = guildTrain.trainScripts.map(({hid, trainBoxs})=>{
return {hid, recordBoxs: trainBoxs};
})
return { trainBoxs};
}
export function getGuildTrainInfo (guildTrains: Array<GuildTrainType>, roleId: string, trainCount:number, trainRewards: Array<number>, trainIds:Array<number>) {
let guildTrain;
guildTrains.map(({trainId, isComplete, trainScripts, ranks, reports})=>{
if (trainIds.indexOf(trainId) == -1) {
return;
}
ranks.sort(function(a, b) {
return b.score - a.score;
});
let myRank = {};
ranks.forEach(({roleId: rankRoleId, score}, index)=>{
let resRanks = ranks.map(({roleId: rankRoleId, score}, index)=>{
if (roleId == rankRoleId)
myRank = {roleId: rankRoleId, score, rankLv: index+1};
return {roleId: rankRoleId, score, rankLv: index+1};
});
let guildTrain = findWhere(guildTrains, { trainId: trainId - 1});
if (!!guildTrain) {
let lenNum = guildTrain.reports.length;
let resTrainBoxs = [];
let resTrainScripts = trainScripts.map(({hid, progress, time, trainBoxs})=>{
resTrainBoxs.push({hid, recordBoxs: trainBoxs});
return {hid, progress, time};
})
let lastGuildTrain = findWhere(guildTrains, { trainId: trainId - 1});
if (!!lastGuildTrain) {
let lenNum = lastGuildTrain.reports.length;
if (lenNum < GUILD_REPORT_NUM)
reports = [...guildTrain.reports, ...reports]
reports = [...lastGuildTrain.reports, ...reports];
else {
let trainReports = guildTrain.reports.splice(lenNum - GUILD_REPORT_NUM - 1, GUILD_REPORT_NUM);
reports = [...trainReports, ...reports]
let trainReports = lastGuildTrain.reports.splice(lenNum - GUILD_REPORT_NUM - 1, GUILD_REPORT_NUM);
reports = [...trainReports, ...reports];
}
let flag = false;
let lastTrainBoxs = lastGuildTrain.trainScripts.map(({hid, time, trainBoxs}) => {
if (time + 24 * 60 * 60 < nowSeconds()) {
flag = true;
}
return {};
});
if (flag) {
resTrainBoxs.push(...lastTrainBoxs);
}
}
return {trainId, isComplete, trainScripts, reports, myRank, ranks};
guildTrain = {trainId, isComplete, trainScripts: resTrainScripts, trainBoxs: resTrainBoxs, reports, myRank, ranks: resRanks};
});
return { list: guildTrains, trainCount, trainRewards};
return { guildTrain, trainCount, trainRewards};
}
export async function lockTrain(code: string, trainId: number) {
@@ -60,5 +94,8 @@ export async function lockTrain(code: string, trainId: number) {
if (!!guildTrain) {
return;
}
let trainScripts;
guildTrain = await GuildTrainModel.openGuildTrain(code, trainId, trainScripts);
await GuildModel.updateInfo(code, {trainId});
return guildTrain;
}
game-server/app/services/redLockService.ts
+4 -2
View File
@@ -49,7 +49,10 @@ export async function lockData(serverId: string, dataName: string, id: string )
let key = 'serverId_'+serverId+'_'+dataName+'_'+id;
let lockKey = 'locks:' + key;
console.log(' lockKey = '+ lockKey);
_redlockCache.redlock.lock(lockKey, _redlockCache.ttl).then(function(lock) {
return await lock(lockKey);
}
function lock(lockKey: string) {
return _redlockCache.redlock.lock(lockKey, _redlockCache.ttl).then(function(lock) {
setLock(lockKey, lock);
return {err: null, releaseCallback: releaseCallback.bind(null, lockKey)};
}).catch(function(err) {
@@ -57,7 +60,6 @@ export async function lockData(serverId: string, dataName: string, id: string )
return { err };
});
}
export async function releaseCallback(lockKey: string) {
releaseLock(lockKey);
}