pvp初次挑战次数不增加、镇念塔加速

game-server/app/servers/battle/handler/pvpHandler.ts

@@ -344,7 +344,9 @@ export class PvpHandler {
         if(refOppObj.setAttackCnt >= PVP.PVP_SET_ATTACK_FREE_CNT + refOppObj.buyAttackCnt) {
             return resResult(STATUS.PVP_SET_ATTACK_CNT_NOT_ENOUGH);
         }
-        refOppObj.setAttackCnt ++;
+        if(!!pvpDefense.attack) {
+            refOppObj.setAttackCnt ++;
+        }
         
         let seasonNum: number = this.app.get('pvpSeasonNum');
         let seasonEndTime: number = this.app.get('pvpSeasonEndTime');

game-server/app/servers/guild/handler/raceActivityHandler.ts

@@ -186,6 +186,12 @@ export class RaceActivityHandler {
             await UserGuildActivityRecModel.updateInfo(code, { hasShow: true });
         }
 
+        let obj = getRaceActivityObj();
+        let woodenHorse = await obj.getWoodenHorse(guildCode, serverId);
+        if(!woodenHorse) { // 已被结算
+            woodenHorse = guildActivityRec.woodenHorse;
+        }
+
         // 返回当前军团总军功
         let r = new Rank(REDIS_KEY.RACE_ACTIVITY, { serverId });
         let myGuildRank = await r.getMyRank({ guildCode });
@@ -193,7 +199,7 @@ export class RaceActivityHandler {
         return resResult(STATUS.SUCCESS, {
             timestamp: Date.now(),
             hasShow,
-            woodenHorse: guildActivityRec.woodenHorse,
+            woodenHorse,
             myGuildRank
         })
     }