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

军团：添加活跃值id改为枚举

Browse Source
This commit is contained in:
luying
2021-02-23 11:18:41 +08:00
parent 97e5456b21
commit 0fc828793a
7 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game-server/app/servers/battle/handler/donateHandler.ts
View File

@@ -7,7 +7,7 @@ import { nowSeconds } from '../../../pubUtils/timeUtil';
import { getArmyDonateBaseByLv, getArmyDonateBoxBaseById } from '../../../pubUtils/data';
import { GuildModel } from '../../../db/Guild';
import { handleCost, addItems } from '../../../services/rewardService';
import { CHAT_SERVER } from '../../../consts';
import { CHAT_SERVER, GUILD_POINT_WAYS } from '../../../consts';
import { getDonation } from '../../../services/donateService';
import { getUserGuildWithRefActive } from '../../../services/guildService';
import { ARMY } from '../../../pubUtils/dicParam';
@@ -60,7 +60,7 @@ export class DonationHandler {
//增加基金
const { fund } = await GuildModel.updateInfo(code, {}, { fund: rewardFund }, 'fund');
this.app.rpc.chat.guildRemote.updateInfo.toServer(CHAT_SERVER, code, { fund });
await addActive(roleId, serverId, 1, id);
await addActive(roleId, serverId, GUILD_POINT_WAYS.DONATE, id);
return resResult(STATUS.SUCCESS, { donateFund, reports, donateCnt, goods });
}

4
game-server/app/servers/battle/handler/guildBossHandler.ts
View File

@@ -6,7 +6,7 @@ import { BattleRecordModel } from '../../../db/BattleRecord';
import { nowSeconds, getTodayZeroPoint } from '../../../pubUtils/timeUtil';
import { getBossInstanceInfo, bossResult, checkMemberExists, pushBossHpMessage, getBossInstanceWhenEnd, addBossInstance } from '../../../services/guildBossService';
import { findWhere } from 'underscore'
import { GUILD_STRUCTURE } from '../../../consts/constModules/guildConst';
import { GUILD_STRUCTURE, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
import { DATA_NAME } from '../../../consts/dataName';
import { UserGuildModel } from '../../../db/UserGuild';
import { GUILD_OPERATE } from '../../../consts';
@@ -174,7 +174,7 @@ export class GuildHandler {
}, true);
let bossInstance = await BossInstanceModel.findBossInstance(code);
let result = await getBossInstanceWhenEnd(bossInstance, roleId, battleRecord.record.recordNum);
await addActive(roleId, serverId, 3, 1);
await addActive(roleId, serverId, GUILD_POINT_WAYS.BOSS_WAR);
return resResult(STATUS.SUCCESS, result);
}

2
game-server/app/servers/battle/handler/guildHandler.ts
View File

@@ -911,7 +911,7 @@ export class GuildHandler {
const serverId = session.get('serverId');
const { code, active, id } = msg;
const result = await addActive(roleId, serverId, id, 1);
const result = await addActive(roleId, serverId, id);
if(result.status == 0) return result.resResult;
const { guild, userGuild } = result;

4
game-server/app/servers/battle/handler/guildTrainHandler.ts
View File

@@ -7,7 +7,7 @@ import { nowSeconds, getHourPoint, getCurHourPoint } from '../../../pubUtils/tim
import { getUserGuild, getGuildTrainInfo, unlockTrain, resetTrain, getGuildTrainRewards} from '../../../services/guildTrainService';
import { findIndex, findWhere, indexBy } from 'underscore'
import { lockData } from '../../../services/redLockService';
import { REFRESH_HOUR, GUILD_REPORT_NUM } from '../../../consts/constModules/guildConst';
import { REFRESH_HOUR, GUILD_REPORT_NUM, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
import { UserGuildModel } from '../../../db/UserGuild';
import { GuildModel } from '../../../db/Guild';
import { getArmyTrainJuDian, getTrainSoloReward, getTrainBaseByLv } from '../../../pubUtils/data';
@@ -237,7 +237,7 @@ export class GuildTrainHandler {
let { trainCount, trainRewards } = userGuild;
let result:any = getGuildTrainInfo(guildTrain, roleId, trainCount, trainRewards);
result.battleGoods = goods;
await addActive(roleId, serverId, 2, 1);
await addActive(roleId, serverId, GUILD_POINT_WAYS.TRAIN);
return resResult(STATUS.SUCCESS, result);
}