diff --git a/game-server/app/services/guildService.ts b/game-server/app/services/guildService.ts index fb7142345..62e613b53 100644 --- a/game-server/app/services/guildService.ts +++ b/game-server/app/services/guildService.ts @@ -302,7 +302,7 @@ export async function settleGuildWeekly() { } // 转换周活跃奖励 - let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, { serverId }); + let r = new Rank(REDIS_KEY.GUILD_LV_RANK, { serverId }); let rank = await r.getMyRank({ guildCode: code }); let allWeeklyReward = getGuildActiveWeekReward(rank); for (let [roleId, job] of members) { diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts index 137583c0f..bae979533 100644 --- a/shared/pubUtils/data.ts +++ b/shared/pubUtils/data.ts @@ -503,7 +503,7 @@ export function getTrainBaseByLv(lv: number) { export function getGuildActiveWeekReward(rank: number) { let result = gameData.guildActiveWeekReward.find(cur => { let { rankMax, rankMin } = cur; - return rank >= rankMin && rank <= (rankMax || rankMax == -1); + return rank >= rankMin && (rank <= rankMax || rankMax == -1); }); let reward = new Array(); if (result) reward = result.reward; diff --git a/shared/pubUtils/dictionary/DicGuildActiveWeekReward.ts b/shared/pubUtils/dictionary/DicGuildActiveWeekReward.ts index 044da6906..06124e11b 100644 --- a/shared/pubUtils/dictionary/DicGuildActiveWeekReward.ts +++ b/shared/pubUtils/dictionary/DicGuildActiveWeekReward.ts @@ -19,7 +19,7 @@ export interface DicGuildActiveWeekReward { export const dicGuildActiveWeekReward = new Array(); export function loadGuildActiveWeekReward() { dicGuildActiveWeekReward.splice(0, dicGuildActiveWeekReward.length); - let arr = readFileAndParse(FILENAME.DIC_ACTIVE_DAY_REWARD); + let arr = readFileAndParse(FILENAME.DIC_ACTIVE_WEEK_REWARD); arr.forEach(o => { o.reward = parseGoodStr(o.Reward)