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

军团活动：修复没有拍卖行bug

Browse Source
This commit is contained in:
luying
2021-12-30 21:44:17 +08:00
parent 8766d7d3af
commit 9e4e20f6b8
4 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
game-server/app/services/guildActivityService.ts
View File

@@ -301,8 +301,11 @@ export async function sendGuildActEndMsg(aid: number) {
if (aid == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
let obj = getGateActivityObj();
console.log('******** gateActivity', obj);
let guilds = obj.getGuilds();
console.log('******** guilds', guilds);
for (let [serverId, guildCodes] of guilds) {
console.log('***** serverId', serverId, 'guildCodes', guildCodes);
for (let guildCode of guildCodes) {
await gateActivitySettleReward(guildCode, serverId);
}
@@ -342,11 +345,11 @@ export async function sendEndMsgToAll() {
* 单个军团城门血条破了之后给他发奖励
* @param guildCode 军团code
*/
export async function sendSingleGateActEndMsg(guildCode: string, serverId: number) {
let chatSid = await getGuildChannelSid(guildCode);
pinus.app.rpc.chat.guildRemote.sendGuildActivityEnd.toServer(chatSid, guildCode);
await gateActivitySettleReward(guildCode, serverId);
}
// export async function sendSingleGateActEndMsg(guildCode: string, serverId: number) {
// let chatSid = await getGuildChannelSid(guildCode);
// pinus.app.rpc.chat.guildRemote.sendGuildActivityEnd.toServer(chatSid, guildCode);
// await gateActivitySettleReward(guildCode, serverId);
// }
/**
@@ -381,14 +384,18 @@ export async function sendSingleRaceActEndMsg(guildCode: string, woodenHorse: Wo
* @param serverId 服务器id
*/
export async function gateActivitySettleReward(guildCode: string, serverId: number) {
console.log('gateActivitySettleReward', guildCode, serverId);
let obj = getGateActivityObj();
let { gateHp, members } = obj.getObj(guildCode, serverId);
console.log('***** gateHp', gateHp, 'members', members);
let r = new Rank(REDIS_KEY.GATE_ACTIVITY, { serverId }, true);
let rank = await r.getMyRank({ guildCode });
let guildScore = await r.getMyScore({ guildCode });
console.log('****** ranks', rank, 'guildScore', guildScore);
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, rank);
console.log('***** rewards', JSON.stringify(rewards));
let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, {
isSuccess: gateHp > 0,
@@ -415,7 +422,7 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb
// 加入拍卖行
await genAuction(guildCode, AUCTION_SOURCE.GATE, rec.code, serverId, rewards);
obj.delGuildRecord(guildCode, serverId);
// obj.delGuildRecord(guildCode, serverId);
}
async function updateUserRecAndSendHonour(honour: number, myScore: number, rank: number, roleId: string, members: Member[]) {