fix

game-server/app/services/guildActivityService.ts

@@ -185,7 +185,7 @@ export async function getGateActivityRank(guildCode: string, serverId: number, r
         myGuildRank = await r.generMyRankWithGuild(guildCode, 0, 0);
     }
 
-    let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode });
+    let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode }, true);
     myR.setGenerFieldsFun(generGuildActivityMemberRankField);
     let { ranks: memberRank, myRank: myMemberRank } = await myR.getRankListWithMyRank({ roleId });
     if (roleName && !myMemberRank) {
@@ -204,7 +204,7 @@ export async function getCityActivityRank(guildCode: string, serverId: number, c
         myGuildRank = await r.generMyRankWithGuild(guildCode, 0, 0);
     }
 
-    let myR = new Rank(REDIS_KEY.USER_CITY_ACTIVITY, { serverId, guildCode });
+    let myR = new Rank(REDIS_KEY.USER_CITY_ACTIVITY, { serverId, guildCode }, true);
     myR.setGenerFieldsFun(generGuildActivityMemberRankField);
     let { ranks: memberRank, myRank: myMemberRank } = await myR.getRankListWithMyRank({ roleId });
     if (roleName && !myMemberRank) {
@@ -403,7 +403,7 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb
     // 结算功勋等奖励
     let dic = gameData.guildActivity.get(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY);
 
-    let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode });
+    let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode }, true);
 
     let ranks = <RoleRankInfo[]>await myR.getRankByRange();
     for (let { rank, roleId, num: myScore } of ranks) {
@@ -468,7 +468,7 @@ export async function cityActivitySettleReward(cityId: number, serverId: number)
         await genAuction(guildCode, AUCTION_SOURCE.CITY, rec.code, serverId, rewards);
 
         let dic = gameData.guildActivity.get(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY);
-        let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode });
+        let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode }, true);
         let ranks = <RoleRankInfo[]>await myR.getRankByRange();
         let userRank = 0;
         for (let { rank, roleId, num: myScore } of ranks) {

game-server/app/services/rankService.ts

@@ -400,7 +400,7 @@ export class Rank {
                 let key = this.keyName.getNameWithPlus(config.name);
                 if(config.isTimestamp) score = this.handleTimestamp(score, config.len);
                 if(config.reverse) {
-                    let pow = Math.pow(10, config.len + 1);
+                    let pow = Math.pow(10, config.len);
                     score = pow - 1 - score;
                 }
                 await redisClient().zaddAsync(key, score, this.composeFields(this.key, myId));

game-server/app/services/timeTaskService.ts

@@ -348,6 +348,14 @@ export async function guildActivitySchedule() {
     if (guildActStartJobId) {
         guildActStartJobId.cancel();
     }
+    if (guildActSecondsJobId) {
+        guildActSecondsJobId.cancel();
+        guildActSecondsJobId = undefined;
+    }
+    if (guildActEndJobId) {
+        guildActEndJobId.cancel();
+        guildActEndJobId = undefined;
+    }
 
     let dicGuildActivity = getTodayGuildActivity();
     await delGuildActivityRank(dicGuildActivity.id);
@@ -367,10 +375,6 @@ export async function guildActivityStart(dicGuildActivity?: DicGuildActivity) {
     if (!dicGuildActivity) dicGuildActivity = getTodayGuildActivity();
     if (!dicGuildActivity) return;
 
-    if (guildActSecondsJobId || guildActEndJobId) {
-        return false
-    }
-
     console.log('********', dicGuildActivity.id, Date.now() + dicGuildActivity.duringTime * 1000)
     let servers = await getAllServers(); // 玩家serverId列表
     if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {