diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts index 60819cdc7..eaabd6c6d 100644 --- a/game-server/app/servers/battle/handler/pvpHandler.ts +++ b/game-server/app/servers/battle/handler/pvpHandler.ts @@ -745,7 +745,8 @@ export class PvpHandler { const role = await RoleModel.findByRoleId(roleId, null, true); if (!role || role.lv < 50) return resResult(STATUS.PVP_NOT_OPEN); - let pvpDefense = await PvpDefenseModel.findByRoleId(roleId); + // let pvpDefense = await PvpDefenseModel.findByRoleId(roleId); + let pvpDefense = await PvpDefenseModel.findByRoleIdIncludeAll(roleId); if (!pvpDefense) return resResult(STATUS.PVP_NOT_OPEN); let { hisWinStreakNum = 0 } = pvpDefense; @@ -762,13 +763,10 @@ export class PvpHandler { if (!curOpp) return resResult(STATUS.PVP_ROLE_NOT_FOUND); let oppDef = curOpp.oppDef; // 战力检测 - console.log('xxxxxxxxxxxxxxxxxxxxxxxxx attackCe',attackCe) - console.log('xxxxxxxxxxxxxxxxxxxxxxxxx oppDef',oppDef) - if (attackCe <= oppDef.defCe) return resResult(STATUS.PVP_SWEEP_NOT_CE); // 对手记录更新 - await PvpHistoryOppModel.setStatus(curOpp.oppDef.toString(), 1); + await PvpHistoryOppModel.setStatus(oppDef._id.toString(), 1); // 战斗记录 const battleCode = genCode(8) + '_sweep'; // 关卡唯一值 diff --git a/shared/resource/jsons/dic_pvp_heroAccountReward.json b/shared/resource/jsons/dic_pvp_heroAccountReward.json index 904d7ce79..4f9d1ab75 100644 --- a/shared/resource/jsons/dic_pvp_heroAccountReward.json +++ b/shared/resource/jsons/dic_pvp_heroAccountReward.json @@ -3,147 +3,147 @@ "id": 1, "min": 500, "max": 600, - "heroscore": 500, + "heroscore": 0, "reward": "40004&50" }, { "id": 2, "min": 601, "max": 700, - "heroscore": 500, + "heroscore": 0, "reward": "40004&55" }, { "id": 3, "min": 701, "max": 800, - "heroscore": 500, + "heroscore": 0, "reward": "40004&60" }, { "id": 4, "min": 801, "max": 900, - "heroscore": 600, + "heroscore": 0, "reward": "40004&65" }, { "id": 5, "min": 901, "max": 1000, - "heroscore": 700, + "heroscore": 0, "reward": "40004&70" }, { "id": 6, "min": 1001, "max": 1100, - "heroscore": 800, + "heroscore": 0, "reward": "40004&75" }, { "id": 7, "min": 1101, "max": 1200, - "heroscore": 900, + "heroscore": 0, "reward": "40004&80" }, { "id": 8, "min": 1201, "max": 1300, - "heroscore": 1000, + "heroscore": 0, "reward": "40004&85" }, { "id": 9, "min": 1301, "max": 1400, - "heroscore": 1000, + "heroscore": 0, "reward": "40004&90" }, { "id": 10, "min": 1401, "max": 1500, - "heroscore": 1100, + "heroscore": 0, "reward": "40004&95" }, { "id": 11, "min": 1501, "max": 1600, - "heroscore": 1100, + "heroscore": 0, "reward": "40004&100" }, { "id": 12, "min": 1601, "max": 1700, - "heroscore": 1200, + "heroscore": 0, "reward": "40004&105" }, { "id": 13, "min": 1701, "max": 1800, - "heroscore": 1200, + "heroscore": 0, "reward": "40004&110" }, { "id": 14, "min": 1801, "max": 1900, - "heroscore": 1300, + "heroscore": 0, "reward": "40004&115" }, { "id": 15, "min": 1901, "max": 2000, - "heroscore": 1300, + "heroscore": 0, "reward": "40004&120" }, { "id": 16, "min": 2001, "max": 2100, - "heroscore": 1400, + "heroscore": 0, "reward": "40004&125" }, { "id": 17, "min": 2101, "max": 2200, - "heroscore": 1400, + "heroscore": 0, "reward": "40004&130" }, { "id": 18, "min": 2201, "max": 2300, - "heroscore": 1500, + "heroscore": 0, "reward": "40004&135" }, { "id": 19, "min": 2301, "max": 2400, - "heroscore": 1500, + "heroscore": 0, "reward": "40004&140" }, { "id": 20, "min": 2401, "max": 2500, - "heroscore": 1600, + "heroscore": 0, "reward": "40004&145" }, { "id": 21, "min": 2500, "max": -1, - "heroscore": 1600, + "heroscore": 0, "reward": "40004&150" } ] \ No newline at end of file