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

boss返回状态改变

Browse Source
This commit is contained in:
mamengke01
2021-01-27 13:56:18 +08:00
parent 94f15e0789
commit 47aa7d2194
7 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/guildBossService.ts
+5 -5
View File
@@ -27,10 +27,10 @@ export async function getBossInstanceInfo(bossInstance: BossInstanceType, roleId
await BossInstanceModel.recordRoleIdWhenCheck(guildCode, roleId);
}
if (bossInstance.startTime < getTodayZeroPoint()) {
result.type = 1;
result.status = 1;
return result;
} else {
result.type = 2;
result.status = 2;
return result;
}
}
@@ -45,7 +45,7 @@ export async function getBossInstanceInfo(bossInstance: BossInstanceType, roleId
}
return {roleId, score, rankLv: index + 1};
});
return {warId, ranks: lastRanks, myRank, bossHp, type: 3, isBattled};
return {warId, ranks: lastRanks, myRank, bossHp, status: 3, isBattled};
}
/**
* 战斗结束返回
@@ -59,11 +59,11 @@ export async function getBossInstanceWhenEnd(bossInstance: BossInstanceType, rol
let result:any = {};
if (battleNum == winNum) {
pushRanks = deepCopy(recordRanks);
result = {warId: winWarId, bossHp: 0, type: 3};
result = {warId: winWarId, bossHp: 0, status: 3};
await BossInstanceModel.recordRoleIdWhenCheck(guildCode, roleId);
} else {
pushRanks = deepCopy(ranks);
result = {warId, bossHp, type: 3};
result = {warId, bossHp, status: 3};
}
pushRanks.sort(function(a, b) {
return b.score - a.score + a.time - b.time;
game-server/app/services/guildTrainService.ts
+6 -2
View File
@@ -1,7 +1,7 @@
import { UserGuildModel } from '../db/UserGuild';
import { getArmyTrainJuDian } from '../pubUtils/data';
import { getArmyTrainJuDian, getTrainBaseByLv } from '../pubUtils/data';
import { nowSeconds, getHourPoint } from '../pubUtils/timeUtil';
import { GUILD_REPORT_NUM, GUILD_DATA_NAME, REFRESH_HOUR } from '../consts/constModules/guildConst';
import { GUILD_REPORT_NUM, GUILD_DATA_NAME, REFRESH_HOUR, GUILD_STRUCTURE } from '../consts/constModules/guildConst';
import { GuildTrainType, GuildTrainModel, TrainInstance } from '../db/GuildTrain';
import { GuildModel } from '../db/Guild';
import { findWhere } from 'underscore';
@@ -12,6 +12,7 @@ import { MailModel, MailType } from '../db/Mail';
import { getRandomByLen, resResult } from '../pubUtils/util';
import { getRedis } from './redisService';
import { STATUS } from '../consts/statusCode';
export async function getUserGuild(roleId: string, serverId: number) {
let userGuild = await UserGuildModel.getMyGuild(roleId,'trainCount trainTime trainRewards guildCode');
if (!userGuild)
@@ -146,6 +147,8 @@ export async function resetTrain(code: string, serverId: number) {
let mails = new Array<MailType>();
let pushMessage = [];
let uids = [];
let { shilianRewardRatio } = getTrainBaseByLv(GUILD_STRUCTURE.TRAIN);
userGuildList.forEach(async function ({roleId, trainRewards}) {
let goods = [];
guildTrains.forEach(guildTrain=>{
@@ -153,6 +156,7 @@ export async function resetTrain(code: string, serverId: number) {
if (!findWhere(trainBoxs, {roleId})) {
let { heroRewards } = getArmyTrainJuDian(guildTrain.trainId);
let good = getRandomByLen(heroRewards);
good.count = Math.floor((100 + shilianRewardRatio) * good.count/100);
goods.push(good);
}
})