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/servers/battle/handler/guildRefineHandler.ts
+1 -4
View File
@@ -106,7 +106,6 @@ export class GuildRefineHandler {
const roleId: string = session.get('roleId');
const serverId: number = session.get('serverId');
const sid: string = session.get('sid');
let userGuild = await UserGuildModel.getMyGuild(roleId, 'guildCode');
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
@@ -124,13 +123,11 @@ export class GuildRefineHandler {
return resResult(STATUS.GUILD_IS_ASSISTED_SCIENCETREE);
if (scienceTree.assistRoleIds.length >= ARMY.ARMY_DEVELOPMENT_SPEEDTMES)
return resResult(STATUS.GUILD_REACH_MAX_ASSIST_COUNT);
let result = await handleCost(roleId, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: ARMY.ARMY_DEVELOPMENT_SPEEDCOST}]);
if(!result)
if (!result)
return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
scienceTree.assistRoleIds.push(roleId);
scienceTree.endTime -= scienceTree.endTime - ARMY.ARMY_DEVELOPMENT_SPEED * 60;
let { scienceTrees } = await GuildRefineModel.updateRefine(code, { scienceTrees: guildRefine.scienceTrees })
res.releaseCallback();
return resResult(STATUS.SUCCESS, { scienceTrees });
game-server/app/servers/battle/handler/guildTrainHandler.ts
+8 -2
View File
@@ -15,6 +15,7 @@ import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts/constModules/it
import { handleCost, addItems } from '../../../services/rewardService';
import { ARMY } from '../../../pubUtils/dicParam';
import { addActive } from '../../../services/guildService';
import { GUILD_STRUCTURE } from '../../../consts/constModules/guildConst';
export default function (app: Application) {
return new GuildTrainHandler(app);
}
@@ -131,14 +132,14 @@ export class GuildTrainHandler {
if (!trainInstance)
return resResult(STATUS.WRONG_PARMS);
let { trainInstances } = getArmyTrainJuDian(trainId);
let { trainInstances, soloRewardRatio } = getArmyTrainJuDian(trainId);
let instance = findWhere(trainInstances, { hid });
if (!instance)
return resResult(STATUS.WRONG_PARMS);
let trainSoloReward = getTrainSoloReward(battleRecord.record.difficulty);
if (!trainSoloReward)
return resResult(STATUS.WRONG_PARMS);
let addScore = isSuccess?trainSoloReward.winScore:trainSoloReward.failScore;
let addScore = Math.floor((isSuccess?trainSoloReward.winScore:trainSoloReward.failScore) * (soloRewardRatio + 100 ) / 100);
let goods = await addItems(roleId, roleName, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.HONOUR), count: isSuccess?trainSoloReward.failHonour:trainSoloReward.failHonour}]);
let guildTrains = [];
let trainIds = [];
@@ -210,9 +211,13 @@ export class GuildTrainHandler {
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
let { structure } = await GuildModel.findGuild(code, serverId, 'structure');
let stru = findWhere(structure, {id: 4});
let res:any = await lockData(serverId, GUILD_DATA_NAME.TRAIN_BOX, code + '_' + trainId);//加锁
if (!!res.err)
return resResult(STATUS.REDLOCK_ERR);
let { shilianRewardRatio } = getTrainBaseByLv(GUILD_STRUCTURE.TRAIN);
let { heroRewards, trainInstances } = getArmyTrainJuDian(trainId);
let { progress } = findWhere(trainInstances, {hid});
let guildTrain = await GuildTrainModel.findTrainInstanceBoxByIndex(code, roleId, trainId, hid, index, progress, nowSeconds());
@@ -222,6 +227,7 @@ export class GuildTrainHandler {
}
let good = getRandomByLen(heroRewards);
good.count = Math.floor((100 + shilianRewardRatio) * good.count/100);
let goods = await addItems(roleId, roleName, sid, [good]);
let resGuildTrain = await GuildTrainModel.receiveBoxByIndex(code, roleId, trainId, hid, index, good);