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

✨ feat(拍卖行): 拍品按照建筑物等级生成

Browse Source 
https://bantugame.feishu.cn/wiki/wikcn1qfpNYNUnOvuKiyK69eqqg?lang=zh-CN&open_in_browser=true
This commit is contained in:
luying
2022-10-23 17:51:44 +08:00
parent 44787d68a5
commit 8aadccca84
4 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
game-server/app/services/guildActivity/guildActivityService.ts
View File

@@ -33,6 +33,7 @@ import { CounterModel } from "../../db/Counter";
import { setInterval } from "timers";
import { DicRaceActivity } from "../../pubUtils/dictionary/DicRaceActivity";
import { dispatch } from "../../pubUtils/dispatcher";
import { GuildModel } from "../../db/Guild";
let gateActivityObj: GateActivityObject;
let cityActivityObj: CityActivityObject;
@@ -389,7 +390,8 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb
let guildScore = await r.getMyScore({ guildCode });
// console.log('****** ranks', rank, 'guildScore', guildScore);
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, rank);
let guild = await GuildModel.findByCode(guildCode, serverId, 'lv');
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, rank, guild?.lv);
// console.log('***** rewards', JSON.stringify(rewards));
let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, index, {
@@ -468,7 +470,8 @@ export async function cityActivitySettleReward(cityId: number, serverId: number)
await GuildActivityCityModel.guard(serverId, cityId, "", "", index + 1); // 无人能占领
}
}
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY, guildRank, cityId);
let guild = await GuildModel.findByCode(guildCode, serverId, 'lv');
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY, guildRank, guild?.lv, cityId);
let members = obj.getMembersOfGuild(guildCode);
let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY, index, {
@@ -539,7 +542,8 @@ export async function participants(guildCode: string, sourceType: number, source
let rec = await GuildActivityRecordModel.findBySourceCode(guildCode, sourceType, sourceCode);
if (!rec) return [];
let baseNum = getGuildAuctionBasicNum(rec.aid, rec.rank, rec.challengeCityId);
let guild = await GuildModel.findByCode(guildCode, null, 'lv');
let baseNum = getGuildAuctionBasicNum(rec.aid, rec.rank, guild?.lv, rec.challengeCityId);
let members = rec.members || [];
return members.map(cur => {
return { roleId: cur.roleId, job: cur.job, baseNum }
@@ -682,7 +686,8 @@ export async function raceActivitySettleReward(guildCode: string, woodenHorse: W
let isSuccess = distance >= GUILDACTIVITY.RACEACTIVITY_LENGTH; // 血条未击破则没有占领军团
let members = obj.getMembersOfGuild(guildCode);
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.RACE_ACTIVITY, rank);
let guild = await GuildModel.findByCode(guildCode, serverId, 'lv');
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.RACE_ACTIVITY, rank, guild?.lv);
let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.RACE_ACTIVITY, joinIndex, {
memberCnt: members.length, members,
isSuccess, isCompleted: true, rank,