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:05:26 +08:00
parent 3e6ec77d56
commit bb2f17089e
12 changed files with 275 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
game-server/app/services/guildTrainService.ts
View File

@@ -1,17 +1,17 @@
import { UserGuildModel } from '../db/UserGuild';
import { getJobInfoById } from '../pubUtils/gamedata';
import { getArmyTrainJuDian } from '../pubUtils/data';
import { getTodayZeroPoint, nowSeconds } from '../pubUtils/timeUtil';
import { GUILD_REPORT_NUM } from '../consts/constModules/guildConst';
import { GuildTrainType, GuildTrainModel } from '../db/GuildTrain';
import { GuildTrainType, GuildTrainModel, TrainInstance } from '../db/GuildTrain';
import { GuildModel } from '../db/Guild';
import { findWhere } from 'underscore';
export async function getUserGuild(roleId: string, code: string) {
export async function getUserGuild(roleId: string) {
let userGuild = await UserGuildModel.getMyGuild(roleId,'trainCount trainTime trainRewards');
if (!userGuild||userGuild.guildCode != code)
if (!userGuild)
return;
let { trainCount, trainTime} = userGuild;
if (trainTime < getTodayZeroPoint()) {
trainCount = 0;
trainCount = 2;
}
userGuild = await UserGuildModel.updateInfo(roleId, {trainCount, trainTime: nowSeconds()});
return userGuild;
@@ -37,16 +37,21 @@ export function getGuildTrain (guildTrains, trainCount:number, trainRewards: Arr
return { list, trainCount, trainRewards};
}
export function getGuildTrainRewards (guildTrain) {
let trainBoxs = guildTrain.trainScripts.map(({hid, trainBoxs})=>{
return {hid, recordBoxs: trainBoxs};
export function getGuildTrainRewards (guildTrain) {
let { trainInstances: instances } = getArmyTrainJuDian(guildTrain.trainId);
let trainBoxs = guildTrain.trainInstances.map(({hid, trainBoxs, endTime})=>{
let instance = findWhere(instances, { hid });
let isComplete = false;
if ( guildTrain.progress >= instance.progress)
isComplete = true;
return {hid, recordBoxs: trainBoxs, trainId: guildTrain.trainId, endTime, isComplete};
})
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})=>{
guildTrains.map(({trainId, isComplete, trainInstances, ranks, reports})=>{
if (trainIds.indexOf(trainId) == -1) {
return;
}
@@ -59,10 +64,15 @@ export function getGuildTrainInfo (guildTrains: Array<GuildTrainType>, roleId:
myRank = {roleId: rankRoleId, score, rankLv: index+1};
return {roleId: rankRoleId, score, rankLv: index+1};
});
let { trainInstances: instances } = getArmyTrainJuDian(trainId);
let resTrainBoxs = [];
let resTrainScripts = trainScripts.map(({hid, progress, time, trainBoxs})=>{
resTrainBoxs.push({hid, recordBoxs: trainBoxs});
return {hid, progress, time};
let resTrainInstances = trainInstances.map(({hid, progress, endTime, trainBoxs})=>{
let instance = findWhere(instances, { hid });
let isComplete = false;
if ( progress >= instance.progress)
isComplete = true;
resTrainBoxs.push({hid, recordBoxs: trainBoxs, trainId, endTime, isComplete});
return {hid, progress, endTime, isComplete};
})
let lastGuildTrain = findWhere(guildTrains, { trainId: trainId - 1});
if (!!lastGuildTrain) {
@@ -74,17 +84,17 @@ export function getGuildTrainInfo (guildTrains: Array<GuildTrainType>, roleId:
reports = [...trainReports, ...reports];
}
let flag = false;
let lastTrainBoxs = lastGuildTrain.trainScripts.map(({hid, time, trainBoxs}) => {
if (time + 24 * 60 * 60 < nowSeconds()) {
let lastTrainBoxs = lastGuildTrain.trainInstances.map(({hid, endTime, trainBoxs}) => {
if (endTime < nowSeconds()) {
flag = true;
}
return {};
return {hid, recordBoxs: trainBoxs, trainId: lastGuildTrain.trainId, endTime, isComplete: true};
});
if (flag) {
resTrainBoxs.push(...lastTrainBoxs);
}
}
guildTrain = {trainId, isComplete, trainScripts: resTrainScripts, trainBoxs: resTrainBoxs, reports, myRank, ranks: resRanks};
guildTrain = {trainId, isComplete, trainInstances: resTrainInstances, trainBoxs: resTrainBoxs, reports, myRank, ranks: resRanks};
});
return { guildTrain, trainCount, trainRewards};
}
@@ -94,8 +104,19 @@ 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});
let { trainInstances } = getArmyTrainJuDian(trainId);
// 初始化
let instances:Array<TrainInstance> = trainInstances.map(trainInstance => {
let t = new TrainInstance();
t.hid = trainInstance.hid;
t.progress = 0;
t.endTime = 0;
t.trainBoxs = [];
return t;
});
guildTrain = await GuildTrainModel.openGuildTrain(code, trainId, instances);
await GuildModel.updateInfo(code, {trainId}, {});
return guildTrain;
}