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

军团活动：邮件功勋数量错误

Browse Source
This commit is contained in:
luying
2022-05-26 20:32:45 +08:00
parent 7cff291f45
commit d6c6819723
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/guildActivity/guildActivityService.ts
+1 -1
View File
@@ -462,7 +462,7 @@ export async function cityActivitySettleReward(cityId: number, serverId: number)
await genAuction(guildCode, AUCTION_SOURCE.CITY, rec.code, serverId, rewards); await genAuction(guildCode, AUCTION_SOURCE.CITY, rec.code, serverId, rewards);
let dic = gameData.guildActivity.get(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY); let dic = gameData.guildActivity.get(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY);
let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode }, true); let myR = new Rank(REDIS_KEY.USER_CITY_ACTIVITY, { serverId, guildCode }, true);
let ranks = <RoleRankInfo[]>await myR.getRankByRange(); let ranks = <RoleRankInfo[]>await myR.getRankByRange();
let userRank = 0; let userRank = 0;
let hasSentMember: string[] = []; let hasSentMember: string[] = [];
game-server/app/services/guildService.ts
-7
View File
@@ -171,13 +171,6 @@ export async function addActive(roleId: string, serverId: number, id: number, ty
let guildCode = userGuild.guildCode; let guildCode = userGuild.guildCode;
// 周结算锁 // 周结算锁
let weeklySumLock = await lockDataNoRetry(serverId, DATA_NAME.WEEKLY_GUILD_SUM, guildCode);
if (!!weeklySumLock.err) {
weeklySumLock.releaseCallback();
return { status: 0, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
}
weeklySumLock.releaseCallback();
let { activeRecord } = userGuild; let { activeRecord } = userGuild;
if (id != 0) { // 用于debug，传0时直接增加活跃 if (id != 0) { // 用于debug，传0时直接增加活跃
let curActiveRecord = activeRecord.find(cur => cur.id == id); let curActiveRecord = activeRecord.find(cur => cur.id == id);
game-server/app/util/routeUtil.ts
-1
View File
@@ -53,7 +53,6 @@ export function guild(session: Session, msg: any, app: Application, cb: (err: Er
let rid = session.get('roleId'); let rid = session.get('roleId');
console.log('#### arg', msg.args);
if (msg.args && msg.args.length > 0) { if (msg.args && msg.args.length > 0) {
for (let arg of msg.args) { for (let arg of msg.args) {
if (!arg.route) continue; if (!arg.route) continue;
shared/pubUtils/data.ts
+1
View File
@@ -651,6 +651,7 @@ export function getAuctionRewardByPoolId(poolId: number) {
* @param rank 成员在军团内部排名 * @param rank 成员在军团内部排名
*/ */
export function getCityActivityRewards(type: number, guildRank: number, rank: number) { export function getCityActivityRewards(type: number, guildRank: number, rank: number) {
console.log('######## getCityActivityRewards', type, guildRank, rank);
let ranksReward = gameData.cityActivityReward.get(type) || []; let ranksReward = gameData.cityActivityReward.get(type) || [];
let dic = ranksReward.find(cur => { let dic = ranksReward.find(cur => {
return cur.guildRank == guildRank && (rank >= cur.min && (rank <= cur.max || cur.max == 0)); return cur.guildRank == guildRank && (rank >= cur.min && (rank <= cur.max || cur.max == 0));