pvp：首页推送

game-server/app/services/connectorService.ts

@@ -36,6 +36,7 @@ import { getAllOnlineRoles } from './redisService';
 import Item from '../db/Item';
 import { PvpDefenseModel } from '../db/PvpDefense';
 import { getDonation } from './donateService';
+import { refChallengeCnt } from './pvpService';
 
 export async function pushData(role: RoleType, session: FrontendOrBackendSession, pushType: 'entry' | 'refresh' = 'entry') {
     try {
@@ -188,12 +189,14 @@ async function getTowerEntryData(role: RoleType) {
  * @param roleId 
  */
 async function getPvpEntryData(roleId: string) {
-    let pvpDefense = await PvpDefenseModel.findByRoleIdIncludeAll(roleId);
+    let pvpDefense = await PvpDefenseModel.findByRoleId(roleId);
     if (pvpDefense) {
-        // let { pvpDefense, } = await findPvpDefAllByRoleId(roleId);
-        // let { challengeCnt, receivedBox, score, hisScore } = pvpDefense;
+        let seasonEndTime = pinus.app.get('pvpSeasonEndTime');
+        let refChallengeObj = refChallengeCnt(pvpDefense.challengeCnt, pvpDefense.challengeRefTime, seasonEndTime);
+        let { challengeCnt } = refChallengeObj;
+        let { receivedBox, score, hisScore } = pvpDefense;
 
-        // return { challengeCnt, score, hisScore, receivedBox }
+        return { challengeCnt, score, hisScore, receivedBox }
     } else {
         return null
     }